Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-25 23:07:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[egl] added fallback for platforms not supporting eglGetPlatformDisplay

Browse Source
This commit is contained in:
Geoffrey McRae 2020-01-17 11:50:00 +11:00
parent 406e22a681
commit 278d851c7c
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
B1-96-g17e05c6fd5+1 B1-97-g406e22a681+1

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

@ -367,11 +367,26 @@ bool egl_render_startup(void * opaque, SDL_Window * window)
return false; return false;
} }
const char *client_exts = eglQueryString(NULL, EGL_EXTENSIONS);
DEBUG_INFO("Supported extensions: %s", client_exts);
bool useNative = false;
if (strstr(client_exts, "EGL_KHR_platform_base") != NULL)
useNative = true;
DEBUG_INFO("use native: %s", useNative ? "true" : "false");
switch(wminfo.subsystem) switch(wminfo.subsystem)
{ {
case SDL_SYSWM_X11: case SDL_SYSWM_X11:
{ {
this->display = eglGetPlatformDisplay(EGL_PLATFORM_X11_KHR, wminfo.info.x11.display, NULL); if (!useNative)
this->display = eglGetPlatformDisplay(EGL_PLATFORM_X11_KHR, wminfo.info.x11.display, NULL);
else
{
EGLNativeDisplayType native = (EGLNativeDisplayType)wminfo.info.x11.display;
this->display = eglGetDisplay(native);
}
this->nativeWind = (EGLNativeWindowType)wminfo.info.x11.window; this->nativeWind = (EGLNativeWindowType)wminfo.info.x11.window;
break; break;
} }
@ -381,7 +396,13 @@ 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->display = eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_KHR, wminfo.info.wl.display, NULL); if (!useNative)
this->display = eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_KHR, wminfo.info.wl.display, NULL);
else
{
EGLNativeDisplayType native = (EGLNativeDisplayType)wminfo.info.wl.display;
this->display = eglGetDisplay(native);
}
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;
} }
@ -564,4 +585,4 @@ struct LG_Renderer LGR_EGL =
.render_startup = egl_render_startup, .render_startup = egl_render_startup,
.render = egl_render, .render = egl_render,
.update_fps = egl_update_fps .update_fps = egl_update_fps
}; };

8
common/include/common/framebuffer.h
View File

@ -34,6 +34,14 @@ FrameBuffer;
typedef bool (*FrameBufferReadFn)(void * opaque, const void * src, size_t size); typedef bool (*FrameBufferReadFn)(void * opaque, const void * src, size_t size);
/**
* Wait for the framebuffer to fill to the specified size
*/
static inline void framebuffer_wait(const FrameBuffer * frame, size_t size)
{
while(frame->wp != size) {}
}
/** /**
* Read data from the KVMFRFrame into the dst buffer * Read data from the KVMFRFrame into the dst buffer
*/ */