src/video/SDL_egl_c.h
author Sam Lantinga <slouken@libsdl.org>
Wed, 31 Oct 2018 15:16:51 -0700
changeset 12376 cfc65d4d49ae
parent 12269 754cd2042e21
child 12503 806492103856
permissions -rw-r--r--
Fixed bug 4349 - SDL_CreateWindow fails with KMS/DRM after upgrading Mesa to 18.2.3

Rainer Sabelka

After I did an upgrade of my arch Linux installation (resulting in an update of Mesa to version 18.2.3), all my SDL2 applications which use the KMS/DRM driver stopped working.
Reason: Creating a Window with SDL_CreateWindow failed because the call to EGL
eglCreateWindowSurface() returns an error "EGL_BAD_MATCH".
After investigating with the debugger I figured, that the configuration, which has been selected from the output of eglChooseConfig(), has an "EGL_NATIVE_VISUAL_ID" which does not match the "format" of the underlying gbm surface.

The attached patch fixes the problem. It does so, by mimicking Weston's behavior.
All configurations returned from eglChooseConfig() which have an visual_id different from the gbm format are discarded, and only from the remaining ones the "best" match is selected.
     1 /*
     2   Simple DirectMedia Layer
     3   Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
     4 
     5   This software is provided 'as-is', without any express or implied
     6   warranty.  In no event will the authors be held liable for any damages
     7   arising from the use of this software.
     8 
     9   Permission is granted to anyone to use this software for any purpose,
    10   including commercial applications, and to alter it and redistribute it
    11   freely, subject to the following restrictions:
    12 
    13   1. The origin of this software must not be misrepresented; you must not
    14      claim that you wrote the original software. If you use this software
    15      in a product, an acknowledgment in the product documentation would be
    16      appreciated but is not required.
    17   2. Altered source versions must be plainly marked as such, and must not be
    18      misrepresented as being the original software.
    19   3. This notice may not be removed or altered from any source distribution.
    20 */
    21 #include "../SDL_internal.h"
    22 
    23 #ifndef SDL_egl_h_
    24 #define SDL_egl_h_
    25 
    26 #if SDL_VIDEO_OPENGL_EGL
    27 
    28 #include "SDL_egl.h"
    29 
    30 #include "SDL_sysvideo.h"
    31 
    32 typedef struct SDL_EGL_VideoData
    33 {
    34     void *egl_dll_handle, *dll_handle;
    35     EGLDisplay egl_display;
    36     EGLConfig egl_config;
    37     int egl_swapinterval;
    38     int egl_surfacetype;
    39     int egl_version_major, egl_version_minor;
    40     EGLint egl_required_visual_id;
    41     
    42     EGLDisplay(EGLAPIENTRY *eglGetDisplay) (NativeDisplayType display);
    43     EGLDisplay(EGLAPIENTRY *eglGetPlatformDisplay) (EGLenum platform,
    44                                 void *native_display,
    45                                 const EGLint *attrib_list);
    46     EGLDisplay(EGLAPIENTRY *eglGetPlatformDisplayEXT) (EGLenum platform,
    47                                 void *native_display,
    48                                 const EGLint *attrib_list);
    49     EGLBoolean(EGLAPIENTRY *eglInitialize) (EGLDisplay dpy, EGLint * major,
    50                                 EGLint * minor);
    51     EGLBoolean(EGLAPIENTRY  *eglTerminate) (EGLDisplay dpy);
    52     
    53     void *(EGLAPIENTRY *eglGetProcAddress) (const char * procName);
    54     
    55     EGLBoolean(EGLAPIENTRY *eglChooseConfig) (EGLDisplay dpy,
    56                                   const EGLint * attrib_list,
    57                                   EGLConfig * configs,
    58                                   EGLint config_size, EGLint * num_config);
    59     
    60     EGLContext(EGLAPIENTRY *eglCreateContext) (EGLDisplay dpy,
    61                                    EGLConfig config,
    62                                    EGLContext share_list,
    63                                    const EGLint * attrib_list);
    64     
    65     EGLBoolean(EGLAPIENTRY *eglDestroyContext) (EGLDisplay dpy, EGLContext ctx);
    66     
    67     EGLSurface(EGLAPIENTRY *eglCreatePbufferSurface)(EGLDisplay dpy, EGLConfig config,
    68                                                      EGLint const* attrib_list);
    69 
    70     EGLSurface(EGLAPIENTRY *eglCreateWindowSurface) (EGLDisplay dpy,
    71                                          EGLConfig config,
    72                                          NativeWindowType window,
    73                                          const EGLint * attrib_list);
    74     EGLBoolean(EGLAPIENTRY *eglDestroySurface) (EGLDisplay dpy, EGLSurface surface);
    75     
    76     EGLBoolean(EGLAPIENTRY *eglMakeCurrent) (EGLDisplay dpy, EGLSurface draw,
    77                                  EGLSurface read, EGLContext ctx);
    78     
    79     EGLBoolean(EGLAPIENTRY *eglSwapBuffers) (EGLDisplay dpy, EGLSurface draw);
    80     
    81     EGLBoolean(EGLAPIENTRY *eglSwapInterval) (EGLDisplay dpy, EGLint interval);
    82     
    83     const char *(EGLAPIENTRY *eglQueryString) (EGLDisplay dpy, EGLint name);
    84     
    85     EGLBoolean(EGLAPIENTRY  *eglGetConfigAttrib) (EGLDisplay dpy, EGLConfig config,
    86                                      EGLint attribute, EGLint * value);
    87     
    88     EGLBoolean(EGLAPIENTRY *eglWaitNative) (EGLint  engine);
    89 
    90     EGLBoolean(EGLAPIENTRY *eglWaitGL)(void);
    91     
    92     EGLBoolean(EGLAPIENTRY *eglBindAPI)(EGLenum);
    93 
    94     EGLint(EGLAPIENTRY *eglGetError)(void);
    95 
    96 } SDL_EGL_VideoData;
    97 
    98 /* OpenGLES functions */
    99 extern int SDL_EGL_GetAttribute(_THIS, SDL_GLattr attrib, int *value);
   100 /* SDL_EGL_LoadLibrary can get a display for a specific platform (EGL_PLATFORM_*)
   101  * or, if 0 is passed, let the implementation decide.
   102  */
   103 extern int SDL_EGL_LoadLibrary(_THIS, const char *path, NativeDisplayType native_display, EGLenum platform);
   104 extern void *SDL_EGL_GetProcAddress(_THIS, const char *proc);
   105 extern void SDL_EGL_UnloadLibrary(_THIS);
   106 extern void SDL_EGL_SetRequiredVisualId(_THIS, int visual_id);
   107 extern int SDL_EGL_ChooseConfig(_THIS);
   108 extern int SDL_EGL_SetSwapInterval(_THIS, int interval);
   109 extern int SDL_EGL_GetSwapInterval(_THIS);
   110 extern void SDL_EGL_DeleteContext(_THIS, SDL_GLContext context);
   111 extern EGLSurface *SDL_EGL_CreateSurface(_THIS, NativeWindowType nw);
   112 extern void SDL_EGL_DestroySurface(_THIS, EGLSurface egl_surface);
   113 
   114 /* These need to be wrapped to get the surface for the window by the platform GLES implementation */
   115 extern SDL_GLContext SDL_EGL_CreateContext(_THIS, EGLSurface egl_surface);
   116 extern int SDL_EGL_MakeCurrent(_THIS, EGLSurface egl_surface, SDL_GLContext context);
   117 extern int SDL_EGL_SwapBuffers(_THIS, EGLSurface egl_surface);
   118 
   119 /* SDL Error-reporting */
   120 extern int SDL_EGL_SetErrorEx(const char * message, const char * eglFunctionName, EGLint eglErrorCode);
   121 #define SDL_EGL_SetError(message, eglFunctionName) SDL_EGL_SetErrorEx(message, eglFunctionName, _this->egl_data->eglGetError())
   122 
   123 /* A few of useful macros */
   124 
   125 #define SDL_EGL_SwapWindow_impl(BACKEND) int \
   126 BACKEND ## _GLES_SwapWindow(_THIS, SDL_Window * window) \
   127 {\
   128     return SDL_EGL_SwapBuffers(_this, ((SDL_WindowData *) window->driverdata)->egl_surface);\
   129 }
   130 
   131 #define SDL_EGL_MakeCurrent_impl(BACKEND) int \
   132 BACKEND ## _GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context) \
   133 {\
   134     if (window && context) { \
   135         return SDL_EGL_MakeCurrent(_this, ((SDL_WindowData *) window->driverdata)->egl_surface, context); \
   136     }\
   137     else {\
   138         return SDL_EGL_MakeCurrent(_this, NULL, NULL);\
   139     }\
   140 }
   141 
   142 #define SDL_EGL_CreateContext_impl(BACKEND) SDL_GLContext \
   143 BACKEND ## _GLES_CreateContext(_THIS, SDL_Window * window) \
   144 {\
   145     return SDL_EGL_CreateContext(_this, ((SDL_WindowData *) window->driverdata)->egl_surface);\
   146 }
   147 
   148 #endif /* SDL_VIDEO_OPENGL_EGL */
   149 
   150 #endif /* SDL_egl_h_ */
   151 
   152 /* vi: set ts=4 sw=4 expandtab: */