commit eb66a6e21e66e2884888382c1890f146ef4cbd90
author Geoff Lang <geofflang@chromium.org> Mon Oct 31 13:06:12 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Tue Nov 01 19:30:39 2016 +0000
tree 0777cca485696bc6e92c6efe6200357412bcbf6a
parent cfe7b2c43e0c1bc4fd531a6d7f99fb7f2139a078

Replace the GLVersion class with gl::Version.

Update code to use gl::Version in as many places as possible to ease ES 3.1
support.

BUG=angleproject:1588

Change-Id: I3490b53a81027cf849dac551a9cc66ce04506144
Reviewed-on: https://chromium-review.googlesource.com/404946
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>

src/libANGLE/validationES2.cpp

diff --git a/src/libANGLE/validationES2.cpp b/src/libANGLE/validationES2.cpp
index 92fd0d6..b3de87e 100644
--- a/src/libANGLE/validationES2.cpp
+++ b/src/libANGLE/validationES2.cpp
@@ -3413,13 +3413,18 @@
         case GL_VERTEX_SHADER:
         case GL_FRAGMENT_SHADER:
             break;
+
         case GL_COMPUTE_SHADER:
-            if (context->getGLVersion().isES31())
+            if (context->getClientVersion() < Version(3, 1))
             {
-                break;
+                context->handleError(
+                    Error(GL_INVALID_ENUM, "GL_COMPUTE_SHADER requires OpenGL ES 3.1."));
+                return false;
             }
+            break;
+
         default:
-            context->handleError(Error(GL_INVALID_ENUM));
+            context->handleError(Error(GL_INVALID_ENUM, "Unknown shader type."));
             return false;
     }