mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1508 from jeffbolznv/remove_ifdefs_shaderlang

Browse Source 
Remove NV_EXTENSION ifdefs from ShaderLang.h
This commit is contained in:
John Kessenich 2018-09-26 08:55:20 -06:00 committed by GitHub
commit 01c4076a16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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