Apply workarounds from mitchell-gil96 for nvidia

yshui#592
sandsmark · Feb 24, 2021 · 3007e64 · 3007e64 · MitchMG2 · Feb 26, 2021
1 parent ea6eebb
commit 3007e64
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/backend/driver.c b/src/backend/driver.c
@@ -15,8 +15,10 @@
 /// Apply driver specified global workarounds. It's safe to call this multiple times.
 void apply_driver_workarounds(struct session *ps, enum driver driver) {
 	if (driver & DRIVER_NVIDIA) {
-		setenv("__GL_YIELD", "usleep", true);
+		setenv("__GL_MaxFramesAllowed", "1", true);
 		ps->o.xrender_sync_fence = true;
+		ps->o.glx_no_rebind_pixmap = true;
+		ps->o.vsync_use_glfinish = false;
 	}
 }
 

diff --git a/src/backend/gl/glx.c b/src/backend/gl/glx.c
@@ -46,6 +46,7 @@ struct _glx_data {
 	int screen;
 	xcb_window_t target_win;
 	GLXContext ctx;
+	bool useGLFinish;
 };
 
 #define glXGetFBConfigAttribChecked(a, b, attr, c)                                       \
@@ -240,6 +241,7 @@ static backend_t *glx_init(session_t *ps) {
 	gd->display = ps->dpy;
 	gd->screen = ps->scr;
 	gd->target_win = session_get_target_window(ps);
+	gd->useGLFinish = ps->o.vsync_use_glfinish;
 
 	XVisualInfo *pvis = NULL;
 
@@ -466,7 +468,10 @@ static void glx_present(backend_t *base, const region_t *region attr_unused) {
 	struct _glx_data *gd = (void *)base;
 	gl_present(base, region);
 	glXSwapBuffers(gd->display, gd->target_win);
-	glFinish();
+
+	if (gd->useGLFinish) {
+		glFinish();
+	}
 }
 
 static int glx_buffer_age(backend_t *base) {