From 3905b5eb075f93798e243108c929998fb9b45e11 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Sat, 23 Dec 2017 22:29:15 +0100 Subject: [PATCH] add addressMode to descriptor creation args --- vkh_image.c | 13 ++++++++----- vkhelpers.h | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/vkh_image.c b/vkh_image.c index bcf70c9..a3bbf3c 100644 --- 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 b4dfcf2..08bb4d4 100644 --- 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); //////////////////////////////// -- 2.47.3