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

[<sp...@us...>]

Revision: 3672
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3672&view=rev
Author:   spasi
Date:     2011-10-14 10:43:45 +0000 (Fri, 14 Oct 2011)
Log Message:
-----------
Updated GLES FullScreenWindowedTest to destroy/create Display on mode change.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/DrawableGLES.java
    trunk/LWJGL/src/java/org/lwjgl/opengles/EGLDisplay.java
    trunk/LWJGL/src/java/org/lwjgl/test/opengles/FullScreenWindowedTest.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/DrawableGLES.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/DrawableGLES.java	2011-10-13 22:05:17 UTC (rev 3671)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/DrawableGLES.java	2011-10-14 10:43:45 UTC (rev 3672)
@@ -101,7 +101,7 @@
 				throw new LWJGLException("No EGLConfigs found for the specified PixelFormat.");
 
 			final EGLConfig eglConfig = pf.getBestMatch(configs);
-			final EGLSurface eglSurface = eglDisplay.createWindowSurface(eglConfig, (int)window, null);
+			final EGLSurface eglSurface = eglDisplay.createWindowSurface(eglConfig, window, null);
 			pf.setSurfaceAttribs(eglSurface);
 
 			this.eglDisplay = eglDisplay;

Modified: trunk/LWJGL/src/java/org/lwjgl/opengles/EGLDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengles/EGLDisplay.java	2011-10-13 22:05:17 UTC (rev 3671)
+++ trunk/LWJGL/src/java/org/lwjgl/opengles/EGLDisplay.java	2011-10-14 10:43:45 UTC (rev 3672)
@@ -172,7 +172,7 @@
 	 *
 	 * @return the EGL surface
 	 */
-	public EGLSurface createWindowSurface(EGLConfig config, int window, IntBuffer attrib_list) throws LWJGLException {
+	public EGLSurface createWindowSurface(EGLConfig config, long window, IntBuffer attrib_list) throws LWJGLException {
 		checkInitialized();
 
 		if ( config.getDisplay() != this )

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengles/FullScreenWindowedTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengles/FullScreenWindowedTest.java	2011-10-13 22:05:17 UTC (rev 3671)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengles/FullScreenWindowedTest.java	2011-10-14 10:43:45 UTC (rev 3672)
@@ -82,7 +82,6 @@
 		initialize();
 		mainLoop();
 		cleanup();
-		Display.destroy();
 	}
 
 	private void switchMode() throws LWJGLException {
@@ -99,18 +98,22 @@
 		try {
 			//find displaymode
 			switchMode();
-			// start of in windowed mode
-			Display.create(new PixelFormat());
-			glInit();
+
 			quadPosition = new Vector2f(100f, 100f);
 			quadVelocity = new Vector2f(1.0f, 1.0f);
 
-			renderer = new QuadRenderer();
+			reinit();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 	}
 
+	private void reinit() throws LWJGLException {
+		Display.create(new PixelFormat());
+		glInit();
+		renderer = new QuadRenderer();
+	}
+
 	/** Runs the main loop of the "test" */
 	private void mainLoop() {
 		while ( !Keyboard.isKeyDown(Keyboard.KEY_ESCAPE) && !Display.isCloseRequested() ) {
@@ -185,8 +188,7 @@
 
 				switchMode();
 
-				glInit();
-				renderer = new QuadRenderer();
+				reinit();
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
@@ -199,8 +201,7 @@
 				mode = new DisplayMode(800, 480);
 				Display.setDisplayModeAndFullscreen(mode);
 
-				glInit();
-				renderer = new QuadRenderer();
+				reinit();
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
@@ -254,6 +255,8 @@
 		int_buffer.put(1, indices_buffer_id);
 
 		glDeleteBuffers(int_buffer);
+
+		Display.destroy();
 	}
 
 	/**

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