java-game-lib-cvs Mailing List for Lightweight Java Game Library (Page 22)

Brought to you by: kappa1, matzon, spasi

java-game-lib-cvs — Commits to the repository will be send to this list.

You can subscribe to this list here.

2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (134)	Sep (52)	Oct (13)	Nov (342)	Dec (163)
2003	Jan (44)	Feb (62)	Mar (158)	Apr (38)	May (70)	Jun (58)	Jul (104)	Aug (207)	Sep (83)	Oct (122)	Nov (23)	Dec (49)
2004	Jan (119)	Feb (132)	Mar (192)	Apr (140)	May (77)	Jun (74)	Jul (201)	Aug (63)	Sep (102)	Oct (70)	Nov (173)	Dec (78)
2005	Jan (174)	Feb (197)	Mar (105)	Apr (59)	May (77)	Jun (43)	Jul (21)	Aug (18)	Sep (47)	Oct (37)	Nov (74)	Dec (50)
2006	Jan (44)	Feb (19)	Mar (32)	Apr (24)	May (31)	Jun (55)	Jul (138)	Aug (28)	Sep (12)	Oct (41)	Nov (58)	Dec (24)
2007	Jan (28)	Feb (14)	Mar (10)	Apr (68)	May (30)	Jun (26)	Jul (18)	Aug (63)	Sep (19)	Oct (29)	Nov (20)	Dec (10)
2008	Jan (38)	Feb (7)	Mar (37)	Apr (120)	May (41)	Jun (36)	Jul (39)	Aug (24)	Sep (28)	Oct (30)	Nov (36)	Dec (75)
2009	Jan (46)	Feb (22)	Mar (50)	Apr (70)	May (134)	Jun (105)	Jul (75)	Aug (34)	Sep (38)	Oct (34)	Nov (19)	Dec (20)
2010	Jan (11)	Feb (20)	Mar (65)	Apr (83)	May (104)	Jun (73)	Jul (78)	Aug (57)	Sep (43)	Oct (35)	Nov (9)	Dec (4)
2011	Jan (21)	Feb (11)	Mar (18)	Apr (10)	May (18)	Jun (15)	Jul (48)	Aug (25)	Sep (17)	Oct (45)	Nov (15)	Dec (12)
2012	Jan (21)	Feb (9)	Mar (12)	Apr (9)	May (9)	Jun (5)	Jul (1)	Aug (10)	Sep (12)	Oct (1)	Nov (28)	Dec (5)
2013	Jan (4)	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2014	Jan	Feb (1)	Mar (1)	Apr	May (2)	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2015	Jan (1)	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct (2)	Nov	Dec
2016	Jan (2)	Feb (1)	Mar (1)	Apr (1)	May (2)	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov (1)	Dec
2017	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 20 21 22 23 24 .. 238 > >> (Page 22 of 238)

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

From: <ma...@us...> - 2010-04-13 20:28:10

Revision: 3324
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3324&view=rev
Author:   matzon
Date:     2010-04-13 20:28:04 +0000 (Tue, 13 Apr 2010)

Log Message:
-----------
prepare for 2.4.1

Modified Paths:
--------------
    trunk/LWJGL/platform_build/build-definitions.xml
    trunk/LWJGL/src/java/org/lwjgl/Sys.java

Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml	2010-04-13 20:25:29 UTC (rev 3323)
+++ trunk/LWJGL/platform_build/build-definitions.xml	2010-04-13 20:28:04 UTC (rev 3324)
@@ -12,7 +12,7 @@
 	<property name="lwjgl.docs" 					location="doc" />
 	<property name="lwjgl.temp" 					location="temp" />
 	<property name="lwjgl.res" 						location="res" />
-	<property name="lwjgl.version" 				value="2.4" />
+	<property name="lwjgl.version" 				value="2.4.1" />
 
 	<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/AMD*.java,org/lwjgl/opengl/APPLE*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/NVX*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java,org/lwjgl/opengl/GREMEDY*.java"/>
 	<!-- ================================================================== -->

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2010-04-13 20:25:29 UTC (rev 3323)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2010-04-13 20:28:04 UTC (rev 3324)
@@ -54,7 +54,7 @@
 	private static final String JNI_LIBRARY_NAME = "lwjgl";
 
 	/** Current version of library */
-	private static final String VERSION = "2.4";
+	private static final String VERSION = "2.4.1";
 
 	/** The implementation instance to delegate platform specific behavior to */
 	private final static SysImplementation implementation;


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3323] trunk/LWJGL/build.xml

From: <ma...@us...> - 2010-04-13 20:25:36

Revision: 3323
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3323&view=rev
Author:   matzon
Date:     2010-04-13 20:25:29 +0000 (Tue, 13 Apr 2010)

Log Message:
-----------
disable version check for linux - headless issues

Modified Paths:
--------------
    trunk/LWJGL/build.xml

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2010-04-13 07:14:51 UTC (rev 3322)
+++ trunk/LWJGL/build.xml	2010-04-13 20:25:29 UTC (rev 3323)
@@ -391,7 +391,7 @@
 		<copy todir="${lwjgl.lib}/linux">
 			<fileset dir="${lwjgl.bin}/lwjgl" includes="liblwjgl*.so"/>
 		</copy>
-		<version-check platform="linux"/>
+		<!-- headless issues <version-check platform="linux"/> -->
 	</target>
 
 	<!-- Compiles LWJGL on solaris platforms -->


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

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

From: <ma...@us...> - 2010-04-13 07:14:57

Revision: 3322
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3322&view=rev
Author:   matzon
Date:     2010-04-13 07:14:51 +0000 (Tue, 13 Apr 2010)

Log Message:
-----------
(possible) fix for headless environment issue with awt on linux

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/test/NativeTest.java

Modified: trunk/LWJGL/src/java/org/lwjgl/test/NativeTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/NativeTest.java	2010-04-12 23:22:08 UTC (rev 3321)
+++ trunk/LWJGL/src/java/org/lwjgl/test/NativeTest.java	2010-04-13 07:14:51 UTC (rev 3322)
@@ -32,6 +32,7 @@
 package org.lwjgl.test;
 
 import org.lwjgl.Sys;
+import java.awt.Toolkit;
 
 /**
  * <br>
@@ -43,13 +44,19 @@
  */
 public class NativeTest {
   
+  public void invokeSys() {
+    Sys.getVersion();
+  }
+  
   /**
    * Entry point for test
    * 
    * @param args ignored
    */
   public static void main(String[] args) {
-	  Sys.getVersion();
+    // try to "load" awt - work around for headless issue on linux
+    Toolkit.getDefaultToolkit();
+	  new NativeTest().invokeSys();
 	  System.out.println("OK");
   }
 }


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

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

From: <ma...@us...> - 2010-04-12 23:22:14

Revision: 3321
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3321&view=rev
Author:   matzon
Date:     2010-04-12 23:22:08 +0000 (Mon, 12 Apr 2010)

Log Message:
-----------
forcefull check of version match when building

Modified Paths:
--------------
    trunk/LWJGL/build.xml

Added Paths:
-----------
    trunk/LWJGL/src/java/org/lwjgl/test/NativeTest.java

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2010-04-12 19:04:27 UTC (rev 3320)
+++ trunk/LWJGL/build.xml	2010-04-12 23:22:08 UTC (rev 3321)
@@ -315,6 +315,29 @@
 		</echo>
 	</target>
 	
+	<macrodef name="version-check">
+	  <attribute name="platform"/>
+	  <sequential>
+			<java classname="org.lwjgl.test.NativeTest" logError="false" resultproperty="nativetest.res" outputproperty="nativetest.out" errorproperty="nativetest.err" fork="true">
+				<jvmarg value="-Djava.library.path=libs/@{platform}"/>
+	    	<classpath>
+	      	<pathelement path="${lwjgl.bin}"/>
+	        <pathelement path="${java.class.path}"/>
+	      </classpath>
+	    </java>
+	    
+	    <fail message="Unable to load native library: ${nativetest.err}">
+	     <condition>
+	       <not>
+	         <equals arg1="OK" arg2="${nativetest.out}"/>
+	       </not>
+	     </condition>
+	   </fail>
+	   
+	   <echo message="Successfully executed NativeTest"/>
+		</sequential>
+	</macrodef>
+	
 	<!-- Compiles the Java source code -->
 	<target name="compile" description="Compiles the java source code" depends="-initialize">
 		<javac debug="yes" destdir="${lwjgl.bin}" source="1.4" target="1.4" classpath="${lwjgl.lib}/jinput.jar:${lwjgl.lib}/AppleJavaExtensions.jar" taskname="core">
@@ -359,6 +382,7 @@
 		<copy todir="${lwjgl.lib}/windows">
 			<fileset dir="${lwjgl.bin}/lwjgl" includes="lwjgl*.dll"/>
 		</copy>
+		<version-check platform="windows"/>
 	</target>
 
 	<!-- Compiles LWJGL on Linux platforms -->
@@ -367,6 +391,7 @@
 		<copy todir="${lwjgl.lib}/linux">
 			<fileset dir="${lwjgl.bin}/lwjgl" includes="liblwjgl*.so"/>
 		</copy>
+		<version-check platform="linux"/>
 	</target>
 
 	<!-- Compiles LWJGL on solaris platforms -->
@@ -376,12 +401,14 @@
 		<copy todir="${lwjgl.lib}/solaris">
 			<fileset dir="${lwjgl.bin}/lwjgl" includes="liblwjgl*.so"/>
 		</copy>
+		<version-check platform="solaris"/>
 	</target>
 
 	<!-- Compiles LWJGL on Mac platforms -->
 	<target name="-compile_native_macosx" if="lwjgl.platform.macosx">
 		<ant antfile="platform_build/macosx_ant/build.xml" inheritAll="false"/>
 		<copy file="${lwjgl.bin}/lwjgl/liblwjgl.jnilib" todir="${lwjgl.lib}/macosx"/>
+		<version-check platform="macosx"/>
 	</target>
 	
 	<target name="repack200" description="Pack200-repack a jar file">

Added: trunk/LWJGL/src/java/org/lwjgl/test/NativeTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/NativeTest.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/test/NativeTest.java	2010-04-12 23:22:08 UTC (rev 3321)
@@ -0,0 +1,55 @@
+/* 
+ * Copyright (c) 2002-2010 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.test;
+
+import org.lwjgl.Sys;
+
+/**
+ * <br>
+ * Simple test that just checks that the native library loads
+ *
+ * @author Brian Matzon <br...@ma...>
+ * @version $Revision: 2983 $
+ * $Id: SysTest.java 2983 2008-04-07 18:36:09Z matzon $
+ */
+public class NativeTest {
+  
+  /**
+   * Entry point for test
+   * 
+   * @param args ignored
+   */
+  public static void main(String[] args) {
+	  Sys.getVersion();
+	  System.out.println("OK");
+  }
+}


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3320] trunk/LWJGL/build.xml

From: <ma...@us...> - 2010-04-12 19:04:33

Revision: 3320
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3320&view=rev
Author:   matzon
Date:     2010-04-12 19:04:27 +0000 (Mon, 12 Apr 2010)

Log Message:
-----------
always build the native file with the latest version

Modified Paths:
--------------
    trunk/LWJGL/build.xml

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2010-04-11 18:00:27 UTC (rev 3319)
+++ trunk/LWJGL/build.xml	2010-04-12 19:04:27 UTC (rev 3320)
@@ -256,6 +256,12 @@
 		</javah>
 	</target>
 	
+	<target name="touch-version">
+		<touch file="${lwjgl.src.native}/windows/org_lwjgl_opengl_Display.c"/>
+		<touch file="${lwjgl.src.native}/linux/org_lwjgl_opengl_Display.c"/>
+		<touch file="${lwjgl.src.native}/macosx/org_lwjgl_opengl_Display.m"/>
+	</target>
+	
 	<target name="version-mismatch">
 		<loadfile srcfile="${lwjgl.src}/java/org/lwjgl/WindowsSysImplementation.java" property="lwjgl.java.windows.version">
 			<filterchain>
