Implement EGL_EXT_client_extensions In EGLQueryString, it is now valid to query EGL_EXTENSIONS with a display set to EGL_NO_DISPLAY, so the function should proceed without returning an error in these cases. Change-Id: I76ccd4f98f3d4180268b6b85b5b04a19bea59977 Reviewed-on: https://swiftshader-review.googlesource.com/9948 Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/libEGL/libEGL.cpp b/src/OpenGL/libEGL/libEGL.cpp index 0d5f812..4451764 100644 --- a/src/OpenGL/libEGL/libEGL.cpp +++ b/src/OpenGL/libEGL/libEGL.cpp
@@ -171,15 +171,16 @@ { TRACE("(EGLDisplay dpy = %p, EGLint name = %d)", dpy, name); - #if defined(__linux__) && !defined(__ANDROID__) - if(dpy == EGL_NO_DISPLAY && name == EGL_EXTENSIONS) - { - return success("EGL_KHR_platform_gbm " - "EGL_KHR_platform_x11 " - "EGL_EXT_client_extensions " - "EGL_EXT_platform_base"); - } - #endif + if(dpy == EGL_NO_DISPLAY && name == EGL_EXTENSIONS) + { + return success( +#if defined(__linux__) && !defined(__ANDROID__) + "EGL_KHR_platform_gbm " + "EGL_KHR_platform_x11 " + "EGL_EXT_platform_base " +#endif + "EGL_EXT_client_extensions"); + } egl::Display *display = egl::Display::get(dpy);