commit cfa48d3744243b1247cd528cf2f6176db220de11
author Yuly Novikov <ynovikov@chromium.org> Wed Jun 15 22:14:36 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Fri Jun 17 00:25:11 2016 +0000
tree 947b9edc3c58328d94b9ce0ce9e33e128e45cd5f
parent 230d95616d1309914a6703e27a797a440806dd02

Shader versions must match.

Per GLSL_ES_Specification_3.00.4 paragraph 3.3 Version Declaration:
"Shaders declaring version 3.00 of the shading language
cannot be linked with shaders declaring version 1.00."

BUG=angleproject:1361
TEST=GLSLTest_ES3.VersionMismatch

Change-Id: Icee672b798dcdb41a189e4a6459c4e643daf1fa6
Reviewed-on: https://chromium-review.googlesource.com/353182
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

src/libANGLE/Program.cpp

diff --git a/src/libANGLE/Program.cpp b/src/libANGLE/Program.cpp
index 98fa9ae..65cde2f 100644
--- a/src/libANGLE/Program.cpp
+++ b/src/libANGLE/Program.cpp
@@ -462,6 +462,13 @@
     }
     ASSERT(mState.mAttachedVertexShader->getType() == GL_VERTEX_SHADER);
 
+    if (mState.mAttachedFragmentShader->getShaderVersion() !=
+        mState.mAttachedVertexShader->getShaderVersion())
+    {
+        mInfoLog << "Fragment shader version does not match vertex shader version.";
+        return Error(GL_NO_ERROR);
+    }
+
     if (!linkAttributes(data, mInfoLog, mAttributeBindings, mState.mAttachedVertexShader))
     {
         return Error(GL_NO_ERROR);