[Mesa-dev] [PATCH] glx: don't force version == 2.0 for ES2 GLX context creation

[Ilia Mirkin]

dEQP tests request a specific version. The EXT spec has been updated to
allow other versions, so allow anything >= 2.0 to be requested.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
---

The X server was also blocking this... a patch has been sent (pending
moderator approval).

 src/glx/dri_common.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
index 8a56385..8d1e6f5 100644
--- a/src/glx/dri_common.c
+++ b/src/glx/dri_common.c
@@ -582,13 +582,12 @@ dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs,
 
    /* The GLX_EXT_create_context_es2_profile spec says:
     *
-    *     "... If the version requested is 2.0, and the
-    *     GLX_CONTEXT_ES2_PROFILE_BIT_EXT bit is set in the
+    *     "... If the version requested is a valid and supported OpenGL-ES
+    *     version, and the GLX_CONTEXT_ES_PROFILE_BIT_EXT bit is set in the
     *     GLX_CONTEXT_PROFILE_MASK_ARB attribute (see below), then the context
-    *     returned will implement OpenGL ES 2.0. This is the only way in which
-    *     an implementation may request an OpenGL ES 2.0 context."
+    *     returned will implement the OpenGL ES version requested."
     */
-   if (*api == __DRI_API_GLES2 && (*major_ver != 2 || *minor_ver != 0)) {
+   if (*api == __DRI_API_GLES2 && *major_ver < 2) {
       *error = __DRI_CTX_ERROR_BAD_API;
       return false;
    }
-- 
2.4.10