@@ -325,7 +331,7 @@
 		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/examples/**" source="1.4" target="1.4" taskname="examples" />
 	</target>	
 	
-	<target name="compile_native" depends="headers, version-mismatch" description="Compiles the native files">
+	<target name="compile_native" depends="headers, touch-version, version-mismatch" description="Compiles the native files">
 		<condition property="lwjgl.platform.windows">
 			<os family="windows" />
 		</condition>


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3319] tags/lwjgl2.4/

From: <ma...@us...> - 2010-04-11 18:00:33

Revision: 3319
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3319&view=rev
Author:   matzon
Date:     2010-04-11 18:00:27 +0000 (Sun, 11 Apr 2010)

Log Message:
-----------
tagging 2.4

Added Paths:
-----------
    tags/lwjgl2.4/


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3318] trunk/LWJGL/build.xml

From: <ma...@us...> - 2010-04-11 08:27:48

Revision: 3318
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3318&view=rev
Author:   matzon
Date:     2010-04-11 08:27:41 +0000 (Sun, 11 Apr 2010)

Log Message:
-----------
quickie update to build system to output the JNI_VERSION when building

Modified Paths:
--------------
    trunk/LWJGL/build.xml

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2010-04-10 18:07:50 UTC (rev 3317)
+++ trunk/LWJGL/build.xml	2010-04-11 08:27:41 UTC (rev 3318)
@@ -256,6 +256,59 @@
 		</javah>
 	</target>
 	
+	<target name="version-mismatch">
+		<loadfile srcfile="${lwjgl.src}/java/org/lwjgl/WindowsSysImplementation.java" property="lwjgl.java.windows.version">
+			<filterchain>
+				<tokenfilter>
+	    		<containsstring contains="JNI_VERSION ="/>
+				</tokenfilter>
+			</filterchain>
+		</loadfile>
+		<loadfile srcfile="${lwjgl.src}/java/org/lwjgl/LinuxSysImplementation.java" property="lwjgl.java.linux.version">
+			<filterchain>
+				<tokenfilter>
+	    		<containsstring contains="JNI_VERSION ="/>
+				</tokenfilter>
+			</filterchain>
+		</loadfile>			
+		<loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version">
+			<filterchain>
+				<tokenfilter>
+	    		<containsstring contains="JNI_VERSION ="/>
+				</tokenfilter>
+			</filterchain>
+		</loadfile>
+		<loadfile srcfile="${lwjgl.src.native}/windows/org_lwjgl_WindowsSysImplementation.h" property="lwjgl.native.windows.version">
+			<filterchain>
+				<tokenfilter>
+	    		<containsstring contains="#define org_lwjgl_WindowsSysImplementation_JNI_VERSION"/>
+				</tokenfilter>
+			</filterchain>
+		</loadfile>
+		<loadfile srcfile="${lwjgl.src.native}/linux/org_lwjgl_LinuxSysImplementation.h" property="lwjgl.native.linux.version">
+			<filterchain>
+				<tokenfilter>
+	    		<containsstring contains="#define org_lwjgl_LinuxSysImplementation_JNI_VERSION"/>
+				</tokenfilter>
+			</filterchain>
+		</loadfile>				
+		<loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
+			<filterchain>
+				<tokenfilter>
+	    		<containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/>
+				</tokenfilter>
+			</filterchain>
+		</loadfile>
+		<echo>
+			lwjgl.java.windows.version = ${lwjgl.java.windows.version}
+			lwjgl.native.windows.version = ${lwjgl.native.windows.version}			
+			lwjgl.java.linux.version = ${lwjgl.java.linux.version}
+			lwjgl.native.linux.version = ${lwjgl.native.linux.version}			
+			lwjgl.java.macosx.version = ${lwjgl.java.macosx.version}
+			lwjgl.native.macosx.version = ${lwjgl.native.macosx.version}			
+		</echo>
+	</target>
+	
 	<!-- Compiles the Java source code -->
 	<target name="compile" description="Compiles the java source code" depends="-initialize">
 		<javac debug="yes" destdir="${lwjgl.bin}" source="1.4" target="1.4" classpath="${lwjgl.lib}/jinput.jar:${lwjgl.lib}/AppleJavaExtensions.jar" taskname="core">
@@ -272,7 +325,7 @@
 		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/examples/**" source="1.4" target="1.4" taskname="examples" />
 	</target>	
 	
-	<target name="compile_native" depends="headers" description="Compiles the native files">
+	<target name="compile_native" depends="headers, version-mismatch" description="Compiles the native files">
 		<condition property="lwjgl.platform.windows">
 			<os family="windows" />
 		</condition>


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

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

From: <ka...@us...> - 2010-04-10 18:07:57

Revision: 3317
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3317&view=rev
Author:   kappa1
Date:     2010-04-10 18:07:50 +0000 (Sat, 10 Apr 2010)

Log Message:
-----------
fix infinite focus loop when using Display.setParent() + JWS + Linux.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2010-04-09 23:57:40 UTC (rev 3316)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2010-04-10 18:07:50 UTC (rev 3317)
@@ -846,7 +846,7 @@
 			if (parent_focus) {
 				setInputFocusUnsafe(current_window);
 			}
-			else {
+			else if (xembedded) {
 				setInputFocusUnsafe(0);
 			}
 		}


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

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

From: <sp...@us...> - 2010-04-09 23:57:47

Revision: 3316
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3316&view=rev
Author:   spasi
Date:     2010-04-09 23:57:40 +0000 (Fri, 09 Apr 2010)

Log Message:
-----------
Added @NoErrorCheck on vertex data methods.
The debug build will now track Begin/End pairs and never call GetError inside them.

Modified Paths:
--------------
    trunk/LWJGL/platform_build/build-generator.xml
    trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_program.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_type_2_10_10_10_rev.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_vertex_streams.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_weighting.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_half_float.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_program.java

Modified: trunk/LWJGL/platform_build/build-generator.xml
===================================================================
--- trunk/LWJGL/platform_build/build-generator.xml	2010-04-08 22:53:45 UTC (rev 3315)
+++ trunk/LWJGL/platform_build/build-generator.xml	2010-04-09 23:57:40 UTC (rev 3316)
@@ -22,7 +22,7 @@
 	<!-- Proxy target to generate it all -->
 	<target name="generate-all" depends="generate-openal, generate-opengl, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
 
-	<target name="generate-debug" depends="generate-openal-debug, generate-opengl-debug, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
+	<target name="generate-debug" depends="generate-openal-debug, generate-opengl-debug, generate-opengl-capabilities-debug, generate-opengl-references" description="Generates java and native source"/>
 
 	<!-- Generate OpenAL -->
 	<target name="generate-openal" depends="generators" description="Generates java and native source for AL">
@@ -96,7 +96,7 @@
 		</apply>
 	</target>
 
-	<!-- Generate context capabilities -->
+	<!-- Generate references -->
 	<target name="generate-opengl-references" depends="generators" description="Generates java and native source for GL">
 		<apply executable="apt" parallel="true">
 			<arg value="-nocompile"/>
@@ -110,7 +110,7 @@
 		</apply>
 	</target>
 	
-		<!-- Generate context capabilities -->
+	<!-- Generate context capabilities -->
 	<target name="generate-opengl-capabilities" depends="generators" description="Generates java and native source for GL">
 		<apply executable="apt" parallel="true">
 			<arg value="-nocompile"/>
@@ -124,4 +124,20 @@
 			<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>
 		</apply>
 	</target>	
+	
+	<!-- Generate context capabilities [DEBUG] -->
+	<target name="generate-opengl-capabilities-debug" depends="generators" description="Generates java and native source for GL">
+		<apply executable="apt" parallel="true">
+			<arg value="-nocompile"/>
+			<arg value="-factory"/>
+			<arg value="org.lwjgl.util.generator.ContextGeneratorProcessorFactory"/>
+			<arg value="-cp"/>
+			<arg path="${lwjgl.src}/java:${lwjgl.src.templates}:${lwjgl.bin}:${java.class.path}"/>
+			<arg value="-s"/>
+			<arg path="${lwjgl.src}/generated"/>
+			<arg value="-Ageneratechecks"/>
+			<arg value="-Acontextspecific"/>
+			<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>
+		</apply>
+	</target>	
 </project>

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java	2010-04-08 22:53:45 UTC (rev 3315)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java	2010-04-09 23:57:40 UTC (rev 3316)
@@ -32,14 +32,28 @@
 package org.lwjgl.opengl;
 
 final class StateTracker {
-	private final ReferencesStack references_stack;
+	private ReferencesStack references_stack;
 	private final StateStack attrib_stack;
 
+	private boolean insideBeginEnd;
+
 	StateTracker() {
-		references_stack = new ReferencesStack();
 		attrib_stack = new StateStack(0);
 	}
 
+	/** This is called after getting function addresses. */
+	void init() {
+		references_stack = new ReferencesStack();
+	}
+
+	static void setBeginEnd(ContextCapabilities caps, boolean inside) {
+		caps.tracker.insideBeginEnd = inside;
+	}
+
+	boolean isBeginEnd() {
+		return insideBeginEnd;
+	}
+
 	static void popAttrib(ContextCapabilities caps) {
 		caps.tracker.doPopAttrib();
 	}

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java	2010-04-08 22:53:45 UTC (rev 3315)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java	2010-04-09 23:57:40 UTC (rev 3316)
@@ -49,6 +49,8 @@
 	 *
 	 */
 	public static void checkGLError() throws OpenGLException {
+		if ( ContextCapabilities.DEBUG && GLContext.getCapabilities().tracker.isBeginEnd() ) // Do not call GetError inside a Begin/End pair.
+			return;
 		int err = GL11.glGetError();
 		if ( err != GL11.GL_NO_ERROR ) {
 			throw new OpenGLException(err);

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java	2010-04-08 22:53:45 UTC (rev 3315)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java	2010-04-09 23:57:40 UTC (rev 3316)
@@ -59,9 +59,10 @@
 	private final static String EXTENSION_PREFIX = "GL_";
 	private final static String CORE_PREFIX = "Open";
 
-	public static void generateClassPrologue(PrintWriter writer, boolean context_specific) {
+	public static void generateClassPrologue(PrintWriter writer, boolean context_specific, boolean generate_error_checks) {
 		writer.println("public class " + Utils.CONTEXT_CAPS_CLASS_NAME + " {");
-		writer.println("\tfinal StateTracker tracker;");
+		writer.println("\tstatic final boolean DEBUG = " + Boolean.toString(generate_error_checks) + ";");
+		writer.println("\tfinal StateTracker tracker = new StateTracker();");
 		writer.println("\tfinal IntBuffer scratch_int_buffer = BufferUtils.createIntBuffer(16);");
 		writer.println();
 		if ( !context_specific ) {

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java	2010-04-08 22:53:45 UTC (rev 3315)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java	2010-04-09 23:57:40 UTC (rev 3316)
@@ -74,7 +74,7 @@
 	}
 
 	public Collection<String> supportedOptions() {
-		return unmodifiableCollection(Arrays.asList("-Acontextspecific"));
+		return unmodifiableCollection(Arrays.asList("-Acontextspecific", "-Ageneratechecks"));
 	}
 
 	public void roundComplete(RoundCompleteEvent event) {
@@ -99,15 +99,16 @@
 
 		public void process() {
 			Map<String, String> options = env.getOptions();
+			boolean generate_error_checks = options.containsKey("-Ageneratechecks");
 			boolean context_specific = options.containsKey("-Acontextspecific");
 			try {
-				generateContextCapabilitiesSource(context_specific);
+				generateContextCapabilitiesSource(context_specific, generate_error_checks);
 			} catch (IOException e) {
 				throw new RuntimeException(e);
 			}
 		}
 
-		private void generateContextCapabilitiesSource(boolean context_specific) throws IOException {
+		private void generateContextCapabilitiesSource(boolean context_specific, boolean generate_error_checks) throws IOException {
 			PrintWriter writer = env.getFiler().createTextFile(Filer.Location.SOURCE_TREE, "org.lwjgl.opengl", new File(Utils.CONTEXT_CAPS_CLASS_NAME + ".java"), null);
 			writer.println("/* MACHINE GENERATED FILE, DO NOT EDIT */");
 			writer.println();
@@ -120,7 +121,7 @@
 			writer.println("import java.util.HashSet;");
 			writer.println("import java.nio.IntBuffer;");
 			writer.println();
-			ContextCapabilitiesGenerator.generateClassPrologue(writer, context_specific);
+			ContextCapabilitiesGenerator.generateClassPrologue(writer, context_specific, generate_error_checks);
 			DeclarationFilter filter = DeclarationFilter.getFilter(InterfaceDeclaration.class);
 			Collection<TypeDeclaration> interface_decls = filter.filter(env.getSpecifiedTypeDeclarations());
 			for (TypeDeclaration typedecl : interface_decls) {
@@ -179,7 +180,7 @@
 				if (Utils.isFinal(interface_decl))
 					ContextCapabilitiesGenerator.generateInitializer(writer, interface_decl);
 			}
-			writer.println("\t\ttracker = new StateTracker();");
+			writer.println("\t\ttracker.init();");
 			writer.println("\t}");
 			writer.println("}");
 			writer.close();

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_program.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_program.java	2010-04-08 22:53:45 UTC (rev 3315)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_program.java	2010-04-09 23:57:40 UTC (rev 3316)
@@ -79,30 +79,43 @@
 	 */
 	int GL_MAX_VERTEX_ATTRIBS_ARB = 0x8869;
 
+	@NoErrorCheck
 	void glVertexAttrib1sARB(@GLuint int index, short x);
 
+	@NoErrorCheck
 	void glVertexAttrib1fARB(@GLuint int index, float x);
 
+	@NoErrorCheck
 	void glVertexAttrib1dARB(@GLuint int index, double x);
 
+	@NoErrorCheck
 	void glVertexAttrib2sARB(@GLuint int index, short x, short y);
 
+	@NoErrorCheck
 	void glVertexAttrib2fARB(@GLuint int index, float x, float y);
 
+	@NoErrorCheck
 	void glVertexAttrib2dARB(@GLuint int index, double x, double y);
 
+	@NoErrorCheck
 	void glVertexAttrib3sARB(@GLuint int index, short x, short y, short z);
 
+	@NoErrorCheck
 	void glVertexAttrib3fARB(@GLuint int index, float x, float y, float z);
 
+	@NoErrorCheck
 	void glVertexAttrib3dARB(@GLuint int index, double x, double y, double z);
 
+	@NoErrorCheck
 	void glVertexAttrib4sARB(@GLuint int index, short x, short y, short z, short w);
 
+	@NoErrorCheck
 	void glVertexAttrib4fARB(@GLuint int index, float x, float y, float z, float w);
 
+	@NoErrorCheck
 	void glVertexAttrib4dARB(@GLuint int index, double x, double y, double z, double w);
 
+	@NoErrorCheck
 	void glVertexAttrib4NubARB(@GLuint int index, @GLubyte byte x, @GLubyte byte y, @GLubyte byte z, @GLubyte byte w);
 
 	void glVertexAttribPointerARB(@GLuint int index, int size, @AutoType("buffer") @GLenum int type, boolean normalized, @GLsizei int stride,

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java	2010-04-08 22:53:45 UTC (rev 3315)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java	2010-04-09 23:57:40 UTC (rev 3316)
@@ -87,30 +87,43 @@
 	int GL_FLOAT_MAT3_ARB = 0x8B5B;
 	int GL_FLOAT_MAT4_ARB = 0x8B5C;
 
+	@NoErrorCheck
 	void glVertexAttrib1sARB(@GLuint int index, short v0);
 
+	@NoErrorCheck
 	void glVertexAttrib1fARB(@GLuint int index, float v0);
 
+	@NoErrorCheck
 	void glVertexAttrib1dARB(@GLuint int index, double v0);
 
+	@NoErrorCheck
 	void glVertexAttrib2sARB(@GLuint int index, short v0, short v1);
 
+	@NoErrorCheck
 	void glVertexAttrib2fARB(@GLuint int index, float v0, float v1);
 
+	@NoErrorCheck
 	void glVertexAttrib2dARB(@GLuint int index, double v0, double v1);
 
+	@NoErrorCheck
 	void glVertexAttrib3sARB(@GLuint int index, short v0, short v1, short v2);
 
+	@NoErrorCheck
 	void glVertexAttrib3fARB(@GLuint int index, float v0, float v1, float v2);
 
+	@NoErrorCheck
 	void glVertexAttrib3dARB(@GLuint int index, double v0, double v1, double v2);
 
+	@NoErrorCheck
 	void glVertexAttrib4sARB(@GLuint int index, short v0, short v1, short v2, short v3);
 
+	@NoErrorCheck
 	void glVertexAttrib4fARB(@GLuint int index, float v0, float v1, float v2, float v3);
 
+	@NoErrorCheck
 	void glVertexAttrib4dARB(@GLuint int index, double v0, double v1, double v2, double v3);
 
+	@NoErrorCheck
 	void glVertexAttrib4NubARB(@GLuint int index, @GLubyte byte x, @GLubyte byte y, @GLubyte byte z, @GLubyte byte w);
 
 	void glVertexAttribPointerARB(@GLuint int index, int size, @AutoType("buffer") @GLenum int type, boolean normalized, @GLsizei int stride,

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_type_2_10_10_10_rev.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_type_2_10_10_10_rev.java	2010-04-08 22:53:45 UTC (rev 3315)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_type_2_10_10_10_rev.java	2010-04-09 23:57:40 UTC (rev 3316)
@@ -47,98 +47,136 @@
 	int GL_UNSIGNED_INT_2_10_10_10_REV = GL12.GL_UNSIGNED_INT_2_10_10_10_REV;
 	int GL_INT_2_10_10_10_REV = 0x8D9F;
 
+	@NoErrorCheck
 	void glVertexP2ui(@GLenum int type, @GLuint int value);
 
+	@NoErrorCheck
 	void glVertexP3ui(@GLenum int type, @GLuint int value);
 
+	@NoErrorCheck
 	void glVertexP4ui(@GLenum int type, @GLuint int value);
 
+	@NoErrorCheck
 	@StripPostfix("value")
 	void glVertexP2uiv(@GLenum int type, @Check("2") @Const @GLuint IntBuffer value);
 
+	@NoErrorCheck
 	@StripPostfix("value")
 	void glVertexP3uiv(@GLenum int type, @Check("3") @Const @GLuint IntBuffer value);
 
+	@NoErrorCheck
 	@StripPostfix("value")
 	void glVertexP4uiv(@GLenum int type, @Check("4") @Const @GLuint IntBuffer value);
 
+	@NoErrorCheck
 	void glTexCoordP1ui(@GLenum int type, @GLuint int coords);
 
+	@NoErrorCheck
 	void glTexCoordP2ui(@GLenum int type, @GLuint int coords);
 
+	@NoErrorCheck
 	void glTexCoordP3ui(@GLenum int type, @GLuint int coords);
 
+	@NoErrorCheck
 	void glTexCoordP4ui(@GLenum int type, @GLuint int coords);
 
+	@NoErrorCheck
 	@StripPostfix("coords")
 	void glTexCoordP1uiv(@GLenum int type, @Check("1") @Const @GLuint IntBuffer coords);
 
+	@NoErrorCheck
 	@StripPostfix("coords")
 	void glTexCoordP2uiv(@GLenum int type, @Check("2") @Const @GLuint IntBuffer coords);
 
+	@NoErrorCheck
 	@StripPostfix("coords")
 	void glTexCoordP3uiv(@GLenum int type, @Check("3") @Const @GLuint IntBuffer coords);
 
+	@NoErrorCheck
 	@StripPostfix("coords")
 	void glTexCoordP4uiv(@GLenum int type, @Check("4") @Const @GLuint IntBuffer coords);
 
+	@NoErrorCheck
 	void glMultiTexCoordP1ui(@GLenum int texture, @GLenum int type, @GLuint int coords);
 
+	@NoErrorCheck
 	void glMultiTexCoordP2ui(@GLenum int texture, @GLenum int type, @GLuint int coords);
 
+	@NoErrorCheck
 	void glMultiTexCoordP3ui(@GLenum int texture, @GLenum int type, @GLuint int coords);
 
+	@NoErrorCheck
 	void glMultiTexCoordP4ui(@GLenum int texture, @GLenum int type, @GLuint int coords);
 
+	@NoErrorCheck
 	@StripPostfix("coords")
 	void glMultiTexCoordP1uiv(@GLenum int texture, @GLenum int type, @Check("1") @Const @GLuint IntBuffer coords);
 
+	@NoErrorCheck
 	@StripPostfix("coords")
 	void glMultiTexCoordP2uiv(@GLenum int texture, @GLenum int type, @Check("2") @Const @GLuint IntBuffer coords);
 
+	@NoErrorCheck
 	@StripPostfix("coords")
 	void glMultiTexCoordP3uiv(@GLenum int texture, @GLenum int type, @Check("3") @Const @GLuint IntBuffer coords);
 
+	@NoErrorCheck
 	@StripPostfix("coords")
 	void glMultiTexCoordP4uiv(@GLenum int texture, @GLenum int type, @Check("4") @Const @GLuint IntBuffer coords);
 
+	@NoErrorCheck
 	void glNormalP3ui(@GLenum int type, @GLuint int coords);
 
+	@NoErrorCheck
 	@StripPostfix("coords")
 	void glNormalP3uiv(@GLenum int type, @Check("3") @Const @GLuint IntBuffer coords);
 
+	@NoErrorCheck
 	void glColorP3ui(@GLenum int type, @GLuint int color);
 
+	@NoErrorCheck
 	void glColorP4ui(@GLenum int type, @GLuint int color);
 
+	@NoErrorCheck
 	@StripPostfix("color")
 	void glColorP3uiv(@GLenum int type, @Check("3") @Const @GLuint IntBuffer color);
 
+	@NoErrorCheck
 	@StripPostfix("color")
 	void glColorP4uiv(@GLenum int type, @Check("4") @Const @GLuint IntBuffer color);
 
+	@NoErrorCheck
 	void glSecondaryColorP3ui(@GLenum int type, @GLuint int color);
 
+	@NoErrorCheck
 	@StripPostfix("color")
 	void glSecondaryColorP3uiv(@GLenum int type, @Check("3") @Const @GLuint IntBuffer color);
 
+	@NoErrorCheck
 	void glVertexAttribP1ui(@GLuint int index, @GLenum int type, boolean normalized, @GLuint int value);
 
+	@NoErrorCheck
 	void glVertexAttribP2ui(@GLuint int index, @GLenum int type, boolean normalized, @GLuint int value);
 
+	@NoErrorCheck
 	void glVertexAttribP3ui(@GLuint int index, @GLenum int type, boolean normalized, @GLuint int value);
 
+	@NoErrorCheck
 	void glVertexAttribP4ui(@GLuint int index, @GLenum int type, boolean normalized, @GLuint int value);
 
+	@NoErrorCheck
 	@StripPostfix("value")
 	void glVertexAttribP1uiv(@GLuint int index, @GLenum int type, boolean normalized, @Check("1") @Const @GLuint IntBuffer value);
 
+	@NoErrorCheck
 	@StripPostfix("value")
 	void glVertexAttribP2uiv(@GLuint int index, @GLenum int type, boolean normalized, @Check("2") @Const @GLuint IntBuffer value);
 
+	@NoErrorCheck
 	@StripPostfix("value")
 	void glVertexAttribP3uiv(@GLuint int index, @GLenum int type, boolean normalized, @Check("3") @Const @GLuint IntBuffer value);
 
+	@NoErrorCheck
 	@StripPostfix("value")
 	void glVertexAttribP4uiv(@GLuint int index, @GLenum int type, boolean normalized, @Check("4") @Const @GLuint IntBuffer value);
 

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_vertex_streams.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_vertex_streams.java	2010-04-08 22:53:45 UTC (rev 3315)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_vertex_streams.java	2010-04-09 23:57:40 UTC (rev 3316)
@@ -45,38 +45,55 @@
 	int GL_VERTEX_STREAM6_ATI = 0x8773;
 	int GL_VERTEX_STREAM7_ATI = 0x8774;
 
+	@NoErrorCheck
 	void glVertexStream2fATI(@GLenum int stream, float x, float y);
 
+	@NoErrorCheck
 	void glVertexStream2dATI(@GLenum int stream, double x, double y);
 
+	@NoErrorCheck
 	void glVertexStream2iATI(@GLenum int stream, int x, int y);
 
+	@NoErrorCheck
 	void glVertexStream2sATI(@GLenum int stream, short x, short y);
 
+	@NoErrorCheck
 	void glVertexStream3fATI(@GLenum int stream, float x, float y, float z);
 
+	@NoErrorCheck
 	void glVertexStream3dATI(@GLenum int stream, double x, double y, double z);
 
+	@NoErrorCheck
 	void glVertexStream3iATI(@GLenum int stream, int x, int y, int z);
 
+	@NoErrorCheck
 	void glVertexStream3sATI(@GLenum int stream, short x, short y, short z);
 
+	@NoErrorCheck
 	void glVertexStream4fATI(@GLenum int stream, float x, float y, float z, float w);
 
+	@NoErrorCheck
 	void glVertexStream4dATI(@GLenum int stream, double x, double y, double z, double w);
 
+	@NoErrorCheck
 	void glVertexStream4iATI(@GLenum int stream, int x, int y, int z, int w);
 
+	@NoErrorCheck
 	void glVertexStream4sATI(@GLenum int stream, short x, short y, short z, short w);
 
+	@NoErrorCheck
 	void glNormalStream3bATI(@GLenum int stream, byte x, byte y, byte z);
 
+	@NoErrorCheck
 	void glNormalStream3fATI(@GLenum int stream, float x, float y, float z);
 
+	@NoErrorCheck
 	void glNormalStream3dATI(@GLenum int stream, double x, double y, double z);
 
+	@NoErrorCheck
 	void glNormalStream3iATI(@GLenum int stream, int x, int y, int z);
 
+	@NoErrorCheck
 	void glNormalStream3sATI(@GLenum int stream, short x, short y, short z);
 
 	void glClientActiveVertexStreamATI(@GLenum int stream);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java	2010-04-08 22:53:45 UTC (rev 3315)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java	2010-04-09 23:57:40 UTC (rev 3316)
@@ -83,55 +83,75 @@
 	int GL_MIN_PROGRAM_TEXEL_OFFSET_EXT = 0x8904;
 	int GL_MAX_PROGRAM_TEXEL_OFFSET_EXT = 0x8905;
 
+	@NoErrorCheck
 	void glVertexAttribI1iEXT(@GLuint int index, int x);
 
+	@NoErrorCheck
 	void glVertexAttribI2iEXT(@GLuint int index, int x, int y);
 
+	@NoErrorCheck
 	void glVertexAttribI3iEXT(@GLuint int index, int x, int y, int z);
 
+	@NoErrorCheck
 	void glVertexAttribI4iEXT(@GLuint int index, int x, int y, int z, int w);
 
+	@NoErrorCheck
 	void glVertexAttribI1uiEXT(@GLuint int index, @GLuint int x);
 
+	@NoErrorCheck
 	void glVertexAttribI2uiEXT(@GLuint int index, @GLuint int x, @GLuint int y);
 
+	@NoErrorCheck
 	void glVertexAttribI3uiEXT(@GLuint int index, @GLuint int x, @GLuint int y, @GLuint int z);
 
+	@NoErrorCheck
 	void glVertexAttribI4uiEXT(@GLuint int index, @GLuint int x, @GLuint int y, @GLuint int z, @GLuint int w);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI1ivEXT(@GLuint int index, @Check("1") @Const IntBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI2ivEXT(@GLuint int index, @Check("2") @Const IntBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI3ivEXT(@GLuint int index, @Check("3") @Const IntBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI4ivEXT(@GLuint int index, @Check("4") @Const IntBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI1uivEXT(@GLuint int index, @Check("1") @Const @GLuint IntBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI2uivEXT(@GLuint int index, @Check("2") @Const @GLuint IntBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI3uivEXT(@GLuint int index, @Check("3") @Const @GLuint IntBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI4uivEXT(@GLuint int index, @Check("4") @Const @GLuint IntBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI4bvEXT(@GLuint int index, @Check("4") @Const ByteBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI4svEXT(@GLuint int index, @Check("4") @Const ShortBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI4ubvEXT(@GLuint int index, @Check("4") @Const @GLubyte ByteBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI4usvEXT(@GLuint int index, @Check("4") @Const @GLushort ShortBuffer v);
 

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_weighting.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_weighting.java	2010-04-08 22:53:45 UTC (rev 3315)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_weighting.java	2010-04-09 23:57:40 UTC (rev 3316)
@@ -50,6 +50,7 @@
 	int GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT = 0x850F;
 	int GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT = 0x8510;
 
+	@NoErrorCheck
 	void glVertexWeightfEXT(float weight);
 
 	void glVertexWeightPointerEXT(@GLsizei int size, @AutoType("pPointer") @GLenum int type, @GLsizei int stride,

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java	2010-04-08 22:53:45 UTC (rev 3315)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java	2010-04-09 23:57:40 UTC (rev 3316)
@@ -764,9 +764,11 @@
 
 	@NoErrorCheck
 	@DeprecatedGL
+	@Code("\t\tif ( ContextCapabilities.DEBUG ) StateTracker.setBeginEnd(caps, true);")
 	void glBegin(@GLenum int mode);
 
 	@DeprecatedGL
+	@Code("\t\tif ( ContextCapabilities.DEBUG ) StateTracker.setBeginEnd(caps, false);")
 	void glEnd();
 
 	@NoErrorCheck

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2010-04-08 22:53:45 UTC (rev 3315)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2010-04-09 23:57:40 UTC (rev 3316)
@@ -296,30 +296,43 @@
 	// ----------------------[ ARB_vertex_program ]----------------------
 	// ------------------------------------------------------------------
 
+	@NoErrorCheck
 	void glVertexAttrib1s(@GLuint int index, short x);
 
+	@NoErrorCheck
 	void glVertexAttrib1f(@GLuint int index, float x);
 
+	@NoErrorCheck
 	void glVertexAttrib1d(@GLuint int index, double x);
 
+	@NoErrorCheck
 	void glVertexAttrib2s(@GLuint int index, short x, short y);
 
+	@NoErrorCheck
 	void glVertexAttrib2f(@GLuint int index, float x, float y);
 
+	@NoErrorCheck
 	void glVertexAttrib2d(@GLuint int index, double x, double y);
 
+	@NoErrorCheck
 	void glVertexAttrib3s(@GLuint int index, short x, short y, short z);
 
+	@NoErrorCheck
 	void glVertexAttrib3f(@GLuint int index, float x, float y, float z);
 
+	@NoErrorCheck
 	void glVertexAttrib3d(@GLuint int index, double x, double y, double z);
 
+	@NoErrorCheck
 	void glVertexAttrib4s(@GLuint int index, short x, short y, short z, short w);
 
+	@NoErrorCheck
 	void glVertexAttrib4f(@GLuint int index, float x, float y, float z, float w);
 
+	@NoErrorCheck
 	void glVertexAttrib4d(@GLuint int index, double x, double y, double z, double w);
 
+	@NoErrorCheck
 	void glVertexAttrib4Nub(@GLuint int index, @GLubyte byte x, @GLubyte byte y, @GLubyte byte z, @GLubyte byte w);
 
 	void glVertexAttribPointer(@GLuint int index, int size, @AutoType("buffer") @GLenum int type, boolean normalized, @GLsizei int stride,

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java	2010-04-08 22:53:45 UTC (rev 3315)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java	2010-04-09 23:57:40 UTC (rev 3316)
@@ -129,55 +129,75 @@
 	int GL_MIN_PROGRAM_TEXEL_OFFSET = 0x8904;
 	int GL_MAX_PROGRAM_TEXEL_OFFSET = 0x8905;
 
+	@NoErrorCheck
 	void glVertexAttribI1i(@GLuint int index, int x);
 
+	@NoErrorCheck
 	void glVertexAttribI2i(@GLuint int index, int x, int y);
 
+	@NoErrorCheck
 	void glVertexAttribI3i(@GLuint int index, int x, int y, int z);
 
+	@NoErrorCheck
 	void glVertexAttribI4i(@GLuint int index, int x, int y, int z, int w);
 
+	@NoErrorCheck
 	void glVertexAttribI1ui(@GLuint int index, @GLuint int x);
 
+	@NoErrorCheck
 	void glVertexAttribI2ui(@GLuint int index, @GLuint int x, @GLuint int y);
 
+	@NoErrorCheck
 	void glVertexAttribI3ui(@GLuint int index, @GLuint int x, @GLuint int y, @GLuint int z);
 
+	@NoErrorCheck
 	void glVertexAttribI4ui(@GLuint int index, @GLuint int x, @GLuint int y, @GLuint int z, @GLuint int w);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI1iv(@GLuint int index, @Check("1") @Const IntBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI2iv(@GLuint int index, @Check("2") @Const IntBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI3iv(@GLuint int index, @Check("3") @Const IntBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI4iv(@GLuint int index, @Check("4") @Const IntBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI1uiv(@GLuint int index, @Check("1") @Const @GLuint IntBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI2uiv(@GLuint int index, @Check("2") @Const @GLuint IntBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI3uiv(@GLuint int index, @Check("3") @Const @GLuint IntBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI4uiv(@GLuint int index, @Check("4") @Const @GLuint IntBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI4bv(@GLuint int index, @Check("4") @Const ByteBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI4sv(@GLuint int index, @Check("4") @Const ShortBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI4ubv(@GLuint int index, @Check("4") @Const @GLubyte ByteBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribI4usv(@GLuint int index, @Check("4") @Const @GLushort ShortBuffer v);
 

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java	2010-04-08 22:53:45 UTC (rev 3315)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java	2010-04-09 23:57:40 UTC (rev 3316)
@@ -244,135 +244,173 @@
 	 */
 	int GL_INT_2_10_10_10_REV = 0x8D9F;
 
+	@NoErrorCheck
 	@DeprecatedGL
 	void glVertexP2ui(@GLenum int type, @GLuint int value);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	void glVertexP3ui(@GLenum int type, @GLuint int value);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	void glVertexP4ui(@GLenum int type, @GLuint int value);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	@StripPostfix("value")
 	void glVertexP2uiv(@GLenum int type, @Check("2") @Const @GLuint IntBuffer value);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	@StripPostfix("value")
 	void glVertexP3uiv(@GLenum int type, @Check("3") @Const @GLuint IntBuffer value);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	@StripPostfix("value")
 	void glVertexP4uiv(@GLenum int type, @Check("4") @Const @GLuint IntBuffer value);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	void glTexCoordP1ui(@GLenum int type, @GLuint int coords);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	void glTexCoordP2ui(@GLenum int type, @GLuint int coords);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	void glTexCoordP3ui(@GLenum int type, @GLuint int coords);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	void glTexCoordP4ui(@GLenum int type, @GLuint int coords);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	@StripPostfix("coords")
 	void glTexCoordP1uiv(@GLenum int type, @Check("1") @Const @GLuint IntBuffer coords);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	@StripPostfix("coords")
 	void glTexCoordP2uiv(@GLenum int type, @Check("2") @Const @GLuint IntBuffer coords);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	@StripPostfix("coords")
 	void glTexCoordP3uiv(@GLenum int type, @Check("3") @Const @GLuint IntBuffer coords);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	@StripPostfix("coords")
 	void glTexCoordP4uiv(@GLenum int type, @Check("4") @Const @GLuint IntBuffer coords);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	void glMultiTexCoordP1ui(@GLenum int texture, @GLenum int type, @GLuint int coords);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	void glMultiTexCoordP2ui(@GLenum int texture, @GLenum int type, @GLuint int coords);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	void glMultiTexCoordP3ui(@GLenum int texture, @GLenum int type, @GLuint int coords);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	void glMultiTexCoordP4ui(@GLenum int texture, @GLenum int type, @GLuint int coords);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	@StripPostfix("coords")
 	void glMultiTexCoordP1uiv(@GLenum int texture, @GLenum int type, @Check("1") @Const @GLuint IntBuffer coords);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	@StripPostfix("coords")
 	void glMultiTexCoordP2uiv(@GLenum int texture, @GLenum int type, @Check("2") @Const @GLuint IntBuffer coords);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	@StripPostfix("coords")
 	void glMultiTexCoordP3uiv(@GLenum int texture, @GLenum int type, @Check("3") @Const @GLuint IntBuffer coords);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	@StripPostfix("coords")
 	void glMultiTexCoordP4uiv(@GLenum int texture, @GLenum int type, @Check("4") @Const @GLuint IntBuffer coords);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	void glNormalP3ui(@GLenum int type, @GLuint int coords);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	@StripPostfix("coords")
 	void glNormalP3uiv(@GLenum int type, @Check("3") @Const @GLuint IntBuffer coords);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	void glColorP3ui(@GLenum int type, @GLuint int color);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	void glColorP4ui(@GLenum int type, @GLuint int color);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	@StripPostfix("color")
 	void glColorP3uiv(@GLenum int type, @Check("3") @Const @GLuint IntBuffer color);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	@StripPostfix("color")
 	void glColorP4uiv(@GLenum int type, @Check("4") @Const @GLuint IntBuffer color);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	void glSecondaryColorP3ui(@GLenum int type, @GLuint int color);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	@StripPostfix("color")
 	void glSecondaryColorP3uiv(@GLenum int type, @Check("3") @Const @GLuint IntBuffer color);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	void glVertexAttribP1ui(@GLuint int index, @GLenum int type, boolean normalized, @GLuint int value);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	void glVertexAttribP2ui(@GLuint int index, @GLenum int type, boolean normalized, @GLuint int value);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	void glVertexAttribP3ui(@GLuint int index, @GLenum int type, boolean normalized, @GLuint int value);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	void glVertexAttribP4ui(@GLuint int index, @GLenum int type, boolean normalized, @GLuint int value);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	@StripPostfix("value")
 	void glVertexAttribP1uiv(@GLuint int index, @GLenum int type, boolean normalized, @Check("1") @Const @GLuint IntBuffer value);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	@StripPostfix("value")
 	void glVertexAttribP2uiv(@GLuint int index, @GLenum int type, boolean normalized, @Check("2") @Const @GLuint IntBuffer value);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	@StripPostfix("value")
 	void glVertexAttribP3uiv(@GLuint int index, @GLenum int type, boolean normalized, @Check("3") @Const @GLuint IntBuffer value);
 
+	@NoErrorCheck
 	@DeprecatedGL
 	@StripPostfix("value")
 	void glVertexAttribP4uiv(@GLuint int index, @GLenum int type, boolean normalized, @Check("4") @Const @GLuint IntBuffer value);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_half_float.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_half_float.java	2010-04-08 22:53:45 UTC (rev 3315)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_half_float.java	2010-04-09 23:57:40 UTC (rev 3316)
@@ -46,66 +46,91 @@
 	 */
 	int GL_HALF_FLOAT_NV = 0x140B;
 
+	@NoErrorCheck
 	void glVertex2hNV(@GLhalf short x, @GLhalf short y);
 
+	@NoErrorCheck
 	void glVertex3hNV(@GLhalf short x, @GLhalf short y, @GLhalf short z);
 
+	@NoErrorCheck
 	void glVertex4hNV(@GLhalf short x, @GLhalf short y, @GLhalf short z, @GLhalf short w);
 
+	@NoErrorCheck
 	void glNormal3hNV(@GLhalf short nx, @GLhalf short ny, @GLhalf short nz);
 
+	@NoErrorCheck
 	void glColor3hNV(@GLhalf short red, @GLhalf short green, @GLhalf short blue);
 
+	@NoErrorCheck
 	void glColor4hNV(@GLhalf short red, @GLhalf short green, @GLhalf short blue, @GLhalf short alpha);
 
+	@NoErrorCheck
 	void glTexCoord1hNV(@GLhalf short s);
 
+	@NoErrorCheck
 	void glTexCoord2hNV(@GLhalf short s, @GLhalf short t);
 
+	@NoErrorCheck
 	void glTexCoord3hNV(@GLhalf short s, @GLhalf short t, @GLhalf short r);
 
+	@NoErrorCheck
 	void glTexCoord4hNV(@GLhalf short s, @GLhalf short t, @GLhalf short r, @GLhalf short q);
 
+	@NoErrorCheck
 	void glMultiTexCoord1hNV(@GLenum int target, @GLhalf short s);
 
+	@NoErrorCheck
 	void glMultiTexCoord2hNV(@GLenum int target, @GLhalf short s, @GLhalf short t);
 
+	@NoErrorCheck
 	void glMultiTexCoord3hNV(@GLenum int target, @GLhalf short s, @GLhalf short t, @GLhalf short r);
 
+	@NoErrorCheck
 	void glMultiTexCoord4hNV(@GLenum int target, @GLhalf short s, @GLhalf short t, @GLhalf short r, @GLhalf short q);
 
+	@NoErrorCheck
 	void glFogCoordhNV(@GLhalf short fog);
 
+	@NoErrorCheck
 	void glSecondaryColor3hNV(@GLhalf short red, @GLhalf short green, @GLhalf short blue);
 
 	@Optional(reason = "AMD does not expose this (last driver checked: 10.3)")
+	@NoErrorCheck
 	void glVertexWeighthNV(@GLhalf short weight);
 
 	@Optional(reason = "AMD does not expose this (last driver checked: 10.3)")
+	@NoErrorCheck
 	void glVertexAttrib1hNV(@GLuint int index, @GLhalf short x);
 
 	@Optional(reason = "AMD does not expose this (last driver checked: 10.3)")
+	@NoErrorCheck
 	void glVertexAttrib2hNV(@GLuint int index, @GLhalf short x, @GLhalf short y);
 
 	@Optional(reason = "AMD does not expose this (last driver checked: 10.3)")
+	@NoErrorCheck
 	void glVertexAttrib3hNV(@GLuint int index, @GLhalf short x, @GLhalf short y, @GLhalf short z);
 
 	@Optional(reason = "AMD does not expose this (last driver checked: 10.3)")
+	@NoErrorCheck
 	void glVertexAttrib4hNV(@GLuint int index, @GLhalf short x, @GLhalf short y, @GLhalf short z, @GLhalf short w);
 
 	@Optional(reason = "AMD does not expose this (last driver checked: 10.3)")
+	@NoErrorCheck
 	@StripPostfix("attribs")
 	void glVertexAttribs1hvNV(@GLuint int index, @AutoSize("attribs") @GLsizei int n, @Const @GLhalf ShortBuffer attribs);
 
 	@Optional(reason = "AMD does not expose this (last driver checked: 10.3)")
+	@NoErrorCheck
 	@StripPostfix("attribs")
 	void glVertexAttribs2hvNV(@GLuint int index, @AutoSize(value = "attribs", expression = " >> 1") @GLsizei int n, @Const @GLhalf ShortBuffer attribs);
 
 	@Optional(reason = "AMD does not expose this (last driver checked: 10.3)")
+	@NoErrorCheck
 	@StripPostfix("attribs")
 	void glVertexAttribs3hvNV(@GLuint int index, @AutoSize(value = "attribs", expression = " / 3") @GLsizei int n, @Const @GLhalf ShortBuffer attribs);
 
 	@Optional(reason = "AMD does not expose this (last driver checked: 10.3)")
+	@NoErrorCheck
 	@StripPostfix("attribs")
 	void glVertexAttribs4hvNV(@GLuint int index, @AutoSize(value = "attribs", expression = " >> 2") @GLsizei int n, @Const @GLhalf ShortBuffer attribs);
 }

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_program.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_program.java	2010-04-08 22:53:45 UTC (rev 3315)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_program.java	2010-04-09 23:57:40 UTC (rev 3316)
@@ -241,65 +241,90 @@
 	                             @GLfloat
 	                             @GLdouble Buffer buffer);
 
+	@NoErrorCheck
 	void glVertexAttrib1sNV(@GLuint int index, short x);
 
+	@NoErrorCheck
 	void glVertexAttrib1fNV(@GLuint int index, float x);
 
+	@NoErrorCheck
 	void glVertexAttrib1dNV(@GLuint int index, double x);
 
+	@NoErrorCheck
 	void glVertexAttrib2sNV(@GLuint int index, short x, short y);
 
+	@NoErrorCheck
 	void glVertexAttrib2fNV(@GLuint int index, float x, float y);
 
+	@NoErrorCheck
 	void glVertexAttrib2dNV(@GLuint int index, double x, double y);
 
+	@NoErrorCheck
 	void glVertexAttrib3sNV(@GLuint int index, short x, short y, short z);
 
+	@NoErrorCheck
 	void glVertexAttrib3fNV(@GLuint int index, float x, float y, float z);
 
+	@NoErrorCheck
 	void glVertexAttrib3dNV(@GLuint int index, double x, double y, double z);
 
+	@NoErrorCheck
 	void glVertexAttrib4sNV(@GLuint int index, short x, short y, short z, short w);
 
+	@NoErrorCheck
 	void glVertexAttrib4fNV(@GLuint int index, float x, float y, float z, float w);
 
+	@NoErrorCheck
 	void glVertexAttrib4dNV(@GLuint int index, double x, double y, double z, double w);
 
+	@NoErrorCheck
 	void glVertexAttrib4ubNV(@GLuint int index, @GLubyte byte x, @GLubyte byte y, @GLubyte byte z, @GLubyte byte w);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribs1svNV(@GLuint int index, @AutoSize("v") @GLsizei int n, @Const ShortBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribs1fvNV(@GLuint int index, @AutoSize("v") @GLsizei int n, @Const FloatBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribs1dvNV(@GLuint int index, @AutoSize("v") @GLsizei int n, @Const DoubleBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribs2svNV(@GLuint int index, @AutoSize(value = "v", expression = " >> 1") @GLsizei int n, @Const ShortBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribs2fvNV(@GLuint int index, @AutoSize(value = "v", expression = " >> 1") @GLsizei int n, @Const FloatBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribs2dvNV(@GLuint int index, @AutoSize(value = "v", expression = " >> 1") @GLsizei int n, @Const DoubleBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribs3svNV(@GLuint int index, @AutoSize(value = "v", expression = " / 3") @GLsizei int n, @Const ShortBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribs3fvNV(@GLuint int index, @AutoSize(value = "v", expression = " / 3") @GLsizei int n, @Const FloatBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribs3dvNV(@GLuint int index, @AutoSize(value = "v", expression = " / 3") @GLsizei int n, @Const DoubleBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribs4svNV(@GLuint int index, @AutoSize(value = "v", expression = " >> 2") @GLsizei int n, @Const ShortBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribs4fvNV(@GLuint int index, @AutoSize(value = "v", expression = " >> 2") @GLsizei int n, @Const FloatBuffer v);
 
+	@NoErrorCheck
 	@StripPostfix("v")
 	void glVertexAttribs4dvNV(@GLuint int index, @AutoSize(value = "v", expression = " >> 2") @GLsizei int n, @Const DoubleBuffer v);
 }


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

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

From: <ka...@us...> - 2010-04-08 22:53:51

Revision: 3315
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3315&view=rev
Author:   kappa1
Date:     2010-04-08 22:53:45 +0000 (Thu, 08 Apr 2010)

Log Message:
-----------
Example on how to allow Space Invader Test Application to work as an applet with minimal code change.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Game.java

Added Paths:
-----------
    trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/GameApplet.java

Modified: trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Game.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Game.java	2010-04-07 20:06:59 UTC (rev 3314)
+++ trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Game.java	2010-04-08 22:53:45 UTC (rev 3315)
@@ -167,6 +167,9 @@
 
   /** Mouse movement on x axis */
 	private int	mouseX;
+	
+	/** Is this an application or applet */
+	private static boolean isApplication = false;
 
 	/**
 	 * Construct our game and set it running.
@@ -210,13 +213,15 @@
 	public void initialize() {
 		// initialize the window beforehand
 		try {
-      setDisplayMode();
-      Display.setTitle(WINDOW_TITLE);
-      Display.setFullscreen(fullscreen);
-      Display.create();
-      
+			setDisplayMode();
+			Display.setTitle(WINDOW_TITLE);
+			Display.setFullscreen(fullscreen);
+			Display.create();
+	      
 			// grab the mouse, dont want that hideous cursor when we're playing!
-			Mouse.setGrabbed(true);
+			if (isApplication) {	
+				Mouse.setGrabbed(true);
+			}
 
 			// enable textures since we're going to use these for our sprites
 			GL11.glEnable(GL11.GL_TEXTURE_2D);
@@ -426,6 +431,10 @@
 			// update window contents
 			Display.update();
 		}
+		
+		// clean up
+		soundManager.destroy();
+		Display.destroy();
 	}
 
 	/**
@@ -542,7 +551,7 @@
 		}
 
 		// if escape has been pressed, stop the game
-		if (Display.isCloseRequested() || Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)) {
+		if ((Display.isCloseRequested() || Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)) && isApplication) {
 			Game.gameRunning = false;
 		}
 	}
@@ -579,6 +588,7 @@
 	 * @param argv The arguments that are passed into our game
 	 */
 	public static void main(String argv[]) {
+		isApplication = true;
 		System.out.println("Use -fullscreen for fullscreen mode");
 		new Game((argv.length > 0 && argv[0].equalsIgnoreCase("-fullscreen"))).execute();
 		System.exit(0);
@@ -587,10 +597,8 @@
 	/**
 	 * 
 	 */
-	private void execute() {
+	public void execute() {
 		gameLoop();
-		soundManager.destroy();
-		Display.destroy();
 	}
 
 	/**

Added: trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/GameApplet.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/GameApplet.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/GameApplet.java	2010-04-08 22:53:45 UTC (rev 3315)
@@ -0,0 +1,104 @@
+package org.lwjgl.examples.spaceinvaders;
+
+
+import java.applet.Applet;
+import java.awt.BorderLayout;
+import java.awt.Canvas;
+import org.lwjgl.LWJGLException;
+import org.lwjgl.opengl.Display;
+
+public class GameApplet extends Applet {
+	
+	/** The Canvas where the LWJGL Display is added */
+	Canvas display_parent;
+	
+	/** Thread which runs the main game loop */
+	Thread gameThread;
+	
+	/** The Game instance */
+	Game game;
+	
+	/**
+	 * Once the Canvas is created its add notify method will call this method to 
+	 * start the LWJGL Display and game loop in another thread.
+	 */
+	public void startLWJGL() {
+		gameThread = new Thread() {
+			public void run() {
+				
+				try {
+					Display.setParent(display_parent);
+					
+				} catch (LWJGLException e) {
+					e.printStackTrace();
+				}
+				// start game
+				game = new Game(false);
+				game.execute();
+			}
+		};
+		gameThread.start();
+	}
+	
+	
+	/**
+	 * Tell game loop to stop running, after which the LWJGL Display will be destoryed.
+	 * The main thread will wait for the Display.destroy() to complete
+	 */
+	private void stopLWJGL() {
+		Game.gameRunning = false;
+		try {
+			gameThread.join();
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void start() {
+		
+	}
+
+	public void stop() {
+		
+	}
+	
+	/**
+	 * Applet Destroy method will remove the canvas, before canvas is destroyed it will notify 
+	 * stopLWJGL() to stop main game loop and to destroy the Display
+	 */
+	public void destroy() {
+		remove(display_parent);
+		super.destroy();
+		System.out.println("Clear up");
+	}
+	
+	/**
+	 * initialise applet by adding a canvas to it, this canvas will start the LWJGL Display and game loop
+	 * in another thread. It will also stop the game loop and destroy the display on canvas removal when 
+	 * applet is destroyed.
+	 */
+	public void init() {
+		setLayout(new BorderLayout());
+		try {
+			display_parent = new Canvas() {
+				public final void addNotify() {
+					super.addNotify();
+					startLWJGL();
+				}
+				public final void removeNotify() {
+					stopLWJGL();
+					super.removeNotify();
+				}
+			};
+			display_parent.setSize(getWidth(),getHeight());
+			add(display_parent);
+			display_parent.setFocusable(true);
+			display_parent.requestFocus();
+			display_parent.setIgnoreRepaint(true);
+			setVisible(true);
+		} catch (Exception e) {
+			System.err.println(e);
+			throw new RuntimeException("Unable to create display");
+		}
+	}
+}
\ No newline at end of file


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3314] trunk/LWJGL/libs/lzma.jar

From: <ka...@us...> - 2010-04-07 20:07:05

Revision: 3314
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3314&view=rev
Author:   kappa1
Date:     2010-04-07 20:06:59 +0000 (Wed, 07 Apr 2010)

Log Message:
-----------
fix corrupt lzma.jar which caused signjar task to remove entries in the manifest file.

Modified Paths:
--------------
    trunk/LWJGL/libs/lzma.jar

Modified: trunk/LWJGL/libs/lzma.jar
===================================================================
(Binary files differ)


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

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

From: <sp...@us...> - 2010-04-07 12:06:16

Revision: 3313
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3313&view=rev
Author:   spasi
Date:     2010-04-07 12:06:10 +0000 (Wed, 07 Apr 2010)

Log Message:
-----------
More glGetActive changes.

Modified Paths:
--------------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java	2010-04-07 11:59:33 UTC (rev 3312)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java	2010-04-07 12:06:10 UTC (rev 3313)
@@ -151,14 +151,14 @@
 	                           @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
 	                           @OutParameter @GLcharARB ByteBuffer name);
 
-	/** Overloads glGetActiveAttribARB. This version returns only the uniform name. */
+	/** Overloads glGetActiveAttribARB. This version returns only the attrib name. */
 	@Alternate(value = "glGetActiveAttribARB", javaAlt = true)
 	@GLreturn(value = "name", maxLength = "maxLength")
 	void glGetActiveAttribARB(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
 	                          @OutParameter @GLsizei @Constant("name_length, 0, APIUtils.getBufferInt(), 0, APIUtils.getBufferInt(), 1") IntBuffer length,
 	                          @OutParameter @GLcharARB ByteBuffer name);
 
-	/** Overloads glGetActiveAttribARB. This version returns only the uniform size. */
+	/** Overloads glGetActiveAttribARB. This version returns only the attrib size. */
 	@Alternate(value = "glGetActiveAttribARB", javaAlt = true)
 	@GLreturn(value = "size")
 	void glGetActiveAttribSizeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@@ -167,7 +167,7 @@
 	                              @OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
 	                              @OutParameter @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
-	/** Overloads glGetActiveAttribARB. This version returns only the uniform type. */
+	/** Overloads glGetActiveAttribARB. This version returns only the attrib type. */
 	@Alternate(value = "glGetActiveAttribARB", javaAlt = true)
 	@GLreturn(value = "type")
 	void glGetActiveAttribTypeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2010-04-07 11:59:33 UTC (rev 3312)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2010-04-07 12:06:10 UTC (rev 3313)
@@ -404,29 +404,39 @@
 	                       @OutParameter @GLenum @Check("1") IntBuffer type,
 	                       @OutParameter @GLchar ByteBuffer name);
 
+	/** Overloads glGetActiveAttrib. This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
 	@Alternate("glGetActiveAttrib")
 	@GLreturn(value = "name", maxLength = "maxLength")
 	void glGetActiveAttrib2(@GLuint int program, @GLuint int index, @GLsizei int maxLength,
 	                        @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
-	                        @OutParameter @Check("1") IntBuffer size,
-	                        @OutParameter @GLenum @Check("1") IntBuffer type,
+	                        @OutParameter @Check("2") IntBuffer sizeType,
+	                        @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
 	                        @OutParameter @GLchar ByteBuffer name);
 
+	/** Overloads glGetActiveAttrib. This version returns only the attrib name. */
 	@Alternate(value = "glGetActiveAttrib", javaAlt = true)
+	@GLreturn(value = "name", maxLength = "maxLength")
+	void glGetActiveAttrib(@GLuint int program, @GLuint int index, @GLsizei int maxLength,
+	                       @OutParameter @GLsizei @Constant("name_length, 0, APIUtils.getBufferInt(), 0, APIUtils.getBufferInt(), 1") IntBuffer length,
+	                       @OutParameter @GLchar ByteBuffer name);
+
+	/** Overloads glGetActiveAttribARB. This version returns only the attrib size. */
+	@Alternate(value = "glGetActiveAttrib", javaAlt = true)
 	@GLreturn(value = "size")
 	void glGetActiveAttribSize(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength,
 	                           @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
 	                           @OutParameter IntBuffer size,
 	                           @OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
-	                           @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+	                           @OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
+	/** Overloads glGetActiveAttrib. This version returns only the attrib type. */
 	@Alternate(value = "glGetActiveAttrib", javaAlt = true)
 	@GLreturn(value = "type")
 	void glGetActiveAttribType(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength,
 	                           @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
 	                           @OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore
 	                           @OutParameter @GLenum IntBuffer type,
-	                           @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+	                           @OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
 	int glGetAttribLocation(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name);
 


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

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

From: <sp...@us...> - 2010-04-07 11:59:39

Revision: 3312
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3312&view=rev
Author:   spasi
Date:     2010-04-07 11:59:33 +0000 (Wed, 07 Apr 2010)

Log Message:
-----------
More glGetActive changes.

Modified Paths:
--------------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java	2010-04-07 10:28:05 UTC (rev 3311)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java	2010-04-07 11:59:33 UTC (rev 3312)
@@ -219,40 +219,39 @@
 	                           @OutParameter @GLenum @Check("1") IntBuffer type,
 	                           @OutParameter @GLcharARB ByteBuffer name);
 
+	/** Overloads glGetActiveUniformARB. This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
 	@Alternate("glGetActiveUniformARB")
 	@GLreturn(value = "name", maxLength = "maxLength")
 	void glGetActiveUniformARB2(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
 	                            @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
-	                            @OutParameter @Check("1") IntBuffer size,
-	                            @OutParameter @GLenum @Check("1") IntBuffer type,
-	                            @OutParameter @GLcharARB ByteBuffer name);
-
-	/** This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
-	@Alternate("glGetActiveUniformARB")
-	@GLreturn(value = "name", maxLength = "maxLength")
-	void glGetActiveUniformARB3(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
-	                            @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
 	                            @OutParameter @Check("2") IntBuffer sizeType,
 	                            @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
 	                            @OutParameter @GLcharARB ByteBuffer name);
 
-	/** This version returns only the uniform size. */
+	/** Overloads glGetActiveUniformARB. This version returns only the uniform name. */
 	@Alternate(value = "glGetActiveUniformARB", javaAlt = true)
+	@GLreturn(value = "name", maxLength = "maxLength")
+	void glGetActiveUniformARB(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
+	                           @OutParameter @GLsizei @Constant("name_length, 0, APIUtils.getBufferInt(), 0, APIUtils.getBufferInt(), 1") IntBuffer length,
+	                           @OutParameter @GLcharARB ByteBuffer name);
+
+	/** Overloads glGetActiveUniformARB. This version returns only the uniform size. */
+	@Alternate(value = "glGetActiveUniformARB", javaAlt = true)
 	@GLreturn(value = "size")
 	void glGetActiveUniformSizeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
 	                               @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
 	                               @OutParameter IntBuffer size,
 	                               @OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
-	                               @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+	                               @OutParameter @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
-	/** This version returns only the uniform type. */
+	/** Overloads glGetActiveUniformARB. This version returns only the uniform type. */
 	@Alternate(value = "glGetActiveUniformARB", javaAlt = true)
 	@GLreturn(value = "type")
 	void glGetActiveUniformTypeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
 	                               @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
 	                               @OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore
 	                               @OutParameter @GLenum IntBuffer type,
-	                               @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+	                               @OutParameter @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
 	@StripPostfix("params")
 	void glGetUniformfvARB(@GLhandleARB int programObj, int location, @OutParameter @Check FloatBuffer params);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java	2010-04-07 10:28:05 UTC (rev 3311)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java	2010-04-07 11:59:33 UTC (rev 3312)
@@ -142,29 +142,39 @@
 	                          @OutParameter @GLenum @Check("1") IntBuffer type,
 	                          @OutParameter @GLcharARB ByteBuffer name);
 
+	/** Overloads glGetActiveAttribARB. This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
 	@Alternate("glGetActiveAttribARB")
 	@GLreturn(value = "name", maxLength = "maxLength")
 	void glGetActiveAttribARB2(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
 	                           @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
-	                           @OutParameter @Check("1") IntBuffer size,
-	                           @OutParameter @GLenum @Check("1") IntBuffer type,
+	                           @OutParameter @Check("2") IntBuffer sizeType,
+	                           @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
 	                           @OutParameter @GLcharARB ByteBuffer name);
 
+	/** Overloads glGetActiveAttribARB. This version returns only the uniform name. */
 	@Alternate(value = "glGetActiveAttribARB", javaAlt = true)
+	@GLreturn(value = "name", maxLength = "maxLength")
+	void glGetActiveAttribARB(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
+	                          @OutParameter @GLsizei @Constant("name_length, 0, APIUtils.getBufferInt(), 0, APIUtils.getBufferInt(), 1") IntBuffer length,
+	                          @OutParameter @GLcharARB ByteBuffer name);
+
+	/** Overloads glGetActiveAttribARB. This version returns only the uniform size. */
+	@Alternate(value = "glGetActiveAttribARB", javaAlt = true)
 	@GLreturn(value = "size")
 	void glGetActiveAttribSizeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
 	                              @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
 	                              @OutParameter IntBuffer size,
 	                              @OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
-	                              @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+	                              @OutParameter @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
+	/** Overloads glGetActiveAttribARB. This version returns only the uniform type. */
 	@Alternate(value = "glGetActiveAttribARB", javaAlt = true)
 	@GLreturn(value = "type")
 	void glGetActiveAttribTypeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
 	                              @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
 	                              @OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore
 	                              @OutParameter @GLenum IntBuffer type,
-	                              @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+	                              @OutParameter @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
 	int glGetAttribLocationARB(@GLhandleARB int programObj, @NullTerminated @Const @GLcharARB ByteBuffer name);
 

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2010-04-07 10:28:05 UTC (rev 3311)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2010-04-07 11:59:33 UTC (rev 3312)
@@ -242,40 +242,39 @@
 	                        @OutParameter @GLenum @Check("1") IntBuffer type,
 	                        @OutParameter @GLchar ByteBuffer name);
 
+	/** Overloads glGetActiveUniform. This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
 	@Alternate("glGetActiveUniform")
 	@GLreturn(value = "name", maxLength = "maxLength")
 	void glGetActiveUniform2(@GLuint int program, @GLuint int index, @GLsizei int maxLength,
 	                         @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
-	                         @OutParameter @GLsizei @Check("1") IntBuffer size,
-	                         @OutParameter @GLenum @Check("1") IntBuffer type,
-	                         @OutParameter @GLchar ByteBuffer name);
-
-	/** This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
-	@Alternate("glGetActiveUniform")
-	@GLreturn(value = "name", maxLength = "maxLength")
-	void glGetActiveUniform3(@GLuint int program, @GLuint int index, @GLsizei int maxLength,
-	                         @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
 	                         @OutParameter @Check("2") IntBuffer sizeType,
 	                         @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
 	                         @OutParameter @GLchar ByteBuffer name);
 
-	/** This version returns only the uniform size. */
+	/** Overloads glGetActiveUniformARB. This version returns only the uniform name. */
 	@Alternate(value = "glGetActiveUniform", javaAlt = true)
+	@GLreturn(value = "name", maxLength = "maxLength")
+	void glGetActiveUniform(@GLuint int program, @GLuint int index, @GLsizei int maxLength,
+	                        @OutParameter @GLsizei @Constant("name_length, 0, APIUtils.getBufferInt(), 0, APIUtils.getBufferInt(), 1") IntBuffer length,
+	                        @OutParameter @GLchar ByteBuffer name);
+
+	/** Overloads glGetActiveUniform. This version returns only the uniform size. */
+	@Alternate(value = "glGetActiveUniform", javaAlt = true)
 	@GLreturn(value = "size")
 	void glGetActiveUniformSize(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength,
 	                            @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
 	                            @OutParameter IntBuffer size,
 	                            @OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
-	                            @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+	                            @OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
-	/** This version returns only the uniform type. */
+	/** Overloads glGetActiveUniform. This version returns only the uniform type. */
 	@Alternate(value = "glGetActiveUniform", javaAlt = true)
 	@GLreturn(value = "type")
 	void glGetActiveUniformType(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength,
 	                            @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
 	                            @OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore
 	                            @OutParameter @GLenum IntBuffer type,
-	                            @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+	                            @OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
 	@StripPostfix("params")
 	void glGetUniformfv(@GLuint int program, int location, @OutParameter @Check FloatBuffer params);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java	2010-04-07 10:28:05 UTC (rev 3311)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java	2010-04-07 11:59:33 UTC (rev 3312)
@@ -137,14 +137,40 @@
 	                          @OutParameter @GLenum @Check("1") IntBuffer type,
 	                          @OutParameter @GLchar ByteBuffer name);
 
+	/** Overloads glGetActiveVaryingNV. This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
 	@Alternate("glGetActiveVaryingNV")
 	@GLreturn(value = "name", maxLength = "bufSize")
 	void glGetActiveVaryingNV2(@GLuint int program, @GLuint int index, @GLsizei int bufSize,
 	                           @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
-	                           @OutParameter @GLsizei @Check("1") IntBuffer size,
-	                           @OutParameter @GLenum @Check("1") IntBuffer type,
+	                           @OutParameter @Check("2") IntBuffer sizeType,
+	                           @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
 	                           @OutParameter @GLchar ByteBuffer name);
 
+	/** Overloads glGetActiveVaryingNV. This version returns only the varying name. */
+	@Alternate(value = "glGetActiveVaryingNV", javaAlt = true)
+	@GLreturn(value = "name", maxLength = "bufSize")
+	void glGetActiveVaryingNV(@GLuint int program, @GLuint int index, @GLsizei int bufSize,
+	                          @OutParameter @GLsizei @Constant("name_length, 0, APIUtils.getBufferInt(), 0, APIUtils.getBufferInt(), 1") IntBuffer length,
+	                          @OutParameter @GLchar ByteBuffer name);
+
+	/** Overloads glGetActiveVaryingNV. This version returns only the varying size. */
+	@Alternate(value = "glGetActiveVaryingNV", javaAlt = true)
+	@GLreturn(value = "size")
+	void glGetActiveVaryingSizeNV(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int bufSize,
+	                              @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
+	                              @OutParameter IntBuffer size,
+	                              @OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
+	                              @OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+
+	/** Overloads glGetActiveVaryingNV. This version returns only the varying type. */
+	@Alternate(value = "glGetActiveVaryingNV", javaAlt = true)
+	@GLreturn(value = "type")
+	void glGetActiveVaryingTypeNV(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int bufSize,
+	                              @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
+	                              @OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore
+	                              @OutParameter @GLenum IntBuffer type,
+	                              @OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+
 	void glActiveVaryingNV(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name);
 
 	@Alternate("glActiveVaryingNV")


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3311] trunk/LWJGL/platform_build/build-applet. xml

From: <ma...@us...> - 2010-04-07 10:28:11

Revision: 3311
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3311&view=rev
Author:   matzon
Date:     2010-04-07 10:28:05 +0000 (Wed, 07 Apr 2010)

Log Message:
-----------
make sure we overwrite existing files

Modified Paths:
--------------
    trunk/LWJGL/platform_build/build-applet.xml

Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml	2010-04-04 19:48:53 UTC (rev 3310)
+++ trunk/LWJGL/platform_build/build-applet.xml	2010-04-07 10:28:05 UTC (rev 3311)
@@ -68,12 +68,12 @@
   		<fileset dir="${lwjgl.res}" includes="applet*"/>
   	</jar>
 
-	  	<copy file="${lwjgl.lib}/lwjgl.jar" todir="applet"/>
-		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet"/>
-		<copy file="${lwjgl.lib}/lwjgl_util_applet.jar" todir="applet"/>
-		<copy file="${lwjgl.lib}/lwjgl_util.jar" todir="applet"/>
-		<copy file="${lwjgl.lib}/jinput.jar" todir="applet"/>
-		<copy file="${lwjgl.lib}/lzma.jar" todir="applet"/>
+	  	<copy file="${lwjgl.lib}/lwjgl.jar" todir="applet" overwrite="true"/>
+		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet" overwrite="true"/>
+		<copy file="${lwjgl.lib}/lwjgl_util_applet.jar" todir="applet" overwrite="true"/>
+		<copy file="${lwjgl.lib}/lwjgl_util.jar" todir="applet" overwrite="true"/>
+		<copy file="${lwjgl.lib}/jinput.jar" todir="applet" overwrite="true"/>
+		<copy file="${lwjgl.lib}/lzma.jar" todir="applet" overwrite="true"/>
 		<zip destfile="applet/res.jar">
 		  <zipfileset dir="${lwjgl.res}" includes="Footsteps.wav, ILtest.tga, Missing_you.mod"/>
 		</zip>


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3310] trunk/LWJGL/platform_build/build-applet. xml

From: <ma...@us...> - 2010-04-04 19:49:00

Revision: 3310
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3310&view=rev
Author:   matzon
Date:     2010-04-04 19:48:53 +0000 (Sun, 04 Apr 2010)

Log Message:
-----------
trusted and sealed lzma, needed by Java update 19

Modified Paths:
--------------
    trunk/LWJGL/platform_build/build-applet.xml

Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml	2010-04-04 19:46:42 UTC (rev 3309)
+++ trunk/LWJGL/platform_build/build-applet.xml	2010-04-04 19:48:53 UTC (rev 3310)
@@ -78,6 +78,7 @@
 		  <zipfileset dir="${lwjgl.res}" includes="Footsteps.wav, ILtest.tga, Missing_you.mod"/>
 		</zip>
 		<signjar jar="applet/lwjgl_util_applet.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+		<signjar jar="applet/lzma.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
 		
 		<!-- LZMA only, for 1.4 only clients -->
 		<antcall target="compress-resource">


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3309] trunk/LWJGL/libs/lzma.jar

From: <ma...@us...> - 2010-04-04 19:46:48

Revision: 3309
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3309&view=rev
Author:   matzon
Date:     2010-04-04 19:46:42 +0000 (Sun, 04 Apr 2010)

Log Message:
-----------
trusted and sealed lzma, needed by Java update 19

Modified Paths:
--------------
    trunk/LWJGL/libs/lzma.jar

Modified: trunk/LWJGL/libs/lzma.jar
===================================================================
(Binary files differ)


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

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

From: <sp...@us...> - 2010-04-03 19:03:55

Revision: 3308
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3308&view=rev
Author:   spasi
Date:     2010-04-03 19:03:49 +0000 (Sat, 03 Apr 2010)

Log Message:
-----------
Moved processMessages call after swapBuffers in Display.update.
Added option to not call processMessages during Display.update.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2010-04-03 13:32:35 UTC (rev 3307)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2010-04-03 19:03:49 UTC (rev 3308)
@@ -116,7 +116,7 @@
 	private static boolean window_created = false;
 
 	private static boolean parent_resized;
-	
+
 	/** Initial Background Color of Display */
 	private static float r = 0, g = 0, b = 0;
 
@@ -648,17 +648,27 @@
 	}
 
 	/**
-	 * Update the window. This calls processMessages(), and if the window is visible
-	 * clears the dirty flag and calls swapBuffers() and finally polls the input devices.
+	 * Update the window. If the window is visible clears
+	 * the dirty flag and calls swapBuffers() and finally
+	 * polls the input devices.
 	 *
-	 * @throws OpenGLException if an OpenGL error has occured since the last call to GL11.glGetError()
 	 */
 	public static void update() {
+		update(true);
+	}
+
+	/**
+	 * Update the window. If the window is visible clears
+	 * the dirty flag and calls swapBuffers() and finally
+	 * polls the input devices if processMessages is true.
+	 *
+	 * @param processMessages Poll input devices if true
+	 */
+	public static void update(boolean processMessages) {
 		synchronized ( GlobalLock.lock ) {
 			if ( !isCreated() )
 				throw new IllegalStateException("Display not created");
 
-			processMessages();
 			// We paint only when the window is visible or dirty
 			if ( display_impl.isVisible() || display_impl.isDirty() ) {
 				try {
@@ -667,13 +677,14 @@
 					throw new RuntimeException(e);
 				}
 			}
-			if ( swap_interval != 0 ) // Handle events again when vsync is enabled, to reduced input lag.
-				processMessages();
 
 			if ( parent_resized ) {
 				reshape();
 				parent_resized = false;
 			}
+
+			if ( processMessages )
+				processMessages();
 		}
 	}
 
@@ -866,11 +877,11 @@
 			}
 		}
 	}
-	
+
 	/**
 	*  Set the initial color of the Display. This method is called before the Display is created and will set the
 	*  background color to the one specified in this method.
-	*  
+	*
 	*  @param red - color value between 0 - 1
 	*  @param green - color value between 0 - 1
 	*  @param blue - color value between 0 - 1


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3307] trunk/LWJGL/build.xml

From: <ka...@us...> - 2010-04-03 13:32:43

Revision: 3307
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3307&view=rev
Author:   kappa1
Date:     2010-04-03 13:32:35 +0000 (Sat, 03 Apr 2010)

Log Message:
-----------
Modified build.xml so that the manifest file in lwjgl.jar and lwjgl_util_applet.jar is now tagged with 'Trusted-Library: true'.

This is needed from Java6u19+ when using a mix of signed/unsigned jars, otherwise an extra super scary dialog box will be shown to the user when an applet or JWS application is run.

Modified Paths:
--------------
    trunk/LWJGL/build.xml

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2010-04-02 18:45:19 UTC (rev 3306)
+++ trunk/LWJGL/build.xml	2010-04-03 13:32:35 UTC (rev 3307)
@@ -124,6 +124,7 @@
 			<fileset refid="lwjgl.fileset" />
 			<manifest>
 				<attribute name="Sealed" value="true"/>
+				<attribute name="Trusted-Library" value="true"/>
 			</manifest>
 		</jar>
 		
@@ -132,6 +133,7 @@
 			<fileset refid="lwjgl_util_applet.fileset" />
 			<manifest>
 				<attribute name="Sealed" value="true"/>
+				<attribute name="Trusted-Library" value="true"/>
 			</manifest>
 		</jar>
 


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

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

From: <sp...@us...> - 2010-04-02 18:45:25

Revision: 3306
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3306&view=rev
Author:   spasi
Date:     2010-04-02 18:45:19 +0000 (Fri, 02 Apr 2010)

Log Message:
-----------
Fixed debug builds.

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/platform_build/build-generator.xml

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2010-04-01 21:01:51 UTC (rev 3305)
+++ trunk/LWJGL/build.xml	2010-04-02 18:45:19 UTC (rev 3306)
@@ -1,5 +1,7 @@
 <project name="LWJGL" default="all" basedir=".">
 
+	<property name="build.sysclasspath" value="last" />
+
 	<import file="platform_build/build-definitions.xml"/>
 	<import file="platform_build/build-generator.xml"/>
 	<import file="platform_build/build-applet.xml"/>
@@ -58,13 +60,16 @@
   	<antcall target="-initialize" />
 
   	<!-- compile and create jars -->
+	<antcall target="generate-debug"/>
+	<antcall target="compile" />
+  	<antcall target="-createdebugjars" />
+		<!-- Generator will skip all templates if we don't clean -->
+		<delete dir="${lwjgl.bin}" quiet="true" failonerror="false" taskname="cleaning bin folder" />
+		<mkdir dir="${lwjgl.bin}" taskname="initialiazing bin folder" />
 	<antcall target="generate-all"/>
   	<antcall target="compile" />
   	<antcall target="-createjars" />
-	<antcall target="generate-debug"/>
-	<antcall target="compile" />
-  	<antcall target="-createdebugjars" />
-	<antcall target="jars" />
+	<antcall target="-jars_NoDEP" />
  	<antcall target="javadoc" />
 	<antcall target="applet-release" />
   	
@@ -90,8 +95,10 @@
 
 	<!-- Create ONLY the jar archives -->
 	<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, generate-all, compile, -createjars">
-		<!--		<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">-->
-		<!--<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">-->
+		<antcall target="-jars_NoDEP" />
+	</target>
+
+	<target name="-jars_NoDEP">
 		<move todir="libs/">
 			<fileset dir="${lwjgl.temp}/jar">
 				<include name="*.jar"/>
@@ -395,7 +402,7 @@
 	
 	<!-- Creates the Javadoc -->
 	<target name="javadoc" description="Creates javadoc from java source code">
-		<javadoc destdir="${lwjgl.docs}/javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API">
+		<javadoc destdir="${lwjgl.docs}/javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API" useexternalfile="true">
 			<fileset refid="lwjgl.javadoc.fileset" />
 			<doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
 			<bottom><![CDATA[<i>Copyright &#169; 2002-2009 lwjgl.org. All Rights Reserved.</i>]]></bottom>

Modified: trunk/LWJGL/platform_build/build-generator.xml
===================================================================
--- trunk/LWJGL/platform_build/build-generator.xml	2010-04-01 21:01:51 UTC (rev 3305)
+++ trunk/LWJGL/platform_build/build-generator.xml	2010-04-02 18:45:19 UTC (rev 3306)
@@ -22,7 +22,7 @@
 	<!-- Proxy target to generate it all -->
 	<target name="generate-all" depends="generate-openal, generate-opengl, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
 
-	<target name="generate-debug" depends="generate-openal, generate-opengl-debug, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
+	<target name="generate-debug" depends="generate-openal-debug, generate-opengl-debug, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
 
 	<!-- Generate OpenAL -->
 	<target name="generate-openal" depends="generators" description="Generates java and native source for AL">
@@ -37,6 +37,23 @@
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.native}/generated"/>
 			<arg value="-Atypemap=org.lwjgl.util.generator.ALTypeMap"/>
+			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/openal/AL10.java, org/lwjgl/openal/AL11.java"/>
+		</apply>
+	</target>
+	
+	<!-- Generate OpenAL [DEBUG] -->
+	<target name="generate-openal-debug" depends="generators" description="Generates java and native source for AL">
+		<apply executable="apt" parallel="true">
+			<arg value="-nocompile"/>
+			<arg value="-factory"/>
+			<arg value="org.lwjgl.util.generator.GeneratorProcessorFactory"/>
+			<arg value="-cp"/>
+			<arg path="${lwjgl.src}/java:${lwjgl.src.templates}:${lwjgl.bin}:${java.class.path}"/>
+			<arg value="-s"/>
+			<arg path="${lwjgl.src}/generated"/>
+			<arg value="-d"/>
+			<arg path="${lwjgl.src.native}/generated"/>
+			<arg value="-Atypemap=org.lwjgl.util.generator.ALTypeMap"/>
 			<arg value="-Ageneratechecks"/>
 			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/openal/AL10.java, org/lwjgl/openal/AL11.java"/>
 		</apply>
@@ -54,14 +71,13 @@
 			<arg path="${lwjgl.src}/generated"/>
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.native}/generated"/>
-			<!-- <arg value="-Ageneratechecks"/> -->
 			<arg value="-Acontextspecific"/>
 			<arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/>
 			<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>
 		</apply>
 	</target>
 
-	<!-- Generate OpenGL -->
+	<!-- Generate OpenGL [DEBUG] -->
 	<target name="generate-opengl-debug" depends="generators" description="Generates java and native source for GL">
 		<apply executable="apt" parallel="true">
 			<arg value="-nocompile"/>


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3305] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

From: <ka...@us...> - 2010-04-01 21:01:58

Revision: 3305
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3305&view=rev
Author:   kappa1
Date:     2010-04-01 21:01:51 +0000 (Thu, 01 Apr 2010)

Log Message:
-----------
Allow LWJGL applets to work when seperate_jvm parameter is not supported (i.e. java plugin1).

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-04-01 18:27:51 UTC (rev 3304)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-04-01 21:01:51 UTC (rev 3305)
@@ -52,6 +52,7 @@
 import java.io.StringWriter;
 import java.io.Writer;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.net.HttpURLConnection;
 import java.net.JarURLConnection;
@@ -68,6 +69,7 @@
 import java.security.cert.Certificate;
 import java.util.Enumeration;
 import java.util.StringTokenizer;
+import java.util.Vector;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
@@ -233,6 +235,9 @@
 												      "Please accept the permissions dialog to allow",
 												      "the applet to continue the loading process."};
 	
+	/** have natives been loaded by another instance of this applet */
+	static protected boolean natives_loaded = false;
+	
 	/*
 	 * @see java.applet.Applet#init()
 	 */
@@ -736,13 +741,67 @@
 		};
 		
 		debug_sleep(2000);
-
+		
+		// unload natives loaded by a previous instance of this lwjgl applet
+		unloadNatives(path);
+		
 		// add natives files path to native class path
 		System.setProperty("org.lwjgl.librarypath", path + "natives");
 
 		// Make sure jinput knows about the new path too
 		System.setProperty("net.java.games.input.librarypath", path + "natives");
+		
+		// mark natives as loaded
+		natives_loaded = true;
 	}
+	
+	/**
+	 * Unload natives loaded by a different classloader.
+	 * 
+	 * Due to limitations of the jvm, native files can only 
+	 * be loaded once and only be used by the classloader 
+	 * they were loaded from.
+	 * 
+	 * Due to the way applets on plugin1 work, one jvm must
+	 * be used for all applets. We need to use multiple 
+	 * classloaders in the same jvm due to LWJGL's static 
+	 * nature. I order to solver this we simply remove the 
+	 * natives from a previous classloader allowing a new 
+	 * classloader to use those natives in the same jvm.
+	 * 
+	 * This method will only attempt to unload natives from a
+	 * previous classloader if it detects that the natives have
+	 * been loaded in the same jvm.
+	 * 
+	 * @param nativePath directory where natives are stored
+	 */
+	private void unloadNatives(String nativePath) {
+		
+		// check whether natives have been loaded into this jvm
+		if (!natives_loaded) {
+			return;
+		}
+		
+		try {
+			Field field = ClassLoader.class.getDeclaredField("loadedLibraryNames");
+			field.setAccessible(true);
+			Vector libs = (Vector) field.get(getClass().getClassLoader());
+			
+			String path = new File(nativePath).getCanonicalPath();
+			
+			for (int i = 0; i < libs.size(); i++) {
+				String s = (String) libs.get(i);
+				
+				// if a native from the nativePath directory is loaded, unload it
+				if (s.startsWith(path)) {
+					libs.remove(i);
+					i--;
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 
 	/**
 	 * replace the current applet with the lwjgl applet


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3304] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

From: <ka...@us...> - 2010-04-01 18:28:05

Revision: 3304
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3304&view=rev
Author:   kappa1
Date:     2010-04-01 18:27:51 +0000 (Thu, 01 Apr 2010)

Log Message:
-----------
Added better support for FreeBSD to appletloader. Thx to monty_hall for the patch.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-04-01 15:05:32 UTC (rev 3303)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-04-01 18:27:51 UTC (rev 3304)
@@ -96,6 +96,7 @@
  * <li>al_linux - [String] Jar containing native files for linux.</li>
  * <li>al_mac - [String] Jar containing native files for mac.</li>
  * <li>al_solaris - [String] Jar containing native files for solaris.</li>
+ * <li>al_freebsd - [String] Jar containing native files for freebsd.</li>
  * </ul>
  * </p>
  * <p>
@@ -529,12 +530,14 @@
 		
 		if (osName.startsWith("Win")) {
 			nativeJar = getParameter("al_windows");
-		} else if (osName.startsWith("Linux") || osName.startsWith("FreeBSD")) {
+		} else if (osName.startsWith("Linux")) {
 			nativeJar = getParameter("al_linux");
 		} else if (osName.startsWith("Mac")) {
 			nativeJar = getParameter("al_mac");
 		} else if (osName.startsWith("Solaris") || osName.startsWith("SunOS")) {
 			nativeJar = getParameter("al_solaris");
+		} else if (osName.startsWith("FreeBSD")) {
+			nativeJar = getParameter("al_freebsd");
 		} else {
 			fatalErrorOccured("OS (" + osName + ") not supported", null);
 		}


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

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

From: <sp...@us...> - 2010-04-01 15:05:40

Revision: 3303
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3303&view=rev
Author:   spasi
Date:     2010-04-01 15:05:32 +0000 (Thu, 01 Apr 2010)

Log Message:
-----------
Fix for grabbed mouse deltas.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2010-03-31 23:56:24 UTC (rev 3302)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2010-04-01 15:05:32 UTC (rev 3303)
@@ -542,19 +542,17 @@
 		if (getForegroundWindow() != hwnd && !hasParent)
 			return;
 		getGlobalClientRect(hwnd, rect);
-		/* -- This is wrong on multi-monitor setups
 		int local_offset_x = rect.left;
 		int local_offset_y = rect.top;
+		/* -- This is wrong on multi-monitor setups
 		getGlobalClientRect(getDesktopWindow(), rect2);
 		Rect.intersect(rect, rect2, rect);
+		*/
 		int center_x = (rect.left + rect.right)/2;
 		int center_y = (rect.top + rect.bottom)/2;
 		nSetCursorPosition(center_x, center_y);
 		int local_x = center_x - local_offset_x;
 		int local_y = center_y - local_offset_y;
-		*/
-		int local_x = (rect.right - rect.left) / 2;
-		int local_y = (rect.bottom - rect.top) / 2;
 		if (current_display != null)
 			current_display.setMousePosition(local_x, transformY(hwnd, local_y));
 	}


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

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

From: <sp...@us...> - 2010-03-31 23:56:31

Revision: 3302
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3302&view=rev
Author:   spasi
Date:     2010-03-31 23:56:24 +0000 (Wed, 31 Mar 2010)

Log Message:
-----------
Fixed mouse grabbing on secondary monitors.
Added extra device polling when vsync is enabled, to reduce input lag.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2010-03-31 21:15:12 UTC (rev 3301)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2010-03-31 23:56:24 UTC (rev 3302)
@@ -627,6 +627,7 @@
 
 			display_impl.update();
 		}
+		pollDevices();
 	}
 
 	/**
@@ -666,8 +667,9 @@
 					throw new RuntimeException(e);
 				}
 			}
+			if ( swap_interval != 0 ) // Handle events again when vsync is enabled, to reduced input lag.
+				processMessages();
 
-			pollDevices();
 			if ( parent_resized ) {
 				reshape();
 				parent_resized = false;

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2010-03-31 21:15:12 UTC (rev 3301)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2010-03-31 23:56:24 UTC (rev 3302)
@@ -542,6 +542,7 @@
 		if (getForegroundWindow() != hwnd && !hasParent)
 			return;
 		getGlobalClientRect(hwnd, rect);
+		/* -- This is wrong on multi-monitor setups
 		int local_offset_x = rect.left;
 		int local_offset_y = rect.top;
 		getGlobalClientRect(getDesktopWindow(), rect2);
@@ -551,6 +552,9 @@
 		nSetCursorPosition(center_x, center_y);
 		int local_x = center_x - local_offset_x;
 		int local_y = center_y - local_offset_y;
+		*/
+		int local_x = (rect.right - rect.left) / 2;
+		int local_y = (rect.bottom - rect.top) / 2;
 		if (current_display != null)
 			current_display.setMousePosition(local_x, transformY(hwnd, local_y));
 	}

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2010-03-31 21:15:12 UTC (rev 3301)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2010-03-31 23:56:24 UTC (rev 3302)
@@ -121,8 +121,10 @@
 				PM_REMOVE      // removal options
 				))
 	{
+		if (msg.message == WM_QUIT) 
+			break; 
+		TranslateMessage(&msg);
 		DispatchMessage(&msg);
-		TranslateMessage(&msg);
 	}
 }
 


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3301] trunk/LWJGL/src/templates/org/lwjgl/opengl /GL20.java

From: <sp...@us...> - 2010-03-31 21:15:28

Revision: 3301
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3301&view=rev
Author:   spasi
Date:     2010-03-31 21:15:12 +0000 (Wed, 31 Mar 2010)

Log Message:
-----------
Fixed copy/paste error.

Modified Paths:
--------------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2010-03-31 20:56:07 UTC (rev 3300)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2010-03-31 21:15:12 UTC (rev 3301)
@@ -251,7 +251,7 @@
 	                         @OutParameter @GLchar ByteBuffer name);
 
 	/** This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
-	@Alternate("glGetActiveUniformARB")
+	@Alternate("glGetActiveUniform")
 	@GLreturn(value = "name", maxLength = "maxLength")
 	void glGetActiveUniform3(@GLuint int program, @GLuint int index, @GLsizei int maxLength,
 	                         @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,


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

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

From: <sp...@us...> - 2010-03-31 20:56:15

Revision: 3300
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3300&view=rev
Author:   spasi
Date:     2010-03-31 20:56:07 +0000 (Wed, 31 Mar 2010)

Log Message:
-----------
Added yet another glGetActiveUniform alternative.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java

Modified: trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java	2010-03-31 15:46:16 UTC (rev 3299)
+++ trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java	2010-03-31 20:56:07 UTC (rev 3300)
@@ -45,7 +45,7 @@
  * $Id$
  */
 final class WindowsSysImplementation extends DefaultSysImplementation {
-	private final static int JNI_VERSION = 22;
+	private final static int JNI_VERSION = 22; 
 
 	static {
 		Sys.initialize();

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java	2010-03-31 15:46:16 UTC (rev 3299)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java	2010-03-31 20:56:07 UTC (rev 3300)
@@ -227,6 +227,16 @@
 	                            @OutParameter @GLenum @Check("1") IntBuffer type,
 	                            @OutParameter @GLcharARB ByteBuffer name);
 
+	/** This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
+	@Alternate("glGetActiveUniformARB")
+	@GLreturn(value = "name", maxLength = "maxLength")
+	void glGetActiveUniformARB3(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
+	                            @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
+	                            @OutParameter @Check("2") IntBuffer sizeType,
+	                            @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
+	                            @OutParameter @GLcharARB ByteBuffer name);
+
+	/** This version returns only the uniform size. */
 	@Alternate(value = "glGetActiveUniformARB", javaAlt = true)
 	@GLreturn(value = "size")
 	void glGetActiveUniformSizeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@@ -235,6 +245,7 @@
 	                               @OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
 	                               @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
+	/** This version returns only the uniform type. */
 	@Alternate(value = "glGetActiveUniformARB", javaAlt = true)
 	@GLreturn(value = "type")
 	void glGetActiveUniformTypeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2010-03-31 15:46:16 UTC (rev 3299)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2010-03-31 20:56:07 UTC (rev 3300)
@@ -250,6 +250,16 @@
 	                         @OutParameter @GLenum @Check("1") IntBuffer type,
 	                         @OutParameter @GLchar ByteBuffer name);
 
+	/** This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
+	@Alternate("glGetActiveUniformARB")
+	@GLreturn(value = "name", maxLength = "maxLength")
+	void glGetActiveUniform3(@GLuint int program, @GLuint int index, @GLsizei int maxLength,
+	                         @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
+	                         @OutParameter @Check("2") IntBuffer sizeType,
+	                         @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
+	                         @OutParameter @GLchar ByteBuffer name);
+
+	/** This version returns only the uniform size. */
 	@Alternate(value = "glGetActiveUniform", javaAlt = true)
 	@GLreturn(value = "size")
 	void glGetActiveUniformSize(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@@ -258,6 +268,7 @@
 	                            @OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
 	                            @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
+	/** This version returns only the uniform type. */
 	@Alternate(value = "glGetActiveUniform", javaAlt = true)
 	@GLreturn(value = "type")
 	void glGetActiveUniformType(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength,


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

1095 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 20 21 22 23 24 .. 238 > >> (Page 22 of 238)