From 27ba15cb24c32db6b9833569dbba694e928aa691 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Thu, 18 May 2023 19:04:18 +0100 Subject: [PATCH] c/util: Remove comp_swapchain_image samplers No longer used, they where all the same. --- src/xrt/compositor/util/comp_swapchain.c | 8 -------- src/xrt/compositor/util/comp_swapchain.h | 3 --- 2 files changed, 11 deletions(-) diff --git a/src/xrt/compositor/util/comp_swapchain.c b/src/xrt/compositor/util/comp_swapchain.c index dc8fd08d5..278dcd494 100644 --- a/src/xrt/compositor/util/comp_swapchain.c +++ b/src/xrt/compositor/util/comp_swapchain.c @@ -141,11 +141,6 @@ do_post_create_vulkan_setup(struct vk_bundle *vk, sc->images[i].views.no_alpha = U_TYPED_ARRAY_CALLOC(VkImageView, info->array_size); sc->images[i].array_size = info->array_size; - vk_create_sampler(vk, VK_SAMPLER_ADDRESS_MODE_REPEAT, &sc->images[i].repeat_sampler); - - vk_create_sampler(vk, VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, &sc->images[i].sampler); - - for (uint32_t layer = 0; layer < info->array_size; ++layer) { VkImageSubresourceRange subresource_range = { .aspectMask = image_view_aspect, @@ -276,9 +271,6 @@ image_cleanup(struct vk_bundle *vk, struct comp_swapchain_image *image) clean_image_views(vk, image->array_size, &image->views.alpha); clean_image_views(vk, image->array_size, &image->views.no_alpha); - - D(Sampler, image->sampler); - D(Sampler, image->repeat_sampler); } /*! diff --git a/src/xrt/compositor/util/comp_swapchain.h b/src/xrt/compositor/util/comp_swapchain.h index 9252fbc5e..b518b88f2 100644 --- a/src/xrt/compositor/util/comp_swapchain.h +++ b/src/xrt/compositor/util/comp_swapchain.h @@ -56,9 +56,6 @@ struct comp_swapchain_shared */ struct comp_swapchain_image { - //! Sampler used by the renderer and distortion code. - VkSampler sampler; - VkSampler repeat_sampler; //! Views used by the renderer and distortion code, for each array layer. struct {