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

Revision: 3673
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3673&view=rev
Author:   spasi
Date:     2011-10-14 15:00:02 +0000 (Fri, 14 Oct 2011)
Log Message:
-----------
GLES extension updates.

Modified Paths:
--------------
    trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_EGL_sync.java

Added Paths:
-----------
    trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_multisampled_render_to_texture.java
    trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_read_format.java

Removed Paths:
-------------
    trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_multisamples_render_to_texture.java

Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_multisampled_render_to_texture.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_multisampled_render_to_texture.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_multisampled_render_to_texture.java	2011-10-14 15:00:02 UTC (rev 3673)
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2002-2011 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengles;
+
+import org.lwjgl.util.generator.opengl.GLenum;
+import org.lwjgl.util.generator.opengl.GLsizei;
+import org.lwjgl.util.generator.opengl.GLuint;
+
+public interface IMG_multisampled_render_to_texture {
+
+	/** Accepted by the <pname> parameter of GetRenderbufferParameteriv: */
+	int GL_RENDERBUFFER_SAMPLES_IMG = 0x9133;
+
+	/** Returned by CheckFramebufferStatus: */
+	int GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG = 0x9134;
+
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
+	int GL_MAX_SAMPLES_IMG = 0x9135;
+
+	/** Accepted by the <pname> parameter of GetFramebufferAttachmentParameteriv: */
+	int GL_TEXTURE_SAMPLES_IMG = 0x9136;
+
+	void glRenderbufferStorageMultisampleIMG(
+		@GLenum int target, @GLsizei int samples,
+		@GLenum int internalformat,
+		@GLsizei int width, @GLsizei int height);
+
+	void glFramebufferTexture2DMultisampleIMG(
+		@GLenum int target, @GLenum int attachment,
+		@GLenum int textarget, @GLuint int texture,
+		int level, @GLsizei int samples);
+
+}
\ No newline at end of file

Deleted: trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_multisamples_render_to_texture.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_multisamples_render_to_texture.java	2011-10-14 10:43:45 UTC (rev 3672)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_multisamples_render_to_texture.java	2011-10-14 15:00:02 UTC (rev 3673)
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2002-2011 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- *   its contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.opengles;
-
-import org.lwjgl.util.generator.opengl.GLenum;
-import org.lwjgl.util.generator.opengl.GLsizei;
-import org.lwjgl.util.generator.opengl.GLuint;
-
-public interface IMG_multisamples_render_to_texture {
-
-	/** Accepted by the <pname> parameter of GetRenderbufferParameteriv: */
-	int GL_RENDERBUFFER_SAMPLES_IMG = 0x9133;
-
-	/** Returned by CheckFramebufferStatus: */
-	int GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG = 0x9134;
-
-	/**
-	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
-	 * GetFloatv, and GetDoublev:
-	 */
-	int GL_MAX_SAMPLES_IMG = 0x9135;
-
-	/** Accepted by the <pname> parameter of GetFramebufferAttachmentParameteriv: */
-	int GL_TEXTURE_SAMPLES_IMG = 0x9136;
-
-	void glRenderbufferStorageMultisampleIMG(
-		@GLenum int target, @GLsizei int samples,
-		@GLenum int internalformat,
-		@GLsizei int width, @GLsizei int height);
-
-	void glFramebufferTexture2DMultisampleIMG(
-		@GLenum int target, @GLenum int attachment,
-		@GLenum int textarget, @GLuint int texture,
-		int level, @GLsizei int samples);
-
-}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_read_format.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_read_format.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_read_format.java	2011-10-14 15:00:02 UTC (rev 3673)
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2002-2011 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengles;
+
+public interface IMG_read_format {
+
+	/** Accepted by the <format> parameter of ReadPixels: */
+	int GL_BGRA_IMG                       = 0x80E1,
+		GL_UNSIGNED_SHORT_4_4_4_4_REV_IMG = 0x8365;
+
+}
\ No newline at end of file

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_EGL_sync.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_EGL_sync.java	2011-10-14 10:43:45 UTC (rev 3672)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_EGL_sync.java	2011-10-14 15:00:02 UTC (rev 3673)
@@ -31,6 +31,9 @@
  */
 package org.lwjgl.opengles;
 
+import org.lwjgl.util.generator.Alias;
+
+@Alias("OES_egl_sync")
 public interface OES_EGL_sync {
 
 }
\ No newline at end of file

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

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.