GTK: Swap glFenceSync for sync control extension.

gtk/src/gtk_config.cpp

@@ -151,8 +151,8 @@ int Snes9xConfig::load_defaults ()
     npot_textures = false;
     use_shaders = false;
     shader_filename.clear ();
-    sync_every_frame = false;
+    use_glfinish = false;
-    use_fences = false;
+    use_sync_control = false;
 #endif
 
     /* Snes9x Variables */
@@ -267,8 +267,8 @@ int Snes9xConfig::save_config_file ()
 #undef z
 #define z "OpenGL::"
     outbool   (cf, z"VSync", sync_to_vblank);
-    outbool   (cf, z"glFinish", sync_every_frame);
+    outbool   (cf, z"glFinish", use_glfinish);
-    outbool   (cf, z"glFenceSync", use_fences);
+    outbool   (cf, z"SyncControl", use_sync_control);
     outbool   (cf, z"UsePixelBufferObjects", use_pbos);
     cf.SetInt     (z"PixelBufferObjectBitDepth", pbo_format);
     outbool   (cf, z"UseNonPowerOfTwoTextures", npot_textures);
@@ -497,8 +497,8 @@ int Snes9xConfig::load_config_file ()
 #undef z
 #define z "OpenGL::"
     inbool (z"VSync", sync_to_vblank);
-    inbool (z"glFinish", sync_every_frame);
+    inbool (z"glFinish", use_glfinish);
-    inbool (z"glFenceSync", use_fences);
+    inbool (z"SyncControl", use_sync_control);
     inbool (z"UsePixelBufferObjects", use_pbos);
     inint  (z"PixelBufferObjectBitDepth", pbo_format);
     inbool (z"UseNonPowerOfTwoTextures", npot_textures);

gtk/src/gtk_config.h

@@ -151,8 +151,8 @@ class Snes9xConfig
     bool npot_textures;
     bool use_shaders;
     std::string shader_filename;
-    bool sync_every_frame;
+    bool use_glfinish;
-    bool use_fences;
+    bool use_sync_control;
 #endif
 
     JoyDevice **joystick;

gtk/src/gtk_display_driver_opengl.cpp

@@ -6,6 +6,7 @@
 
 #include "gtk_2_3_compat.h"
 #include <dlfcn.h>
+#include <epoxy/glx_generated.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/time.h>
@@ -88,7 +89,6 @@ S9xOpenGLDisplayDriver::S9xOpenGLDisplayDriver (Snes9xWindow *window,
     this->window = window;
     this->config = config;
     this->drawing_area = GTK_WIDGET (window->drawing_area);
-    fence = NULL;
 }
 
 void S9xOpenGLDisplayDriver::update (int width, int height, int yoffset)
@@ -609,9 +609,6 @@ bool S9xOpenGLDisplayDriver::create_context()
     else
         core = false;
 
-    if (version >= 31 || epoxy_has_gl_extension ("GL_ARB_sync"))
-        fences = true;
-
     return true;
 }
 
@@ -666,17 +663,11 @@ void S9xOpenGLDisplayDriver::swap_buffers ()
 {
     context->swap_buffers ();
 
-    if (config->sync_every_frame && !config->use_fences)
+    if (config->use_glfinish && !config->use_sync_control)
     {
         usleep (0);
         glFinish ();
     }
-    else if (config->use_fences && fences)
-    {
-        if (fence)
-            glDeleteSync (fence);
-        fence = glFenceSync (GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-    }
 }
 
 void S9xOpenGLDisplayDriver::deinit ()
@@ -740,14 +731,10 @@ int S9xOpenGLDisplayDriver::query_availability ()
 
 bool S9xOpenGLDisplayDriver::is_ready ()
 {
-    if (!fence)
+    if (context->ready())
-        return true;
+    {
-
-    if (glClientWaitSync (fence, GL_SYNC_FLUSH_COMMANDS_BIT, 0) == GL_TIMEOUT_EXPIRED)
-        return false;
-
-    glDeleteSync (fence);
-    fence = NULL;
-
         return true;
     }
+
+    return false;
+}

gtk/src/gtk_display_driver_opengl.h

@@ -75,8 +75,6 @@ class S9xOpenGLDisplayDriver : public S9xDisplayDriver
 
         OpenGLContext     *context;
 
-        GLsync            fence;
-
 #ifdef GDK_WINDOWING_X11
         GTKGLXContext     glx;
 #endif

gtk/src/gtk_glx_context.cpp

@@ -4,6 +4,7 @@
    For further information, consult the LICENSE file in the root directory.
 \*****************************************************************************/
 
+#include <epoxy/glx_generated.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -22,6 +23,8 @@ GTKGLXContext::GTKGLXContext ()
 
     version_major     = -1;
     version_minor     = -1;
+    use_oml_sync_control = false;
+    ust = msc = sbc = 0;
 }
 
 GTKGLXContext::~GTKGLXContext ()
@@ -120,6 +123,9 @@ bool GTKGLXContext::create_context ()
         return false;
     }
 
+    if (strstr(extensions, "GLX_OML_sync_control") && gui_config->use_sync_control)
+        use_oml_sync_control = true;
+
     return true;
 }
 
@@ -144,9 +150,27 @@ void GTKGLXContext::resize ()
 
 void GTKGLXContext::swap_buffers ()
 {
+    if (use_oml_sync_control)
+        glXGetSyncValuesOML(display, xid, &ust, &msc, &sbc);
+
     glXSwapBuffers (display, xid);
 }
 
+bool GTKGLXContext::ready()
+{
+    if (use_oml_sync_control)
+    {
+        int64 ust, msc, sbc;
+        glXGetSyncValuesOML(display, xid, &ust, &msc, &sbc);
+
+        if (sbc != this->sbc || msc - this->msc > 2)
+            return true;
+        return false;
+    }
+
+    return true;
+}
+
 void GTKGLXContext::make_current ()
 {
     glXMakeCurrent (display, xid, context);

gtk/src/gtk_glx_context.h

@@ -23,6 +23,7 @@ class GTKGLXContext : public OpenGLContext
     void swap_buffers ();
     void swap_interval (int frames);
     void make_current ();
+    bool ready();
 
     GtkWidget *widget;
 
@@ -40,6 +41,9 @@ class GTKGLXContext : public OpenGLContext
 
     int version_major;
     int version_minor;
+
+    bool use_oml_sync_control;
+    int64_t ust, msc, sbc;
 };
 
 #endif

gtk/src/gtk_opengl_context.h

@@ -19,6 +19,7 @@ class OpenGLContext
     virtual void swap_buffers () = 0;
     virtual void swap_interval (int frames) = 0;
     virtual void make_current () = 0;
+    virtual bool ready() { return true; };
 
     int x;
     int y;

gtk/src/gtk_preferences.cpp

@@ -715,8 +715,8 @@ Snes9xPreferences::move_settings_to_dialog ()
 
 #ifdef USE_OPENGL
     set_check ("sync_to_vblank",            config->sync_to_vblank);
-    set_check ("sync_every_frame",          config->sync_every_frame);
+    set_check ("use_glfinish",              config->use_glfinish);
-    set_check ("use_fences",                config->use_fences);
+    set_check ("use_sync_control",          config->use_sync_control);
     set_check ("use_pbos",                  config->use_pbos);
     set_combo ("pixel_format",              config->pbo_format == 16 ? 0 : 1);
     set_check ("npot_textures",             config->npot_textures);
@@ -859,6 +859,7 @@ Snes9xPreferences::get_settings_from_dialog ()
     int pbo_format = get_combo ("pixel_format") == 1 ? 32 : 16;
 
     if (config->sync_to_vblank != get_check ("sync_to_vblank") ||
+        config->use_sync_control != get_check ("use_sync_control") ||
         config->npot_textures != get_check ("npot_textures") ||
         config->use_pbos != get_check ("use_pbos") ||
         config->pbo_format !=  pbo_format ||
@@ -872,8 +873,8 @@ Snes9xPreferences::get_settings_from_dialog ()
     config->use_pbos                  = get_check ("use_pbos");
     config->npot_textures             = get_check ("npot_textures");
     config->use_shaders               = get_check ("use_shaders");
-    config->sync_every_frame          = get_check ("sync_every_frame");
+    config->use_glfinish              = get_check ("use_glfinish");
-    config->use_fences                = get_check ("use_fences");
+    config->use_sync_control          = get_check ("use_sync_control");
 
     config->shader_filename           = get_entry_text ("fragment_shader");
 

gtk/src/gtk_wayland_egl_context.cpp

@@ -4,9 +4,11 @@
    For further information, consult the LICENSE file in the root directory.
 \*****************************************************************************/
 
+#include <epoxy/egl_generated.h>
 #include <stdio.h>
 #include <string.h>
 
+#include "gtk_s9x.h"
 #include "gtk_wayland_egl_context.h"
 
 static void wl_global(void *data,
@@ -49,6 +51,8 @@ WaylandEGLContext::WaylandEGLContext ()
     egl_context = NULL;
     egl_config = NULL;
     egl_window = NULL;
+    use_sync_control = false;
+    ust = msc = sbc = 0;
 }
 
 WaylandEGLContext::~WaylandEGLContext()
@@ -168,6 +172,13 @@ bool WaylandEGLContext::create_context ()
         }
     }
 
