Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
glslang
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
glslang
Commits
01c4076a
Unverified
Commit
01c4076a
authored
Sep 26, 2018
by
John Kessenich
Committed by
GitHub
Sep 26, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1508 from jeffbolznv/remove_ifdefs_shaderlang
Remove NV_EXTENSION ifdefs from ShaderLang.h
parents
1f60c72c
27f5db05
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
4 deletions
+0
-4
ShaderLang.h
glslang/Public/ShaderLang.h
+0
-4
No files found.
glslang/Public/ShaderLang.h
100755 → 100644
View file @
01c4076a
...
@@ -94,7 +94,6 @@ typedef enum {
...
@@ -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 {
...
@@ -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 {
...
@@ -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 {
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment