Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-24 22:37:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] Use eglGetPlatformDisplay() to fix surface creation

Browse Source 
[Why]
Recent versions of Mesa may have trouble with surface creation, resulting in
errors like:
egl.c:428  | egl_render_startup             | Failed to create EGL surface (eglError: 0x300b)

[How]
Replace eglGetDisplay() with eglGetPlatformDisplay(). Requires EGL 1.5, but should
be supported with any desktop driver released in the past few years.
This commit is contained in:
Andrew Sheldon 2019-11-20 19:50:17 +11:00 committed by Geoffrey McRae
parent a6f23f00b4
commit 70110b4a5a
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/renderers/EGL/egl.c
View File

@ -53,7 +53,6 @@ struct Inst
LG_RendererParams params; LG_RendererParams params;
struct Options opt; struct Options opt;
EGLNativeDisplayType nativeDisp;
EGLNativeWindowType nativeWind; EGLNativeWindowType nativeWind;
EGLDisplay display; EGLDisplay display;
EGLConfig configs; EGLConfig configs;
@ -372,7 +371,7 @@ bool egl_render_startup(void * opaque, SDL_Window * window)
{ {
case SDL_SYSWM_X11: case SDL_SYSWM_X11:
{ {
this->nativeDisp = (EGLNativeDisplayType)wminfo.info.x11.display; this->display = eglGetPlatformDisplay(EGL_PLATFORM_X11_KHR, wminfo.info.x11.display, NULL);
this->nativeWind = (EGLNativeWindowType)wminfo.info.x11.window; this->nativeWind = (EGLNativeWindowType)wminfo.info.x11.window;
break; break;
} }
@ -382,7 +381,7 @@ bool egl_render_startup(void * opaque, SDL_Window * window)
{ {
int width, height; int width, height;
SDL_GetWindowSize(window, &width, &height); SDL_GetWindowSize(window, &width, &height);
this->nativeDisp = (EGLNativeDisplayType)wminfo.info.wl.display; this->display = eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_KHR, wminfo.info.wl.display, NULL);
this->nativeWind = (EGLNativeWindowType)wl_egl_window_create(wminfo.info.wl.surface, width, height); this->nativeWind = (EGLNativeWindowType)wl_egl_window_create(wminfo.info.wl.surface, width, height);
break; break;
} }
@ -393,7 +392,6 @@ bool egl_render_startup(void * opaque, SDL_Window * window)
return false; return false;
} }
this->display = eglGetDisplay(this->nativeDisp);
if (this->display == EGL_NO_DISPLAY) if (this->display == EGL_NO_DISPLAY)
{ {
DEBUG_ERROR("eglGetDisplay failed"); DEBUG_ERROR("eglGetDisplay failed");