[Vice-emu-commit] SF.net SVN: vice-emu:[19102] branches/pottendo/v2.0-work/vice/src/arch/unix /x11/

Revision: 19102
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19102&view=rev
Author:   pottendo
Date:     2008-08-02 20:11:28 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Removed kludge `mult'
New function `openGL_synce_enabled()'.

Modified Paths:
--------------
    branches/pottendo/v2.0-work/vice/src/arch/unix/x11/openGL_sync.c

Modified: branches/pottendo/v2.0-work/vice/src/arch/unix/x11/openGL_sync.c
===================================================================
--- branches/pottendo/v2.0-work/vice/src/arch/unix/x11/openGL_sync.c	2008-08-02 20:10:29 UTC (rev 19101)
+++ branches/pottendo/v2.0-work/vice/src/arch/unix/x11/openGL_sync.c	2008-08-02 20:11:28 UTC (rev 19102)
@@ -45,13 +45,6 @@
 #include "uimenu.h"
 #include "lib.h"
 
-/* Fixme: this is a kludge until vsync inclusion is decided */
-#ifdef HAVE_XRANDR
-extern int mult;
-#else
-static int mult = 1;
-#endif
-
 static log_t openGL_log = LOG_ERR;
 static int no_sync = 0;		/* extension available */
 static int openGL_sync;		/* enabled/disable synchronization */
@@ -109,10 +102,16 @@
     int r;
     unsigned int c;
     if (openGL_sync && !no_sync)
-	if ((r = glXWaitVideoSyncSGI(mult, 0, &c)))
+	if ((r = glXWaitVideoSyncSGI(1, 0, &c)))
 	    log_error(openGL_log, "glXWaitVideoSyncSGI() returned %d", r);
 }
 
+int
+openGL_sync_enabled()
+{
+    return openGL_sync;
+}
+
 void
 openGL_sync_shutdown(void)
 {
@@ -204,7 +203,6 @@
 
     log_message(openGL_log, "%s openGL_sync", 
 		openGL_sync? "enabling" : "disabling");
-	
     ui_update_menus();
     return 0;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.