From 03ff094f751665bc9847943939565e07be229afb Mon Sep 17 00:00:00 2001
From: Yuxuan Shui <yshuiv7@gmail.com>
Date: Sat, 10 Nov 2018 22:12:46 +0000
Subject: [PATCH] Remove GLX sync fence code

It was never enabled in the old version of compton anyway.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
---
 src/common.h |  6 ------
 src/opengl.c | 36 ------------------------------------
 2 files changed, 42 deletions(-)

diff --git a/src/common.h b/src/common.h
index adf297a..cfcfd4a 100644
--- a/src/common.h
+++ b/src/common.h
@@ -1638,9 +1638,6 @@ vsync_deinit(session_t *ps);
  */
 ///@{
 
-void
-xr_glx_sync(session_t *ps, Drawable d, XSyncFence *pfence);
-
 /**
  * Free a GLX texture.
  */
@@ -1761,9 +1758,6 @@ xr_sync(session_t *ps, Drawable d, XSyncFence *pfence) {
     if (*pfence)
       XSyncResetFence(ps->dpy, *pfence);
   }
-#ifdef OPENGL
-  xr_glx_sync(ps, d, pfence);
-#endif
 }
 
 /** @name DBus handling
diff --git a/src/opengl.c b/src/opengl.c
index dd10b8a..424a4a4 100644
--- a/src/opengl.c
+++ b/src/opengl.c
@@ -185,23 +185,6 @@ get_visualinfo_from_visual(session_t *ps, xcb_visualid_t visual) {
   return XGetVisualInfo(ps->dpy, VisualIDMask, &vreq, &nitems);
 }
 
-void
-xr_glx_sync(session_t *ps, Drawable d, XSyncFence *pfence) {
-  if (*pfence) {
-    // GLsync sync = ps->psglx->glFenceSyncProc(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-    GLsync sync = ps->psglx->glImportSyncEXT(GL_SYNC_X11_FENCE_EXT, *pfence, 0);
-    /* GLenum ret = ps->psglx->glClientWaitSyncProc(sync, GL_SYNC_FLUSH_COMMANDS_BIT,
-        1000);
-    assert(GL_CONDITION_SATISFIED == ret); */
-    XSyncTriggerFence(ps->dpy, *pfence);
-    XFlush(ps->dpy);
-    ps->psglx->glWaitSyncProc(sync, 0, GL_TIMEOUT_IGNORED);
-    // ps->psglx->glDeleteSyncProc(sync);
-    // XSyncResetFence(ps->dpy, *pfence);
-  }
-  glx_check_err(ps);
-}
-
 #ifdef DEBUG_GLX_DEBUG_CONTEXT
 static inline GLXFBConfig
 get_fbconfig_from_visualinfo(session_t *ps, const XVisualInfo *visualinfo) {
@@ -378,25 +361,6 @@ glx_init(session_t *ps, bool need_render) {
       printf_errf("(): Failed to acquire glXBindTexImageEXT() / glXReleaseTexImageEXT().");
       goto glx_init_end;
     }
-
-    psglx->glFenceSyncProc = (f_FenceSync)
-      glXGetProcAddress((const GLubyte *) "glFenceSync");
-    psglx->glIsSyncProc = (f_IsSync)
-      glXGetProcAddress((const GLubyte *) "glIsSync");
-    psglx->glDeleteSyncProc = (f_DeleteSync)
-      glXGetProcAddress((const GLubyte *) "glDeleteSync");
-    psglx->glClientWaitSyncProc = (f_ClientWaitSync)
-      glXGetProcAddress((const GLubyte *) "glClientWaitSync");
-    psglx->glWaitSyncProc = (f_WaitSync)
-      glXGetProcAddress((const GLubyte *) "glWaitSync");
-    psglx->glImportSyncEXT = (f_ImportSyncEXT)
-      glXGetProcAddress((const GLubyte *) "glImportSyncEXT");
-    if (!psglx->glFenceSyncProc || !psglx->glIsSyncProc || !psglx->glDeleteSyncProc
-        || !psglx->glClientWaitSyncProc || !psglx->glWaitSyncProc
-        || !psglx->glImportSyncEXT) {
-      printf_errf("(): Failed to acquire GLX sync functions.");
-      goto glx_init_end;
-    }
   }
 
   // Acquire FBConfigs