diff options
| author | Plamena Manolova <plamena.manolova@intel.com> | 2016-05-12 18:21:38 +0100 |
|---|---|---|
| committer | Ben Widawsky <benjamin.widawsky@intel.com> | 2016-05-23 13:46:01 -0700 |
| commit | 21edd24c0de903a12a92e969b78d3a928b9ed50c (patch) | |
| tree | 95a12eebb41f506b4f47fc6eae3117da06001b0e /src/egl/main/eglapi.c | |
| parent | 46ff17559b1369f0fe7dca000f51f077ffd1dae5 (diff) | |
| download | external_mesa3d-21edd24c0de903a12a92e969b78d3a928b9ed50c.zip external_mesa3d-21edd24c0de903a12a92e969b78d3a928b9ed50c.tar.gz external_mesa3d-21edd24c0de903a12a92e969b78d3a928b9ed50c.tar.bz2 | |
egl: Add OpenGL_ES to API string regardless of GLES version
According to the EGL specifications eglQueryString(EGL_CLIENT_APIS)
should return a string containing a combination of "OpenGL", "OpenGL_ES"
and "OpenVG", any other values would be considered invalid. Due to this
when the API string is constructed, the version of GLES should be
disregarded and "OpenGL_ES" should be attached once instead of
"OpenGL_ES2" and "OpenGL_ES3".
Fixes:
dEQP-EGL.functional.negative_api* and
dEQP-EGL.functional.query_context.simple.query_api
Signed-off-by: Plamena Manolova <plamena.manolova@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Diffstat (limited to 'src/egl/main/eglapi.c')
| -rw-r--r-- | src/egl/main/eglapi.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index eb612c0..be2c90f 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -431,14 +431,11 @@ _eglCreateAPIsString(_EGLDisplay *dpy) if (dpy->ClientAPIs & EGL_OPENGL_BIT) strcat(dpy->ClientAPIsString, "OpenGL "); - if (dpy->ClientAPIs & EGL_OPENGL_ES_BIT) + if (dpy->ClientAPIs & EGL_OPENGL_ES_BIT || + dpy->ClientAPIs & EGL_OPENGL_ES2_BIT || + dpy->ClientAPIs & EGL_OPENGL_ES3_BIT_KHR) { strcat(dpy->ClientAPIsString, "OpenGL_ES "); - - if (dpy->ClientAPIs & EGL_OPENGL_ES2_BIT) - strcat(dpy->ClientAPIsString, "OpenGL_ES2 "); - - if (dpy->ClientAPIs & EGL_OPENGL_ES3_BIT_KHR) - strcat(dpy->ClientAPIsString, "OpenGL_ES3 "); + } if (dpy->ClientAPIs & EGL_OPENVG_BIT) strcat(dpy->ClientAPIsString, "OpenVG "); |