Added 'GL_core_profile' and 'GL_compatibility_profile' macro definition to preamble.

Added version check (version >= 150) for GL_(core/compatibility)_profile macros. Added GL_core_profile standard macro check to "150.vert" test file. Fixed version check for GL_core_profile macros, and removed bad token character from 150.vert test. Updated 150.vert.out test base-result with google-test suite.

Added 'GL_core_profile' and 'GL_compatibility_profile' macro definition to preamble.
1fbc6e6c · Lukas Hermanns · 229a6f7f · 1fbc6e6c · 1fbc6e6c · 1fbc6e6c
Commit 1fbc6e6c authored Mar 10, 2017 by Lukas Hermanns
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 0 deletions

150.vert Test/150.vert +4 -0

150.vert.out Test/baseResults/150.vert.out +0 -0

Versions.cpp glslang/MachineIndependent/Versions.cpp +13 -0

No files found.
--- a/Test/150.vert
+++ b/Test/150.vert
 #version 150 core

+#ifndef GL_core_profile
+#	error standard macro GL_core_profile not defined
+#endif
+
 in vec4 iv4;

 uniform float ps;

--- a/Test/baseResults/150.vert.out
+++ b/Test/baseResults/150.vert.out
--- a/glslang/MachineIndependent/Versions.cpp
+++ b/glslang/MachineIndependent/Versions.cpp
@@ -332,6 +332,19 @@ 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];