Refactor so that the peer_info variable in ContextGL does not need to…

… be static
LWJGL · Mar 4, 2012 · 093bfe9 · 093bfe9
1 parent 6010657
commit 093bfe9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/src/java/org/lwjgl/opengl/ContextGL.java b/src/java/org/lwjgl/opengl/ContextGL.java
@@ -64,7 +64,7 @@ final class ContextGL implements Context {
 
 	/** Handle to the native GL rendering context */
 	private final ByteBuffer handle;
-	private static PeerInfo peer_info;
+	private final PeerInfo peer_info;
 
 	private final ContextAttribs contextAttribs;
 	private final boolean forwardCompatible;
@@ -229,7 +229,7 @@ private void checkDestroy() {
 	 * A video frame period is the time required to display a full frame of video data.
 	 */
 	public static void setSwapInterval(int value) {
-		implementation.setSwapInterval(peer_info, value);
+		implementation.setSwapInterval(value);
 	}
 
 	/**

diff --git a/src/java/org/lwjgl/opengl/ContextImplementation.java b/src/java/org/lwjgl/opengl/ContextImplementation.java
@@ -81,7 +81,7 @@ interface ContextImplementation {
 	 */
 	boolean isCurrent(ByteBuffer handle) throws LWJGLException;
 
-	void setSwapInterval(PeerInfo peer_info, int value);
+	void setSwapInterval(int value);
 
 	/**
 	 * Destroys the Context.

diff --git a/src/java/org/lwjgl/opengl/LinuxContextImplementation.java b/src/java/org/lwjgl/opengl/LinuxContextImplementation.java
@@ -141,8 +141,10 @@ public boolean isCurrent(ByteBuffer handle) throws LWJGLException {
 
 	private static native boolean nIsCurrent(ByteBuffer context_handle) throws LWJGLException;
 
-	public void setSwapInterval(PeerInfo peer_info, int value) {
+	public void setSwapInterval(int value) {
 		ContextGL current_context = ContextGL.getCurrentContext();
+		PeerInfo peer_info = current_context.getPeerInfo();
+
 		if ( current_context == null )
 			throw new IllegalStateException("No context is current");
 		synchronized ( current_context ) {

diff --git a/src/java/org/lwjgl/opengl/MacOSXContextImplementation.java b/src/java/org/lwjgl/opengl/MacOSXContextImplementation.java
@@ -118,7 +118,7 @@ public boolean isCurrent(ByteBuffer handle) throws LWJGLException {
 
 	private static native boolean nIsCurrent(ByteBuffer context_handle) throws LWJGLException;
 
-	public void setSwapInterval(PeerInfo peer_info, int value) {
+	public void setSwapInterval(int value) {
 		ContextGL current_context = ContextGL.getCurrentContext();
 		synchronized ( current_context ) {
 			nSetSwapInterval(current_context.getHandle(), value);

diff --git a/src/java/org/lwjgl/opengl/WindowsContextImplementation.java b/src/java/org/lwjgl/opengl/WindowsContextImplementation.java
@@ -106,7 +106,7 @@ public boolean isCurrent(ByteBuffer handle) throws LWJGLException {
 
 	private static native boolean nIsCurrent(ByteBuffer context_handle) throws LWJGLException;
 
-	public void setSwapInterval(PeerInfo peer_info, int value) {
+	public void setSwapInterval(int value) {
 		boolean success = nSetSwapInterval(value);
 		if ( !success )
 			LWJGLUtil.log("Failed to set swap interval");