commit 999d4fdcddd3a0ca995a5aff5297831b8f5c4b06
author alelenv <40001162+alelenv@users.noreply.github.com> Mon Jun 01 23:24:41 2020 -0700
committer GitHub <noreply@github.com> Tue Jun 02 00:24:41 2020 -0600
tree 63d3b9fcefed735ca70df06d0d79d71e09bab7e7
parent 0cc27fb68c0e85433d071e627cb5b939065c9e6e

Add default descriptorset decoration for acceleration structure (#2257)

variables.

SPIRV/GlslangToSpv.cpp

diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index e41bb5d..92cce81 100644
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -1292,7 +1292,8 @@
     // basically samplerXXX/subpass/sampler/texture are all included
     // if they are the global-scope-class, not the function parameter
     // (or local, if they ever exist) class.
-    if (type.getBasicType() == glslang::EbtSampler)
+    if (type.getBasicType() == glslang::EbtSampler ||
+        type.getBasicType() == glslang::EbtAccStruct)
         return type.getQualifier().isUniformOrBuffer();
 
     // None of the above.

Test/spv.ext.RayGenShader.rgen

diff --git a/Test/spv.ext.RayGenShader.rgen b/Test/spv.ext.RayGenShader.rgen
index 27d450f..9fedf3a 100644
--- a/Test/spv.ext.RayGenShader.rgen
+++ b/Test/spv.ext.RayGenShader.rgen
@@ -1,7 +1,7 @@
 #version 460
 #extension GL_EXT_ray_tracing : enable
 #extension GL_EXT_ray_flags_primitive_culling : enable
-layout(binding = 0, set = 0) uniform accelerationStructureEXT accEXT0;
+layout(binding = 0) uniform accelerationStructureEXT accEXT0;
 layout(binding = 1, set = 0) uniform accelerationStructureEXT accEXT1; // Unused
 layout(binding = 2, r32ui) shadercallcoherent uniform uimage2D imageu;
 layout(location = 0) rayPayloadEXT vec4 payload;