OSDN Git Service

Expose EGL_EXT_platform_base on all platforms.
authorNicolas Capens <capn@google.com>
Mon, 5 Jun 2017 21:43:46 +0000 (17:43 -0400)
committerNicolas Capens <capn@google.com>
Mon, 12 Jun 2017 13:40:11 +0000 (13:40 +0000)
We're already exporting the entry functions (eglGetPlatformDisplayEXT(), etc.).
Valid platform enums are defined by separate KHR_platform_* extensions.

Bug swiftshader:58

Change-Id: I1eb030f76cd800be9ecb37bad36dd004aceeb1af
Reviewed-on: https://swiftshader-review.googlesource.com/9953
Reviewed-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Nicolas Capens <capn@google.com>
src/OpenGL/libEGL/libEGL.cpp

index 4451764..2072e24 100644 (file)
@@ -171,16 +171,16 @@ const char *QueryString(EGLDisplay dpy, EGLint name)
 {
        TRACE("(EGLDisplay dpy = %p, EGLint name = %d)", dpy, name);
 
-       if(dpy == EGL_NO_DISPLAY && name == EGL_EXTENSIONS)\r
-       {\r
-               return success(\r
-#if defined(__linux__) && !defined(__ANDROID__)\r
-                       "EGL_KHR_platform_gbm "\r
-                       "EGL_KHR_platform_x11 "\r
-                       "EGL_EXT_platform_base "\r
+       if(dpy == EGL_NO_DISPLAY && name == EGL_EXTENSIONS)
+       {
+               return success(
+#if defined(__linux__) && !defined(__ANDROID__)
+                       "EGL_KHR_platform_gbm "
+                       "EGL_KHR_platform_x11 "
 #endif
-                       "EGL_EXT_client_extensions");\r
-       }\r
+                       "EGL_EXT_client_extensions "
+                       "EGL_EXT_platform_base");
+       }
 
        egl::Display *display = egl::Display::get(dpy);
 
@@ -874,17 +874,17 @@ EGLBoolean QueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint
 
        switch(attribute)
        {
-       case EGL_CONFIG_ID:\r
-               *value = context->getConfigID();\r
-               break;\r
-       case EGL_CONTEXT_CLIENT_TYPE:\r
-               *value = egl::getCurrentAPI();\r
-               break;\r
+       case EGL_CONFIG_ID:
+               *value = context->getConfigID();
+               break;
+       case EGL_CONTEXT_CLIENT_TYPE:
+               *value = egl::getCurrentAPI();
+               break;
        case EGL_CONTEXT_CLIENT_VERSION:
                *value = context->getClientVersion();
                break;
        case EGL_RENDER_BUFFER:
-               *value = EGL_BACK_BUFFER;\r
+               *value = EGL_BACK_BUFFER;
                break;
        default:
                return error(EGL_BAD_ATTRIBUTE, EGL_FALSE);