Fix GL_MAX_SAMPLES query for ES3 when the extension is missing.

This query was added in both ES3 and ANGLE_framebuffer_multisample but the code was never updated to accept it for an ES3 context without the extension present. Caught by the angle passthrough command decoder fuzzer. BUG=602737 Change-Id: Ic9a8c67747777ef48e1dd227110482998fee75ce Reviewed-on: https://chromium-review.googlesource.com/440651Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

Fix GL_MAX_SAMPLES query for ES3 when the extension is missing.
44ec2f59 · Geoff Lang · Commit Bot · c5508d6e · 44ec2f59
Commit 44ec2f59 authored Feb 10, 2017 by Geoff Lang Committed by Commit Bot Feb 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 10 deletions

ContextState.cpp src/libANGLE/ContextState.cpp +12 -10

No files found.
--- a/src/libANGLE/ContextState.cpp
+++ b/src/libANGLE/ContextState.cpp
@@ -250,16 +250,6 @@ bool ValidationContext::getQueryParameterInfo(GLenum pname, GLenum *type, unsign
            *numParams = 1;
            return true;
        }
-        case GL_MAX_SAMPLES_ANGLE:
-        {
-            if (!getExtensions().framebufferMultisample)
-            {
-                return false;
-            }
-            *type      = GL_INT;
-            *numParams = 1;
-            return true;
-        }
        case GL_MAX_VIEWPORT_DIMS:
        {
            *type      = GL_INT;
@@ -474,6 +464,18 @@ bool ValidationContext::getQueryParameterInfo(GLenum pname, GLenum *type, unsign
            *type      = GL_INT;
            *numParams = 1;
            return true;
+        case GL_MAX_SAMPLES:
+        {
+            static_assert(GL_MAX_SAMPLES_ANGLE == GL_MAX_SAMPLES,
+                          "GL_MAX_SAMPLES_ANGLE not equal to GL_MAX_SAMPLES");
+            if ((getClientMajorVersion() < 3) && !getExtensions().framebufferMultisample)
+            {
+                return false;
+            }
+            *type      = GL_INT;
+            *numParams = 1;
+            return true;
+        }
    }

    if (getClientVersion() < Version(3, 0))