Merge pull request #2135 from alelenv/rt_shaderlang_enums

Re-add NV enums for raytracing to prevent build breaks.
KhronosGroup · Mar 18, 2020 · 3bf1dab · 3bf1dab
2 parents 8c21e0a + 09a9f83
commit 3bf1dab
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/glslang/Public/ShaderLang.h b/glslang/Public/ShaderLang.h
@@ -93,11 +93,17 @@ typedef enum {
     EShLangFragment,
     EShLangCompute,
     EShLangRayGen,
+    EShLangRayGenNV = EShLangRayGen,
     EShLangIntersect,
+    EShLangIntersectNV = EShLangIntersect,
     EShLangAnyHit,
+    EShLangAnyHitNV = EShLangAnyHit,
     EShLangClosestHit,
+    EShLangClosestHitNV = EShLangClosestHit,
     EShLangMiss,
+    EShLangMissNV = EShLangMiss,
     EShLangCallable,
+    EShLangCallableNV = EShLangCallable,
     EShLangTaskNV,
     EShLangMeshNV,
     LAST_ELEMENT_MARKER(EShLangCount),
@@ -111,11 +117,17 @@ typedef enum {
     EShLangFragmentMask       = (1 << EShLangFragment),
     EShLangComputeMask        = (1 << EShLangCompute),
     EShLangRayGenMask         = (1 << EShLangRayGen),
+    EShLangRayGenNVMask       = EShLangRayGenMask,
     EShLangIntersectMask      = (1 << EShLangIntersect),
+    EShLangIntersectNVMask    = EShLangIntersectMask,
     EShLangAnyHitMask         = (1 << EShLangAnyHit),
+    EShLangAnyHitNVMask       = EShLangAnyHitMask,
     EShLangClosestHitMask     = (1 << EShLangClosestHit),
+    EShLangClosestHitNVMask   = EShLangClosestHitMask,
     EShLangMissMask           = (1 << EShLangMiss),
+    EShLangMissNVMask         = EShLangMissMask,
     EShLangCallableMask       = (1 << EShLangCallable),
+    EShLangCallableNVMask     = EShLangCallableMask,
     EShLangTaskNVMask         = (1 << EShLangTaskNV),
     EShLangMeshNVMask         = (1 << EShLangMeshNV),
     LAST_ELEMENT_MARKER(EShLanguageMaskCount),