videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

Merge branch 'glx-bind-ctx-before-swap' into 'master' 

glx: bind/restore GLX ctx before/after buffer swap

See merge request videolan/vlc!4737
This commit is contained in:
Jeffrey Knockel 2024-04-28 07:10:39 +00:00
parent 7d6abadd24 f40c279503
commit 160a25d767
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/video_output/glx.c
View File

@ -94,7 +94,20 @@ static void SwapBuffers (vlc_gl_t *gl)
{
vlc_gl_sys_t *sys = gl->sys;
glXSwapBuffers (sys->display, sys->win);
Display *previous_display = glXGetCurrentDisplay();
GLXContext previous_context = glXGetCurrentContext();
if (previous_display != sys->display || previous_context != sys->ctx) {
GLXWindow s_read = glXGetCurrentReadDrawable();
GLXWindow s_draw = glXGetCurrentDrawable();
glXMakeContextCurrent(sys->display, sys->win, sys->win, sys->ctx);
glXSwapBuffers (sys->display, sys->win);
if (previous_display)
glXMakeContextCurrent(previous_display, s_draw, s_read, previous_context);
else
glXMakeContextCurrent(sys->display, None, None, NULL);
}
else
glXSwapBuffers (sys->display, sys->win);
}
static void *GetSymbol(vlc_gl_t *gl, const char *procname)