Reject GLSL ES 3.00 shaders for OpenGL ES 2.0 contexts.

Bug 19331817 Change-Id: I72128c6b3cb672d4b74578086814fde2c2c6db99 Reviewed-on: https://swiftshader-review.googlesource.com/2292Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Nicolas Capens <capn@google.com>

Reject GLSL ES 3.00 shaders for OpenGL ES 2.0 contexts.
996314b4 · Nicolas Capens · a68b6112 · 996314b4
Commit 996314b4 authored Feb 13, 2015 by Nicolas Capens
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

Shader.cpp src/OpenGL/libGLESv2/Shader.cpp +10 -1

No files found.
--- a/src/OpenGL/libGLESv2/Shader.cpp
+++ b/src/OpenGL/libGLESv2/Shader.cpp
@@ -214,11 +214,20 @@ void Shader::compile()
 		serial++;
 	}

+	int shaderVersion = compiler->getShaderVersion();
+	int clientVersion = es2::getContext()->getClientVersion();
+
+	if(shaderVersion >= 300 && clientVersion < 3)
+	{
+		infoLog = "GLSL ES 3.00 is not supported by OpenGL ES 2.0 contexts";
+		success = false;
+	}
+
 	if(!success)
 	{
 		deleteShader();

-		infoLog = compiler->getInfoSink().info.c_str();
+		infoLog += compiler->getInfoSink().info.c_str();
        TRACE("\n%s", infoLog.c_str());
 	}