diff --git a/src/composite.comp b/src/composite.comp index 09eb12e..e9e7e28 100644 --- a/src/composite.comp +++ b/src/composite.comp @@ -28,7 +28,7 @@ uniform layers_t { layout(binding = 1) uniform sampler2D s_samplers[MaxLayers]; -layout(binding = 5) uniform sampler2D s_ycbcr_samplers[MaxLayers]; +layout(binding = 2) uniform sampler2D s_ycbcr_samplers[MaxLayers]; vec3 srgbToLinear(vec3 color) { bvec3 isLo = lessThanEqual(color, vec3(0.04045f)); diff --git a/src/rendervulkan.cpp b/src/rendervulkan.cpp index def75ad..b859bc6 100644 --- a/src/rendervulkan.cpp +++ b/src/rendervulkan.cpp @@ -1250,7 +1250,7 @@ retry: vecLayoutBindings.push_back( descriptorSetLayoutBindings ); - descriptorSetLayoutBindings.binding = 1 + k_nMaxLayers; + descriptorSetLayoutBindings.binding = 2; descriptorSetLayoutBindings.descriptorCount = k_nMaxLayers; descriptorSetLayoutBindings.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER; descriptorSetLayoutBindings.pImmutableSamplers = ycbcrSamplers.data(); @@ -2062,7 +2062,7 @@ void vulkan_update_descriptor( struct Composite_t *pComposite, struct VulkanPipe .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, .pNext = nullptr, .dstSet = descriptorSet, - .dstBinding = 1 + k_nMaxLayers, + .dstBinding = 2, .dstArrayElement = 0, .descriptorCount = ycbcrImageDescriptors.size(), .descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,