From 38213eb2a519f07d37e3d67cc4985631ce363d37 Mon Sep 17 00:00:00 2001 From: Sascha Willems Date: Mon, 26 Sep 2022 17:47:59 +0200 Subject: [PATCH] Removed unused combined sampler from layout Refs #995 --- data/shaders/glsl/rayquery/scene.frag | 2 +- data/shaders/glsl/rayquery/scene.frag.spv | Bin 1924 -> 1924 bytes examples/rayquery/rayquery.cpp | 8 +++----- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/data/shaders/glsl/rayquery/scene.frag b/data/shaders/glsl/rayquery/scene.frag index a0273b83..4f40a1a1 100644 --- a/data/shaders/glsl/rayquery/scene.frag +++ b/data/shaders/glsl/rayquery/scene.frag @@ -2,7 +2,7 @@ #extension GL_EXT_ray_tracing : enable #extension GL_EXT_ray_query : enable -layout (binding = 2, set = 0) uniform accelerationStructureEXT topLevelAS; +layout (binding = 1, set = 0) uniform accelerationStructureEXT topLevelAS; layout (location = 0) in vec3 inNormal; layout (location = 1) in vec3 inColor; diff --git a/data/shaders/glsl/rayquery/scene.frag.spv b/data/shaders/glsl/rayquery/scene.frag.spv index 0a90da4751795ca307e28d6139a07c1f6521904d..2465e577618667817a210cd8051d6e55a244091c 100644 GIT binary patch delta 22 dcmZqSZ{cTSW>RKnVA;rK#Kg$B*^RKnVBN@O#Kg$7*^ setLayoutBindings = { // Binding 0 : Vertex shader uniform buffer vks::initializers::descriptorSetLayoutBinding(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, VK_SHADER_STAGE_VERTEX_BIT, 0), - // Binding 1 : Fragment shader image sampler (shadow map) - vks::initializers::descriptorSetLayoutBinding(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_SHADER_STAGE_FRAGMENT_BIT, 1), - // Binding 2: Acceleration structure - vks::initializers::descriptorSetLayoutBinding(VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR, VK_SHADER_STAGE_FRAGMENT_BIT, 2), + // Binding 1: Acceleration structure + vks::initializers::descriptorSetLayoutBinding(VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR, VK_SHADER_STAGE_FRAGMENT_BIT, 1), }; VkDescriptorSetLayoutCreateInfo descriptorLayout = vks::initializers::descriptorSetLayoutCreateInfo(setLayoutBindings); VK_CHECK_RESULT(vkCreateDescriptorSetLayout(device, &descriptorLayout, nullptr, &descriptorSetLayout)); @@ -338,7 +336,7 @@ public: // The specialized acceleration structure descriptor has to be chained accelerationStructureWrite.pNext = &descriptorAccelerationStructureInfo; accelerationStructureWrite.dstSet = descriptorSet; - accelerationStructureWrite.dstBinding = 2; + accelerationStructureWrite.dstBinding = 1; accelerationStructureWrite.descriptorCount = 1; accelerationStructureWrite.descriptorType = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR;