Remove NV_EXTENSION ifdefs from ShaderLang.h

This commit is contained in:
Jeff Bolz 2018-09-26 09:03:57 -05:00
parent 1f60c72c67
commit 27f5db0537

4
glslang/Public/ShaderLang.h Executable file → Normal file
View File

@ -94,7 +94,6 @@ typedef enum {
EShLangGeometry,
EShLangFragment,
EShLangCompute,
#ifdef NV_EXTENSIONS
EShLangRayGenNV,
EShLangIntersectNV,
EShLangAnyHitNV,
@ -103,7 +102,6 @@ typedef enum {
EShLangCallableNV,
EShLangTaskNV,
EShLangMeshNV,
#endif
EShLangCount,
} EShLanguage; // would be better as stage, but this is ancient now
@ -114,7 +112,6 @@ typedef enum {
EShLangGeometryMask = (1 << EShLangGeometry),
EShLangFragmentMask = (1 << EShLangFragment),
EShLangComputeMask = (1 << EShLangCompute),
#ifdef NV_EXTENSIONS
EShLangRayGenNVMask = (1 << EShLangRayGenNV),
EShLangIntersectNVMask = (1 << EShLangIntersectNV),
EShLangAnyHitNVMask = (1 << EShLangAnyHitNV),
@ -123,7 +120,6 @@ typedef enum {
EShLangCallableNVMask = (1 << EShLangCallableNV),
EShLangTaskNVMask = (1 << EShLangTaskNV),
EShLangMeshNVMask = (1 << EShLangMeshNV),
#endif
} EShLanguageMask;
namespace glslang {