Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

rendervulkan: Compact descriptor set bindings.

Browse source
This commit is contained in:
Georg Lehmann 2021-12-28 11:43:25 +01:00 committed by Joshua Ashton
parent b8f66db496
commit 7c94fc3437
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/composite.comp
View file

@ -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));

4
src/rendervulkan.cpp
View file

@ -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,