commit 0bbed38f417d490604909de5928d725fb39c5e3c
author shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:38:07 2013 +0000
committer shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:38:07 2013 +0000
tree 45c3362c61b8544bd6f5aa986d5879d00f379b05
parent 00b6a0e09aa0596392868ffe08b0a701bbbd38f6

Accept shader version 300 on ES3 contexts.

TRAC #22712
Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
Author: Nicolas Capens

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2121 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/Shader.cpp

diff --git a/src/libGLESv2/Shader.cpp b/src/libGLESv2/Shader.cpp
index 9f30641..65ce8d6 100644
--- a/src/libGLESv2/Shader.cpp
+++ b/src/libGLESv2/Shader.cpp
@@ -376,7 +376,18 @@
         result = ShCompile(compiler, sourceStrings, 2, compileOptions | SH_SOURCE_PATH);
     }
 
-    if (result)
+    size_t shaderVersion = 100;
+    ShGetInfo(compiler, SH_SHADER_VERSION, &shaderVersion);
+
+    if (shaderVersion == 300 && mRenderer->getCurrentClientVersion() < 3)
+    {
+        const char versionError[] = "GLSL ES 3.00 is not supported by OpenGL ES 2.0 contexts";
+        mInfoLog = new char[sizeof(versionError) + 1];
+        strcpy(mInfoLog, versionError);
+
+        TRACE("\n%s", mInfoLog);
+    }
+    else if (result)
     {
         size_t objCodeLen = 0;
         ShGetInfo(compiler, SH_OBJECT_CODE_LENGTH, &objCodeLen);