[Java-game-lib-cvs] SF.net SVN: java-game-lib: [2832] trunk/LWJGL/src

[<eli...@us...>]

Revision: 2832
          http://svn.sourceforge.net/java-game-lib/?rev=2832&view=rev
Author:   elias_naur
Date:     2007-05-27 08:32:25 -0700 (Sun, 27 May 2007)

Log Message:
-----------
Windows: Fix up WindowsContextImplementation.nSetSwapInterval

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextImplementation.java
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsContextImplementation.c

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextImplementation.java	2007-05-27 13:17:35 UTC (rev 2831)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextImplementation.java	2007-05-27 15:32:25 UTC (rev 2832)
@@ -97,12 +97,12 @@
 	private static native boolean nIsCurrent(ByteBuffer context_handle) throws LWJGLException;
 
 	public void setSwapInterval(int value) {
-		boolean success = nSetSwapInterval(value) == GL11.GL_TRUE ? true : false;
+		boolean success = nSetSwapInterval(value);
 		if (!success)
 			LWJGLUtil.log("Failed to set swap interval");
 		Util.checkGLError();
 	}
-	private static native int nSetSwapInterval(int value);
+	private static native boolean nSetSwapInterval(int value);
 
 	public void destroy(PeerInfo peer_info, ByteBuffer handle) throws LWJGLException {
 		nDestroy(handle);

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsContextImplementation.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsContextImplementation.c	2007-05-27 13:17:35 UTC (rev 2831)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsContextImplementation.c	2007-05-27 15:32:25 UTC (rev 2832)
@@ -105,13 +105,14 @@
 	return wglGetCurrentContext() == context_info->context;
 }
 
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_WindowsContextImplementation_nSetSwapInterval
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_WindowsContextImplementation_nSetSwapInterval
   (JNIEnv *env, jclass clazz, jint value) {
 	WGLExtensions extensions;
 	extgl_InitWGL(&extensions);
 	if (extensions.WGL_EXT_swap_control) {
-		extensions.wglSwapIntervalEXT(value);
-	}
+		return extensions.wglSwapIntervalEXT(value) ? JNI_TRUE : JNI_FALSE;
+	} else
+		return JNI_FALSE;
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsContextImplementation_nDestroy


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