java-game-lib-cvs Mailing List for Lightweight Java Game Library

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv28353/src/native/common

Modified Files:
	extgl.cpp extgl.h 
Log Message:
Implemented linux swap control through GLX_SGI_swap_control

Index: extgl.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- extgl.cpp	20 Dec 2003 22:03:24 -0000	1.8
+++ extgl.cpp	3 Jan 2004 08:09:17 -0000	1.9
@@ -87,6 +87,9 @@
 glXGetClientStringPROC glXGetClientString = NULL;
 glXQueryServerStringPROC glXQueryServerString = NULL;
 glXQueryExtensionsStringPROC glXQueryExtensionsString = NULL;
+
+/* GLX_SGI_swap_control */
+glXSwapIntervalSGIPROC glXSwapIntervalSGI = NULL;
 #endif
 
 #ifdef _AGL
@@ -2538,6 +2541,15 @@
 {
 	extgl_Extensions.GLX_EXT_visual_info = GLXQueryExtension(env, ext_set, disp, screen, "GLX_EXT_visual_info");
 	extgl_Extensions.GLX_EXT_visual_rating = GLXQueryExtension(env, ext_set, disp, screen, "GLX_EXT_visual_rating");
+	extgl_Extensions.GLX_SGI_swap_control = GLXQueryExtension(env, ext_set, disp, screen, "GLX_SGI_swap_control");
+}
+
+static void extgl_InitGLXSGISwapControl(JNIEnv *env, jobject ext_set)
+{
+	if (extgl_Extensions.GLX_SGI_swap_control != 1)
+		return;
+	glXSwapIntervalSGI = (glXSwapIntervalSGIPROC)extgl_GetProcAddress("glXSwapIntervalSGI");
+	EXTGL_SANITY_CHECK(env, ext_set, GLX_SGI_swap_control)
 }
 
 bool extgl_InitGLX(JNIEnv *env, jobject ext_set, Display *disp, int screen)
@@ -2556,6 +2568,7 @@
 	if (major > 1 || (major == 1 && minor >= 3))
 		extgl_Extensions.GLX13 = true;
 	extgl_InitGLX13(env, ext_set);
+	extgl_InitGLXSGISwapControl(env, ext_set);
 	return true;
 }
 #endif

Index: extgl.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- extgl.h	15 Dec 2003 09:38:14 -0000	1.17
+++ extgl.h	3 Jan 2004 08:09:17 -0000	1.18
@@ -539,6 +539,11 @@
 extern glXQueryServerStringPROC glXQueryServerString;
 extern glXQueryExtensionsStringPROC glXQueryExtensionsString;
 
+/* GLX_SGI_swap_control */
+typedef void (APIENTRY * glXSwapIntervalSGIPROC)(int interval);
+
+extern glXSwapIntervalSGIPROC glXSwapIntervalSGI;
+
 #endif /* X11 */
 
 #ifdef _AGL
@@ -5535,6 +5540,7 @@
     bool GLX13;
     bool GLX_EXT_visual_info;
     bool GLX_EXT_visual_rating;
+    bool GLX_SGI_swap_control;
 #endif /* X11 */
     
     bool OpenGL12;

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv28353/src/native/linux

Modified Files:
	org_lwjgl_opengl_Window.cpp 
Log Message:
Implemented linux swap control through GLX_SGI_swap_control

Index: org_lwjgl_opengl_Window.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Window.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Window.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- org_lwjgl_opengl_Window.cpp	20 Dec 2003 22:03:25 -0000	1.14
+++ org_lwjgl_opengl_Window.cpp	3 Jan 2004 08:09:17 -0000	1.15
@@ -68,6 +68,7 @@
 static bool input_released;
 
 static bool dirty;
+static bool vsync_enabled;
 static bool minimized;
 static bool focused;
 static bool closerequested;
@@ -182,7 +183,7 @@
 	focused = true;
 	minimized = false;
 	closerequested = false;
-
+	vsync_enabled = false;
 	Window root_win;
 	Window win;
 	XSetWindowAttributes attribs;
@@ -556,25 +557,21 @@
 	return focused;
 }
 
-/*
- * Class:     org_lwjgl_opengl_Window
- * Method:    nIsVSyncEnabled
- * Signature: ()Z
- */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_Window_nIsVSyncEnabled
   (JNIEnv * env, jclass clazz)
 {
-	// Always return false
-	return false;
+	return vsync_enabled;
 }
 
-/*
- * Class:     org_lwjgl_opengl_Window
- * Method:    nSetVSyncEnabled
- * Signature: (Z)V
- */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nSetVSyncEnabled
   (JNIEnv * env, jclass clazz, jboolean sync)
 {
-	// Do nothing on Linux
+	if (extgl_Extensions.GLX_SGI_swap_control) {
+		bool vsync = sync == JNI_TRUE ? true : false;
+		if (vsync != vsync_enabled) {
+			int interval = vsync ? 1 : 0;
+			glXSwapIntervalSGI(interval);
+			vsync_enabled = vsync;
+		}
+	}
 }