Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-08-06 10:44:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] ds: refactor common EGL swap with damage logic

Browse Source 
This commit creates a new utility library, eglutil.h, which contains code
to detect and use EGL_KHR_swap_buffers_with_damage or its EXT equivalent.

This logic used to be duplicated between the X11 and Wayland display servers,
which is not ideal.
This commit is contained in:
Quantum
2021-07-19 04:01:19 -04:00
committed by Geoffrey McRae
parent a8d4668c4d
commit 0cbc529640
6 changed files with 129 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
client/displayservers/Wayland/gl.c
View File

@@ -32,6 +32,7 @@
#if defined(ENABLE_EGL) || defined(ENABLE_OPENGL)
#include "egl_dynprocs.h"
#include "eglutil.h"
bool waylandEGLInit(int w, int h)
{
@@ -71,53 +72,19 @@ EGLDisplay waylandGetEGLDisplay(void)
void waylandEGLSwapBuffers(EGLDisplay display, EGLSurface surface, const struct Rect * damage, int count)
{
if (!wlWm.eglSwapWithDamageInit)
if (!wlWm.swapWithDamage.init)
{
const char *exts = eglQueryString(display, EGL_EXTENSIONS);
wlWm.eglSwapWithDamageInit = true;
if (wl_proxy_get_version((struct wl_proxy *) wlWm.surface) < 4)
{
DEBUG_INFO("Swapping buffers with damage: not supported, need wl_compositor v4");
else if (util_hasGLExt(exts, "EGL_KHR_swap_buffers_with_damage") && g_egl_dynProcs.eglSwapBuffersWithDamageKHR)
{
wlWm.eglSwapWithDamage = g_egl_dynProcs.eglSwapBuffersWithDamageKHR;
DEBUG_INFO("Using EGL_KHR_swap_buffers_with_damage");
}
else if (util_hasGLExt(exts, "EGL_EXT_swap_buffers_with_damage") && g_egl_dynProcs.eglSwapBuffersWithDamageEXT)
{
wlWm.eglSwapWithDamage = g_egl_dynProcs.eglSwapBuffersWithDamageEXT;
DEBUG_INFO("Using EGL_EXT_swap_buffers_with_damage");
swapWithDamageDisable(&wlWm.swapWithDamage);
}
else
DEBUG_INFO("Swapping buffers with damage: not supported");
swapWithDamageInit(&wlWm.swapWithDamage, display);
}
if (wlWm.eglSwapWithDamage && count)
{
if (count * 4 > wlWm.eglDamageRectCount)
{
free(wlWm.eglDamageRects);
wlWm.eglDamageRects = malloc(sizeof(EGLint) * count * 4);
if (!wlWm.eglDamageRects)
DEBUG_FATAL("Out of memory");
wlWm.eglDamageRectCount = count * 4;
}
for (int i = 0; i < count; ++i)
{
wlWm.eglDamageRects[i*4+0] = damage[i].x;
wlWm.eglDamageRects[i*4+1] = damage[i].y;
wlWm.eglDamageRects[i*4+2] = damage[i].w;
wlWm.eglDamageRects[i*4+3] = damage[i].h;
}
waylandPresentationFrame();
wlWm.eglSwapWithDamage(display, surface, wlWm.eglDamageRects, count);
}
else
{
waylandPresentationFrame();
eglSwapBuffers(display, surface);
}
waylandPresentationFrame();
swapWithDamage(&wlWm.swapWithDamage, display, surface, damage, count);
if (wlWm.needsResize)
{

6
client/displayservers/Wayland/wayland.h
View File

@@ -27,6 +27,7 @@
# include <wayland-egl.h>
# include <EGL/egl.h>
# include <EGL/eglext.h>
# include "eglutil.h"
#endif
#include "app.h"
@@ -101,10 +102,7 @@ struct WaylandDSState
#if defined(ENABLE_EGL) || defined(ENABLE_OPENGL)
struct wl_egl_window * eglWindow;
bool eglSwapWithDamageInit;
eglSwapBuffersWithDamageKHR_t eglSwapWithDamage;
EGLint * eglDamageRects;
int eglDamageRectCount;
struct SwapWithDamageData swapWithDamage;
#endif
#ifdef ENABLE_OPENGL