Refactor the eglQueryContext entry point.

src/libANGLE/queryutils.cpp

@@ -1589,6 +1589,28 @@ void QueryConfigAttrib(const Config *config, EGLint attribute, EGLint *value)
     }
 }
 
+void QueryContextAttrib(const gl::Context *context, EGLint attribute, EGLint *value)
+{
+    switch (attribute)
+    {
+        case EGL_CONFIG_ID:
+            *value = context->getConfig()->configID;
+            break;
+        case EGL_CONTEXT_CLIENT_TYPE:
+            *value = context->getClientType();
+            break;
+        case EGL_CONTEXT_CLIENT_VERSION:
+            *value = context->getClientMajorVersion();
+            break;
+        case EGL_RENDER_BUFFER:
+            *value = context->getRenderBuffer();
+            break;
+        default:
+            UNREACHABLE();
+            break;
+    }
+}
+
 void QuerySurfaceAttrib(const Surface *surface, EGLint attribute, EGLint *value)
 {
     switch (attribute)

src/libANGLE/queryutils.h

@@ -152,6 +152,8 @@ class Surface;
 
 void QueryConfigAttrib(const Config *config, EGLint attribute, EGLint *value);
 
+void QueryContextAttrib(const gl::Context *context, EGLint attribute, EGLint *value);
+
 void QuerySurfaceAttrib(const Surface *surface, EGLint attribute, EGLint *value);
 void SetSurfaceAttrib(Surface *surface, EGLint attribute, EGLint value);
 

src/libANGLE/validationEGL.cpp

@@ -2433,4 +2433,27 @@ Error ValidateQuerySurface(const Display *display,
     return NoError();
 }
 
+Error ValidateQueryContext(const Display *display,
+                           const gl::Context *context,
+                           EGLint attribute,
+                           EGLint *value)
+{
+    ANGLE_TRY(ValidateDisplay(display));
+    ANGLE_TRY(ValidateContext(display, context));
+
+    switch (attribute)
+    {
+        case EGL_CONFIG_ID:
+        case EGL_CONTEXT_CLIENT_TYPE:
+        case EGL_CONTEXT_CLIENT_VERSION:
+        case EGL_RENDER_BUFFER:
+            break;
+
+        default:
+            return EglBadAttribute() << "Invalid context attribute.";
+    }
+
+    return NoError();
+}
+
 }  // namespace egl

src/libANGLE/validationEGL.h

@@ -155,6 +155,10 @@ Error ValidateQuerySurface(const Display *display,
                            const Surface *surface,
                            EGLint attribute,
                            EGLint *value);
+Error ValidateQueryContext(const Display *display,
+                           const gl::Context *context,
+                           EGLint attribute,
+                           EGLint *value);
 
 }  // namespace egl
 

src/libGLESv2/entry_points_egl.cpp

@@ -574,31 +574,14 @@ EGLBoolean EGLAPIENTRY QueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attri
     Display *display     = static_cast<Display *>(dpy);
     gl::Context *context = static_cast<gl::Context *>(ctx);
 
-    Error error = ValidateContext(display, context);
+    Error error = ValidateQueryContext(display, context, attribute, value);
     if (error.isError())
     {
         thread->setError(error);
         return EGL_FALSE;
     }
 
-    switch (attribute)
-    {
-        case EGL_CONFIG_ID:
-            *value = context->getConfig()->configID;
-            break;
-        case EGL_CONTEXT_CLIENT_TYPE:
-            *value = context->getClientType();
-            break;
-        case EGL_CONTEXT_CLIENT_VERSION:
-            *value = context->getClientMajorVersion();
-            break;
-        case EGL_RENDER_BUFFER:
-            *value = context->getRenderBuffer();
-            break;
-        default:
-            thread->setError(EglBadAttribute());
-            return EGL_FALSE;
-    }
+    QueryContextAttrib(context, attribute, value);
 
     thread->setError(NoError());
     return EGL_TRUE;