Skip to content

G
glslang
Unverified Commit 3bf1dab2 by John Kessenich Committed by GitHub
Options

Merge pull request #2135 from alelenv/rt_shaderlang_enums

Re-add NV enums for raytracing to prevent build breaks.
parents 8c21e0a2 09a9f835
Showing with 12 additions and 0 deletions
glslang/Public/ShaderLang.h
...@@ -93,11 +93,17 @@ typedef enum { ...@@ -93,11 +93,17 @@ typedef enum {
EShLangFragment, EShLangFragment,
EShLangCompute, EShLangCompute,
EShLangRayGen, EShLangRayGen,
EShLangRayGenNV = EShLangRayGen,
EShLangIntersect, EShLangIntersect,
EShLangIntersectNV = EShLangIntersect,
EShLangAnyHit, EShLangAnyHit,
EShLangAnyHitNV = EShLangAnyHit,
EShLangClosestHit, EShLangClosestHit,
EShLangClosestHitNV = EShLangClosestHit,
EShLangMiss, EShLangMiss,
EShLangMissNV = EShLangMiss,
EShLangCallable, EShLangCallable,
EShLangCallableNV = EShLangCallable,
EShLangTaskNV, EShLangTaskNV,
EShLangMeshNV, EShLangMeshNV,
LAST_ELEMENT_MARKER(EShLangCount), LAST_ELEMENT_MARKER(EShLangCount),
...@@ -111,11 +117,17 @@ typedef enum { ...@@ -111,11 +117,17 @@ typedef enum {
EShLangFragmentMask = (1 << EShLangFragment), EShLangFragmentMask = (1 << EShLangFragment),
EShLangComputeMask = (1 << EShLangCompute), EShLangComputeMask = (1 << EShLangCompute),
EShLangRayGenMask = (1 << EShLangRayGen), EShLangRayGenMask = (1 << EShLangRayGen),
EShLangRayGenNVMask = EShLangRayGenMask,
EShLangIntersectMask = (1 << EShLangIntersect), EShLangIntersectMask = (1 << EShLangIntersect),
EShLangIntersectNVMask = EShLangIntersectMask,
EShLangAnyHitMask = (1 << EShLangAnyHit), EShLangAnyHitMask = (1 << EShLangAnyHit),
EShLangAnyHitNVMask = EShLangAnyHitMask,
EShLangClosestHitMask = (1 << EShLangClosestHit), EShLangClosestHitMask = (1 << EShLangClosestHit),
EShLangClosestHitNVMask = EShLangClosestHitMask,
EShLangMissMask = (1 << EShLangMiss), EShLangMissMask = (1 << EShLangMiss),
EShLangMissNVMask = EShLangMissMask,
EShLangCallableMask = (1 << EShLangCallable), EShLangCallableMask = (1 << EShLangCallable),
EShLangCallableNVMask = EShLangCallableMask,
EShLangTaskNVMask = (1 << EShLangTaskNV), EShLangTaskNVMask = (1 << EShLangTaskNV),
EShLangMeshNVMask = (1 << EShLangMeshNV), EShLangMeshNVMask = (1 << EShLangMeshNV),
LAST_ELEMENT_MARKER(EShLanguageMaskCount), LAST_ELEMENT_MARKER(EShLanguageMaskCount),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment