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

Fix location of #defines for core and compatibility profile.

Browse Source 
These were recently added for all profiles, versus just desktop.
This commit is contained in:
John Kessenich
2017-03-14 15:19:32 -06:00
parent 601b7fa4b9
commit 78cfba97e1
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glslang/Include/revision.h
View File

@@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits. // 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). // For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.1907" #define GLSLANG_REVISION "Overload400-PrecQual.1908"
#define GLSLANG_DATE "13-Mar-2017" #define GLSLANG_DATE "14-Mar-2017"

21
glslang/MachineIndependent/Versions.cpp
View File

@@ -324,6 +324,14 @@ void TParseVersions::getPreamble(std::string& preamble)
"#define GL_NV_viewport_array2 1\n" "#define GL_NV_viewport_array2 1\n"
#endif #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 // #line and #include
@@ -332,19 +340,6 @@ void TParseVersions::getPreamble(std::string& preamble)
"#define GL_GOOGLE_include_directive 1\n" "#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 // #define VULKAN XXXX
const int numberBufSize = 12; const int numberBufSize = 12;
char numberBuf[numberBufSize]; char numberBuf[numberBufSize];