add addressMode to descriptor creation args

diff --git a/vkh_image.c b/vkh_image.c
index bcf70c91e48f401509edb001bfee4f4422964ada..a3bbf3ce9d2c4c1e19ab08352193abd2b66853c7 100644 (file)
--- a/vkh_image.c
+++ b/vkh_image.c
@@ -62,7 +62,7 @@ VkhImage vkh_image_ms_create(VkhDevice pDev,
                       num_samples, VK_IMAGE_TILING_OPTIMAL, 1, 1, layout);
 }
 void vkh_image_create_descriptor(VkhImage img, VkImageViewType viewType, VkImageAspectFlags aspectFlags, VkFilter magFilter,
-                                 VkFilter minFilter, VkSamplerMipmapMode mipmapMode)
+                                 VkFilter minFilter, VkSamplerMipmapMode mipmapMode, VkSamplerAddressMode addressMode)
 {
     img->pDescriptor = (VkDescriptorImageInfo*)malloc(sizeof(VkDescriptorImageInfo));
     img->pDescriptor->imageLayout = img->layout;
@@ -75,10 +75,13 @@ void vkh_image_create_descriptor(VkhImage img, VkImageViewType viewType, VkImage
     VK_CHECK_RESULT(vkCreateImageView(img->pDev->vkDev, &viewInfo, NULL, &img->pDescriptor->imageView));
 
     VkSamplerCreateInfo samplerCreateInfo = { .sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
-                                              .maxAnisotropy = 1.0,
-                                              .magFilter = magFilter,
-                                              .minFilter = minFilter,
-                                              .mipmapMode = mipmapMode};
+                                              .maxAnisotropy= 1.0,
+                                              .addressModeU = addressMode,
+                                              .addressModeV = addressMode,
+                                              .addressModeW = addressMode,
+                                              .magFilter    = magFilter,
+                                              .minFilter    = minFilter,
+                                              .mipmapMode   = mipmapMode};
     VK_CHECK_RESULT(vkCreateSampler(img->pDev->vkDev, &samplerCreateInfo, NULL, &img->pDescriptor->sampler));
 
 }

diff --git a/vkhelpers.h b/vkhelpers.h
index b4dfcf2da31d33b2ae3a94bf64d3320659a46648..08bb4d4e8f73cf227e21474f1816a26df0eeec69 100644 (file)
--- a/vkhelpers.h
+++ b/vkhelpers.h
@@ -34,7 +34,7 @@ VkhImage vkh_image_ms_create    (VkhDevice pDev, VkFormat format, VkSampleCountF
 VkhImage vkh_tex2d_array_create (VkhDevice pDev, VkFormat format, uint32_t width, uint32_t height, uint32_t layers,
                                     VkMemoryPropertyFlags memprops, VkImageUsageFlags usage, VkImageLayout layout);
 void vkh_image_create_descriptor(VkhImage img, VkImageViewType viewType, VkImageAspectFlags aspectFlags, VkFilter magFilter, VkFilter minFilter,
-                                    VkSamplerMipmapMode mipmapMode);
+                                    VkSamplerMipmapMode mipmapMode, VkSamplerAddressMode addressMode);
 void vkh_image_destroy          (VkhImage img);
 
 ////////////////////////////////