mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add default descriptorset decoration for acceleration structure (#2257)

Browse Source 
variables.
This commit is contained in:
alelenv 2020-06-01 23:24:41 -07:00 committed by GitHub
parent 0cc27fb68c
commit 999d4fdcdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SPIRV/GlslangToSpv.cpp
View File

@ -1292,7 +1292,8 @@ bool IsDescriptorResource(const glslang::TType& type)
// basically samplerXXX/subpass/sampler/texture are all included // basically samplerXXX/subpass/sampler/texture are all included
// if they are the global-scope-class, not the function parameter // if they are the global-scope-class, not the function parameter
// (or local, if they ever exist) class. // (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(); return type.getQualifier().isUniformOrBuffer();
// None of the above. // None of the above.

2
Test/spv.ext.RayGenShader.rgen
View File

@ -1,7 +1,7 @@
#version 460 #version 460
#extension GL_EXT_ray_tracing : enable #extension GL_EXT_ray_tracing : enable
#extension GL_EXT_ray_flags_primitive_culling : 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 = 1, set = 0) uniform accelerationStructureEXT accEXT1; // Unused
layout(binding = 2, r32ui) shadercallcoherent uniform uimage2D imageu; layout(binding = 2, r32ui) shadercallcoherent uniform uimage2D imageu;
layout(location = 0) rayPayloadEXT vec4 payload; layout(location = 0) rayPayloadEXT vec4 payload;