commit 6170bef8cff7983d75963bd63f7f0caf5993980d
author Geoff Lang <geofflang@chromium.org> Tue Jul 18 15:51:14 2017 -0400
committer Commit Bot <commit-bot@chromium.org> Tue Jul 18 21:10:11 2017 +0000
tree d407ce3fc9b6e4f2a4563495a93d70dc3907e3b4
parent 9c33586521292840cb2a8f1bc5b7e2a692761996

Fix validation of querying GL_FRAGMENT_SHADER_DERIVATIVE_HINT.

This enum is queryable in ES3 or with the GL_OES_standard_derivatives
extension.

BUG=2110

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

src/libANGLE/ContextState.cpp

diff --git a/src/libANGLE/ContextState.cpp b/src/libANGLE/ContextState.cpp
index 032154e..ebd3d30 100644
--- a/src/libANGLE/ContextState.cpp
+++ b/src/libANGLE/ContextState.cpp
@@ -181,7 +181,6 @@
         case GL_PACK_REVERSE_ROW_ORDER_ANGLE:
         case GL_UNPACK_ALIGNMENT:
         case GL_GENERATE_MIPMAP_HINT:
-        case GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES:
         case GL_RED_BITS:
         case GL_GREEN_BITS:
         case GL_BLUE_BITS:
@@ -492,6 +491,15 @@
             *type      = GL_INT;
             *numParams = 1;
             return true;
+
+            case GL_FRAGMENT_SHADER_DERIVATIVE_HINT:
+                if ((getClientMajorVersion() < 3) && !getExtensions().standardDerivatives)
+                {
+                    return false;
+                }
+                *type      = GL_INT;
+                *numParams = 1;
+                return true;
         }
     }