Commit 21edd24c authored by Plamena Manolova's avatar Plamena Manolova Committed by Ben Widawsky

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's avatarPlamena Manolova <plamena.manolova@intel.com>
Reviewed-by: Matt Turner's avatarMatt Turner <mattst88@gmail.com>
Reviewed-by: Ben Widawsky's avatarBen Widawsky <ben@bwidawsk.net>
parent 46ff1755
......@@ -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 ");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment