Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
glslang
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CodeLinaro
public-release-test-restored
platform
external
deqp-deps
glslang
Commits
78cfba97
Commit
78cfba97
authored
8 years ago
by
John Kessenich
Browse files
Options
Downloads
Patches
Plain Diff
Fix location of #defines for core and compatibility profile.
These were recently added for all profiles, versus just desktop.
parent
601b7fa4
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
glslang/Include/revision.h
+2
-2
2 additions, 2 deletions
glslang/Include/revision.h
glslang/MachineIndependent/Versions.cpp
+8
-13
8 additions, 13 deletions
glslang/MachineIndependent/Versions.cpp
with
10 additions
and
15 deletions
glslang/Include/revision.h
+
2
−
2
View file @
78cfba97
...
...
@@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.190
7
"
#define GLSLANG_DATE "1
3
-Mar-2017"
#define GLSLANG_REVISION "Overload400-PrecQual.190
8
"
#define GLSLANG_DATE "1
4
-Mar-2017"
This diff is collapsed.
Click to expand it.
glslang/MachineIndependent/Versions.cpp
+
8
−
13
View file @
78cfba97
...
...
@@ -324,6 +324,14 @@ void TParseVersions::getPreamble(std::string& preamble)
"#define GL_NV_viewport_array2 1
\n
"
#endif
;
if
(
version
>=
150
)
{
// define GL_core_profile and GL_compatibility_profile
preamble
+=
"#define GL_core_profile 1
\n
"
;
if
(
profile
==
ECompatibilityProfile
)
preamble
+=
"#define GL_compatibility_profile 1
\n
"
;
}
}
// #line and #include
...
...
@@ -332,19 +340,6 @@ void TParseVersions::getPreamble(std::string& preamble)
"#define GL_GOOGLE_include_directive 1
\n
"
;
if
(
version
>=
150
)
{
// define GL_core_profile and GL_compatibility_profile
preamble
+=
"#define GL_core_profile 1
\n
"
;
if
(
profile
==
ECompatibilityProfile
)
{
preamble
+=
"#define GL_compatibility_profile 1
\n
"
;
}
}
// #define VULKAN XXXX
const
int
numberBufSize
=
12
;
char
numberBuf
[
numberBufSize
];
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment