BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

comment update, rayQueryEXT is writable, readonly check removed.

Browse source
This commit is contained in:
Neslisah Torosdagli 2020-03-19 16:34:40 -04:00
parent 6719ce09db
commit 34e874228e
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
glslang/MachineIndependent/Initialize.cpp
View file

@ -4323,11 +4323,7 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
"\n"); "\n");
} }
<<<<<<< HEAD
// Builtins for GL_NV_ray_tracing/GL_EXT_ray_tracing/GL_EXT_ray_query // Builtins for GL_NV_ray_tracing/GL_EXT_ray_tracing/GL_EXT_ray_query
=======
// Builtins for GL_NV_ray_tracing/GL_EXT_ray_tracing//GL_EXT_ray_query
>>>>>>> 74d6d6a2... GL_EXT_ray_query updates
if (profile != EEsProfile && version >= 460) { if (profile != EEsProfile && version >= 460) {
commonBuiltins.append("void rayQueryInitializeEXT(rayQueryEXT, accelerationStructureEXT, uint, uint, vec3, float, vec3, float);" commonBuiltins.append("void rayQueryInitializeEXT(rayQueryEXT, accelerationStructureEXT, uint, uint, vec3, float, vec3, float);"
"bool rayQueryProceedEXT(rayQueryEXT);" "bool rayQueryProceedEXT(rayQueryEXT);"