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

[client] x11: don't setup XPresent if jitRender is not enabled

Browse Source
This commit is contained in:
Geoffrey McRae 2021-08-04 06:12:21 +10:00
parent 4e435e6199
commit 7fc717a839
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
client/displayservers/X11/x11.c
View File

@ -130,6 +130,7 @@ static bool x11Init(const LG_DSInitParams params)
x11.xValuator = -1; x11.xValuator = -1;
x11.yValuator = -1; x11.yValuator = -1;
x11.display = XOpenDisplay(NULL); x11.display = XOpenDisplay(NULL);
x11.jitRender = params.jitRender;
XSetWindowAttributes swa = XSetWindowAttributes swa =
{ {
@ -513,12 +514,14 @@ static bool x11Init(const LG_DSInitParams params)
/* default to the square cursor */ /* default to the square cursor */
XDefineCursor(x11.display, x11.window, x11.cursors[LG_POINTER_SQUARE]); XDefineCursor(x11.display, x11.window, x11.cursors[LG_POINTER_SQUARE]);
x11.frameEvent = lgCreateEvent(true, 0); if (x11.jitRender)
{
XPresentQueryExtension(x11.display, &x11.xpresentOp, &event, &error); x11.frameEvent = lgCreateEvent(true, 0);
x11.presentPixmap = XCreatePixmap(x11.display, x11.window, 1, 1, 24); XPresentQueryExtension(x11.display, &x11.xpresentOp, &event, &error);
XPresentSelectInput(x11.display, x11.window, PresentCompleteNotifyMask); XPresentSelectInput(x11.display, x11.window, PresentCompleteNotifyMask);
x11.presentRegion = XFixesCreateRegion(x11.display, &(XRectangle){0}, 1); x11.presentPixmap = XCreatePixmap(x11.display, x11.window, 1, 1, 24);
x11.presentRegion = XFixesCreateRegion(x11.display, &(XRectangle){0}, 1);
}
XMapWindow(x11.display, x11.window); XMapWindow(x11.display, x11.window);
XFlush(x11.display); XFlush(x11.display);
@ -529,7 +532,8 @@ static bool x11Init(const LG_DSInitParams params)
goto fail_window; goto fail_window;
} }
x11DoPresent(); if (x11.jitRender)
x11DoPresent();
return true; return true;
@ -548,13 +552,20 @@ static void x11Startup(void)
static void x11Shutdown(void) static void x11Shutdown(void)
{ {
lgSignalEvent(x11.frameEvent); if (x11.jitRender)
lgSignalEvent(x11.frameEvent);
} }
static void x11Free(void) static void x11Free(void)
{ {
lgJoinThread(x11.eventThread, NULL); lgJoinThread(x11.eventThread, NULL);
lgFreeEvent(x11.frameEvent);
if (x11.jitRender)
{
lgFreeEvent(x11.frameEvent);
XFreePixmap(x11.display, x11.presentPixmap);
XFixesDestroyRegion(x11.display, x11.presentRegion);
}
if (x11.window) if (x11.window)
XDestroyWindow(x11.display, x11.window); XDestroyWindow(x11.display, x11.window);

1
client/displayservers/X11/x11.h
View File

@ -41,6 +41,7 @@ struct X11DSState
XVisualInfo * visual; XVisualInfo * visual;
int xinputOp, xpresentOp; int xinputOp, xpresentOp;
bool jitRender;
uint32_t presentSerial; uint32_t presentSerial;
Pixmap presentPixmap; Pixmap presentPixmap;
XserverRegion presentRegion; XserverRegion presentRegion;