From 27f5db05376cbff9d3bd4702c4eed8a56f4cdeba Mon Sep 17 00:00:00 2001
From: Jeff Bolz <jbolz@nvidia.com>
Date: Wed, 26 Sep 2018 09:03:57 -0500
Subject: [PATCH] Remove NV_EXTENSION ifdefs from ShaderLang.h
---
glslang/Public/ShaderLang.h | 4 ----
1 file changed, 4 deletions(-)
mode change 100755 => 100644 glslang/Public/ShaderLang.h
diff --git a/glslang/Public/ShaderLang.h b/glslang/Public/ShaderLang.h
old mode 100755
new mode 100644
index 21800aa19..4ba1976ca
--- a/glslang/Public/ShaderLang.h
+++ b/glslang/Public/ShaderLang.h
@@ -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 {
--
GitLab