From 78cfba97e1460207a411c52dc8d9fb829d5a716c Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Tue, 14 Mar 2017 15:19:32 -0600
Subject: [PATCH] Fix location of #defines for core and compatibility profile.

These were recently added for all profiles, versus just desktop.
---
 glslang/Include/revision.h              |  4 ++--
 glslang/MachineIndependent/Versions.cpp | 21 ++++++++-------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h
index a67e1f74..cba20226 100644
--- a/glslang/Include/revision.h
+++ b/glslang/Include/revision.h
@@ -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.1907"
-#define GLSLANG_DATE "13-Mar-2017"
+#define GLSLANG_REVISION "Overload400-PrecQual.1908"
+#define GLSLANG_DATE "14-Mar-2017"
diff --git a/glslang/MachineIndependent/Versions.cpp b/glslang/MachineIndependent/Versions.cpp
index 6c93a455..4bc5bdc6 100644
--- a/glslang/MachineIndependent/Versions.cpp
+++ b/glslang/MachineIndependent/Versions.cpp
@@ -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];