GL_EXT_ray_query updates

6719ce09 · Torosdagli · Neslisah Torosdagli · 34d8248c · 6719ce09
Commit 6719ce09 authored Mar 19, 2020 by Torosdagli Committed by Neslisah Torosdagli Mar 19, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

Initialize.cpp glslang/MachineIndependent/Initialize.cpp +4 -0

No files found.
--- a/glslang/MachineIndependent/Initialize.cpp
+++ b/glslang/MachineIndependent/Initialize.cpp
@@ -4323,7 +4323,11 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
            "\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
+>>>>>>> 74d6d6a2... GL_EXT_ray_query updates
    if (profile != EEsProfile && version >= 460) {
         commonBuiltins.append("void rayQueryInitializeEXT(rayQueryEXT, accelerationStructureEXT, uint, uint, vec3, float, vec3, float);"
            "bool rayQueryProceedEXT(rayQueryEXT);"