+    if (gui_config->use_sync_control && epoxy_has_egl_extension(egl_display, "EGL_CHROMIUM_sync_control"))
+    {
+        eglGetSyncValuesCHROMIUM = (PEGLGETSYNCVALUESCHROMIUM)eglGetProcAddress("eglGetSyncValuesCHROMIUM");
+        if (eglGetSyncValuesCHROMIUM)
+            use_sync_control = true;
+    }
+
     wl_surface_set_buffer_scale(child, scale);
     gdk_window_invalidate_rect(gdk_window, NULL, false);
 
@@ -189,10 +200,27 @@ void WaylandEGLContext::resize ()
 
 void WaylandEGLContext::swap_buffers()
 {
+    if (use_sync_control)
+        eglGetSyncValuesCHROMIUM(egl_display, egl_surface, &ust, &msc, &sbc);
+
     eglSwapBuffers(egl_display, egl_surface);
     wl_surface_commit(child);
 }
 
+bool WaylandEGLContext::ready()
+{
+    if (use_sync_control)
+    {
+        EGLuint64KHR ust, msc, sbc;
+        eglGetSyncValuesCHROMIUM(egl_display, egl_surface, &ust, &msc, &sbc);
+        if (sbc != this->sbc || msc - this->msc > 2)
+            return true;
+        return false;
+    }
+
+    return true;
+}
+
 void WaylandEGLContext::make_current()
 {
     eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context);
@@ -202,5 +230,3 @@ void WaylandEGLContext::swap_interval (int frames)
 {
     eglSwapInterval(egl_display, frames);
 }
-
-

gtk/src/gtk_wayland_egl_context.h

@@ -7,8 +7,9 @@
 #ifndef __GTK_WAYLAND_EGL_CONTEXT_H
 #define __GTK_WAYLAND_EGL_CONTEXT_H
 
-#include <wayland-egl.h>
 #include <epoxy/egl.h>
+#include <epoxy/egl_generated.h>
+#include <wayland-egl.h>
 
 #include "gtk_opengl_context.h"
 
@@ -23,6 +24,7 @@ class WaylandEGLContext : public OpenGLContext
     void swap_buffers();
     void swap_interval(int frames);
     void make_current();
+    bool ready();
 
     GdkWindow *gdk_window;
 
@@ -42,6 +44,11 @@ class WaylandEGLContext : public OpenGLContext
     EGLConfig egl_config;
 
     wl_egl_window *egl_window;
+
+    typedef EGLBoolean (*PEGLGETSYNCVALUESCHROMIUM)(EGLDisplay, EGLSurface, EGLuint64KHR *, EGLuint64KHR *, EGLuint64KHR *);
+    PEGLGETSYNCVALUESCHROMIUM eglGetSyncValuesCHROMIUM;
+    bool use_sync_control;
+    EGLuint64KHR ust, msc, sbc;
 };
 
 #endif

gtk/src/snes9x.ui

@@ -3777,7 +3777,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkCheckButton" id="sync_every_frame">
+                                  <object class="GtkCheckButton" id="use_glfinish">
                                     <property name="label" translatable="yes">Reduce input lag with glFinish</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -3792,12 +3792,12 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkCheckButton" id="use_fences">
+                                  <object class="GtkCheckButton" id="use_sync_control">
-                                    <property name="label" translatable="yes">Reduce input lag with glFenceSync</property>
+                                    <property name="label" translatable="yes">Reduce input lag with sync control</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">Sync the program with the video output after every displayed frame to reduce input latency, but allow GUI events to occur in the meantime</property>
+                                    <property name="tooltip_text" translatable="yes">More modern method for syncing the program with the video output to reduce input latency. Allows GUI events to occur in the meantime</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
                                   <packing>