Menu
▾
▴
java-game-lib-cvs
|
From: <eli...@us...> - 2008-08-12 11:54:12
|
Revision: 3110
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3110&view=rev
Author: elias_naur
Date: 2008-08-12 11:54:09 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
Added solaris support to linux build scripts
Modified Paths:
--------------
trunk/LWJGL/build.xml
trunk/LWJGL/platform_build/linux_ant/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2008-08-11 23:05:10 UTC (rev 3109)
+++ trunk/LWJGL/build.xml 2008-08-12 11:54:09 UTC (rev 3110)
@@ -247,7 +247,10 @@
<antcall target="-compile_native_win32" />
<condition property="lwjgl.platform.linux">
- <os name="Linux" />
+ <or>
+ <os name="Linux" />
+ <os name="SunOS" />
+ </or>
</condition>
<antcall target="-compile_native_linux" />
Modified: trunk/LWJGL/platform_build/linux_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build.xml 2008-08-11 23:05:10 UTC (rev 3109)
+++ trunk/LWJGL/platform_build/linux_ant/build.xml 2008-08-12 11:54:09 UTC (rev 3110)
@@ -6,7 +6,7 @@
<property name="libname64" value="liblwjgl64.so"/>
<property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-call_shared"/>
<property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt"/>
- <property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -pthread -Wunused"/>
+ <property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
<target name="clean">
<delete>
@@ -25,13 +25,18 @@
<condition property="libname" value="${libname64}" else="${libname32}">
<equals arg1="${hwplatform}" arg2="x86_64"/>
</condition>
+ <condition property="cflags_pthread" value="-pthreads" else="-pthread">
+ <os name="SunOS" />
+ </condition>
+
<property name="linker_flags" value="-Wl,--version-script=${native}/linux/lwjgl.map -shared -O2 -Wall -o ${libname} ${libs}"/>
<apply dir="." executable="cc" dest="." skipemptyfilesets="true" failonerror="true">
- <arg line="${cflags}"/>
+ <arg line="${cflags} ${cflags_pthread}"/>
<arg value="-I${java.home}/include"/>
<arg value="-I${java.home}/include/linux"/>
<arg value="-I${java.home}/../include"/>
<arg value="-I${java.home}/../include/linux"/>
+ <arg value="-I${java.home}/../include/solaris"/>
<arg value="-I${native}/common"/>
<arg value="-I${native}/linux"/>
<mapper type="glob" from="*.c" to="*.o"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2008-09-07 08:16:14
|
Revision: 3121
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3121&view=rev
Author: elias_naur
Date: 2008-09-07 08:16:11 +0000 (Sun, 07 Sep 2008)
Log Message:
-----------
Added support for loading libopenal64.so. Added libopenal64.so compiled from openal soft 1.5.304.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/openal/AL.java
Added Paths:
-----------
trunk/LWJGL/libs/linux/libopenal64.so
Property changes on: trunk/LWJGL/libs/linux/libopenal64.so
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/LWJGL/src/java/org/lwjgl/openal/AL.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/openal/AL.java 2008-09-07 07:49:38 UTC (rev 3120)
+++ trunk/LWJGL/src/java/org/lwjgl/openal/AL.java 2008-09-07 08:16:11 UTC (rev 3121)
@@ -122,7 +122,7 @@
break;
case LWJGLUtil.PLATFORM_LINUX:
libname = "openal";
- library_names = new String[]{"libopenal.so", "libopenal.so.0"};
+ library_names = new String[]{"libopenal64.so", "libopenal.so", "libopenal.so.0"};
break;
case LWJGLUtil.PLATFORM_MACOSX:
libname = "openal";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-09-15 11:29:14
|
Revision: 3127
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3127&view=rev
Author: matzon
Date: 2008-09-15 18:28:47 +0000 (Mon, 15 Sep 2008)
Log Message:
-----------
solaris package support
rc2 version string
Modified Paths:
--------------
trunk/LWJGL/build.xml
trunk/LWJGL/platform_build/build-applet.xml
trunk/LWJGL/platform_build/build-definitions.xml
trunk/LWJGL/platform_build/build-webstart.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2008-09-11 09:52:23 UTC (rev 3126)
+++ trunk/LWJGL/build.xml 2008-09-15 18:28:47 UTC (rev 3127)
@@ -28,6 +28,7 @@
<mkdir dir="${lwjgl.temp}/native/win32" taskname="initialiazing temp/win32 folder" />
<mkdir dir="${lwjgl.temp}/native/linux" taskname="initialiazing temp/linux folder" />
<mkdir dir="${lwjgl.temp}/native/macosx" taskname="initialiazing temp/macosx folder" />
+ <mkdir dir="${lwjgl.temp}/native/solaris" taskname="initialiazing temp/solaris folder" />
</target>
<!-- Cleans up any files created during the execution of this script -->
@@ -146,6 +147,11 @@
<patternset refid="lwjgl-macosx.fileset" />
</fileset>
</copy>
+ <copy todir="${lwjgl.temp}/native/solaris">
+ <fileset dir="${lwjgl.lib}/solaris">
+ <patternset refid="lwjgl-solaris.fileset" />
+ </fileset>
+ </copy>
<!-- create base package -->
<zip destfile="${lwjgl.dist}/lwjgl-${lwjgl.version}.zip">
Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml 2008-09-11 09:52:23 UTC (rev 3126)
+++ trunk/LWJGL/platform_build/build-applet.xml 2008-09-15 18:28:47 UTC (rev 3127)
@@ -49,6 +49,13 @@
</fileset>
</jar>
<signjar jar="applet/macosx_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+
+ <jar destfile="applet/solaris_natives.jar" taskname="solaris_natives.jar">
+ <fileset dir="${lwjgl.lib}/solaris">
+ <patternset refid="lwjgl-solaris.fileset"/>
+ </fileset>
+ </jar>
+ <signjar jar="applet/solaris_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
<jar destfile="${lwjgl.lib}/lwjgl_util_applet.jar" update="true">
<fileset dir="${lwjgl.res}" includes="applet*"/>
@@ -93,6 +100,11 @@
<param name="output" value="applet/linux_natives.jar.lzma"/>
</antcall>
<antcall target="compress-resource">
+ <param name="input" value="applet/solaris_natives.jar"/>
+ <param name="output" value="applet/solaris_natives.jar.lzma"/>
+ </antcall>
+
+ <antcall target="compress-resource">
<param name="input" value="applet/res.jar"/>
<param name="output" value="applet/res.jar.lzma"/>
</antcall>
Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml 2008-09-11 09:52:23 UTC (rev 3126)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2008-09-15 18:28:47 UTC (rev 3127)
@@ -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.0rc1" />
+ <property name="lwjgl.version" value="2.0rc2" />
<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java"/>
<!-- ================================================================== -->
@@ -109,6 +109,12 @@
<include name="libjinput-osx-legacy.jnilib" />
</patternset>
+ <!-- Files to include in solaris package -->
+ <patternset id="lwjgl-solaris.fileset">
+ <include name="liblwjgl*.so" />
+ <include name="libopenal.so" />
+ </patternset>
+
<!-- Files to include in source distribution -->
<fileset id="lwjgl.source.fileset" dir=".">
<include name="build.xml" />
Modified: trunk/LWJGL/platform_build/build-webstart.xml
===================================================================
--- trunk/LWJGL/platform_build/build-webstart.xml 2008-09-11 09:52:23 UTC (rev 3126)
+++ trunk/LWJGL/platform_build/build-webstart.xml 2008-09-15 18:28:47 UTC (rev 3127)
@@ -44,6 +44,7 @@
<jar destfile="${lwjgl.temp}/jnlp/native_win32.jar" basedir="${lwjgl.temp}/jnlp/temp/native/win32"/>
<jar destfile="${lwjgl.temp}/jnlp/native_linux.jar" basedir="${lwjgl.temp}/jnlp/temp/native/linux"/>
<jar destfile="${lwjgl.temp}/jnlp/native_macosx.jar" basedir="${lwjgl.temp}/jnlp/temp/native/macosx"/>
+ <jar destfile="${lwjgl.temp}/jnlp/native_solaris.jar" basedir="${lwjgl.temp}/jnlp/temp/native/solaris"/>
<!-- create media jar -->
<jar destfile="${lwjgl.temp}/jnlp/media.jar" basedir="${lwjgl.res}"/>
@@ -51,6 +52,7 @@
<!-- sign 'em -->
<signjar jar="${lwjgl.temp}/jnlp/lwjgl.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
<signjar jar="${lwjgl.temp}/jnlp/lwjgl_util.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="${lwjgl.temp}/jnlp/native_solaris.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
<signjar jar="${lwjgl.temp}/jnlp/native_linux.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
<signjar jar="${lwjgl.temp}/jnlp/native_macosx.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
<signjar jar="${lwjgl.temp}/jnlp/native_win32.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-11-03 19:39:28
|
Revision: 3142
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3142&view=rev
Author: matzon
Date: 2008-11-03 19:39:23 +0000 (Mon, 03 Nov 2008)
Log Message:
-----------
2.0.1 version string
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 2008-10-28 10:05:37 UTC (rev 3141)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2008-11-03 19:39:23 UTC (rev 3142)
@@ -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.0" />
+ <property name="lwjgl.version" value="2.0.1" />
<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java"/>
<!-- ================================================================== -->
Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java 2008-10-28 10:05:37 UTC (rev 3141)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2008-11-03 19:39:23 UTC (rev 3142)
@@ -54,7 +54,7 @@
private static final String JNI_LIBRARY_NAME = "lwjgl";
/** Current version of library */
- private static final String VERSION = "2.0rc1";
+ private static final String VERSION = "2.0.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.
|
|
From: <ma...@us...> - 2008-11-26 20:06:04
|
Revision: 3159
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3159&view=rev
Author: matzon
Date: 2008-11-26 20:05:59 +0000 (Wed, 26 Nov 2008)
Log Message:
-----------
create and include non-pack200, lzma jars - for those 1.4 only macs
Modified Paths:
--------------
trunk/LWJGL/build.xml
trunk/LWJGL/platform_build/build-applet.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2008-11-26 19:41:23 UTC (rev 3158)
+++ trunk/LWJGL/build.xml 2008-11-26 20:05:59 UTC (rev 3159)
@@ -330,7 +330,6 @@
<param name="input" value="${input}"/>
<param name="output" value="${output}"/>
</antcall>
- <delete file="${input}"/>
</target>
<target name="applettest" depends="applet">
Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml 2008-11-26 19:41:23 UTC (rev 3158)
+++ trunk/LWJGL/platform_build/build-applet.xml 2008-11-26 20:05:59 UTC (rev 3159)
@@ -71,6 +71,27 @@
</zip>
<signjar jar="applet/lwjgl_util_applet.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <!-- LZMA only, for 1.4 only clients -->
+ <antcall target="compress-resource">
+ <param name="input" value="applet/lwjgl.jar"/>
+ <param name="output" value="applet/lwjgl.jar.lzma"/>
+ </antcall>
+ <antcall target="compress-resource">
+ <param name="input" value="applet/lwjgl_util.jar"/>
+ <param name="output" value="applet/lwjgl_util.jar.lzma"/>
+ </antcall>
+ <antcall target="compress-resource">
+ <param name="input" value="applet/jinput.jar"/>
+ <param name="output" value="applet/jinput.jar.lzma"/>
+ </antcall>
+ <antcall target="compress-resource">
+ <param name="input" value="applet/lwjgl_applet.jar"/>
+ <param name="output" value="applet/lwjgl_applet.jar.lzma"/>
+ </antcall>
+ <antcall target="compress-resource">
+ <param name="input" value="applet/windows_natives.jar"/>
+ <param name="output" value="applet/windows_natives.jar.lzma"/>
+ </antcall>
<antcall target="compress-sign-class">
<param name="dir" value="applet/"/>
<param name="jarfile" value="lwjgl"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-12-14 19:01:00
|
Revision: 3163
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3163&view=rev
Author: matzon
Date: 2008-12-14 19:00:48 +0000 (Sun, 14 Dec 2008)
Log Message:
-----------
support for eclipse update site (donated by Jens von Pilgrim)
Added Paths:
-----------
trunk/LWJGL/eclipse-update/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/.project
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/about.html
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/anttasks/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/anttasks/ant4eclipse-0.5.0.rc1.jar
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/anttasks/ecj.jar
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/anttasks/org.eclipse.osgi_3.2.0.v20060601.jar
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/anttasks/packagelist.jar
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/build.xml
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/.classpath
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/.project
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/.settings/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/.settings/org.eclipse.jdt.core.prefs
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/META-INF/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/about.html
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/build.properties
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/lwjgl_logo.png
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/src/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/src/java/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/src/java/org/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/src/java/org/lwjgl/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/src/java/org/lwjgl/Activator.java
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.doc/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.doc/.project
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.doc/META-INF/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.doc/about.html
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.doc/build.properties
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.doc/lwjgl_logo.png
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.doc/plugin.xml
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.doc/toc.xml
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.feature/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.feature/.project
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.feature/about.html
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.feature/build.properties
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.feature/feature.xml
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.feature/lwjgl_logo.png
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.source/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.source/.project
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.source/META-INF/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.source/about.html
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.source/build.properties
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.source/lwjgl_logo.png
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.source/plugin.xml
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.test/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.test/.classpath
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.test/.project
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.test/.settings/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.test/.settings/org.eclipse.jdt.core.prefs
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.test/META-INF/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.test/about.html
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.test/build.properties
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.test/icons/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.test/icons/lwjgl_logo_16.gif
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.test/lwjgl_logo.png
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.test/plugin.xml
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.test/src/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.test/src/java/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.test/src/java/org/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.test/src/java/org/lwjgl/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.test/src/java/org/lwjgl/testview/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.test/src/java/org/lwjgl/testview/FpsStatusLineItem.java
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.test/src/java/org/lwjgl/testview/LWJGLTestView.java
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.updatesite/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.updatesite/.project
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.updatesite/about.html
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.updatesite/index.html
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.updatesite/site.xml
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.updatesite/web/
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.updatesite/web/site.css
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl.updatesite/web/site.xsl
trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/readme.txt
Added: trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/.project
===================================================================
--- trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/.project (rev 0)
+++ trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/.project 2008-12-14 19:00:48 UTC (rev 3163)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.lwjgl.eclipseplugins</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Added: trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/about.html
===================================================================
--- trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/about.html (rev 0)
+++ trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/about.html 2008-12-14 19:00:48 UTC (rev 3163)
@@ -0,0 +1,77 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<img src="lwjgl_logo.png" align="right"/>
+<h2>About This Content</h2>
+<p>The <a href="http://lwjgl.org">Lightweight Java Game Library (LWJGL)</a> is a solution aimed
+directly at professional and amateur Java programmers alike to enable <a
+ href="projects.php">commercial quality games</a> to be written in Java.
+LWJGL provides developers access to high performance crossplatform
+libraries such as OpenGL (<a href="http://www.opengl.org/"
+ target="_blank">Open Graphics Library</a>) and OpenAL (<a
+ href="http://www.openal.org" target="_blank">Open Audio Library</a>)
+allowing for state of the art 3D games and 3D sound. Additionally LWJGL
+provides access to controllers such as Gamepads, Steering wheel and
+Joysticks. All in a simple and straight forward API.</p>
+<p>LWJGL is not meant to make writing games particularly easy; it is
+primarily an enabling technology which allows developers to get at
+resources that are simply otherwise unavailable or poorly implemented on
+the existing <a href="http://java.sun.com" target="_blank">Java
+platform</a>. We anticipate that the LWJGL will, through evolution and
+extension, become the foundation for more complete game libraries and
+"game engines" as they have popularly become known, and hide some of the
+new evils we have had to expose in the APIs.</p>
+<p>LWJGL is available under a <a href="http://lwjgl.org/license.php">BSD
+license</a>, which means it's open source and freely available at no charge.</p>
+<p>Please visit us on the Freenode IRC Network: <a
+ href="irc://irc.freenode.net/lwjgl" target="_blank">#LWJGL</a>. Do idle
+if there is no one to answer any of your questions, we are on different
+timezones.</p>
+
+<h3>Plugin assembly</h3>
+<p>The plugins were assembled by Jens von Pilgrim (dev...@je...). All files related to this assembly, such as manifest files or plugin descriptors, are copyright under the Eclipse Public License (EPL) and the BSD license</p>
+
+<h3>Third party code</h3>
+
+<h4>IBM</h4>
+<p>The LWJGL Textview contains code copyright under the Eclipse Public License (EPL):<br/>
+<pre>
+Copyright (c) 2000, 2005 IBM Corporation and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+</pre>
+The source of this code can be found at:
+<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet195.java?view=markup&content-type=text%2Fvnd.viewcvs-markup&revision=HEAD">http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet195.java?view=markup&content-type=text%2Fvnd.viewcvs-markup&revision=HEAD</a>
+</p>
+
+<h4>MESA</h4>
+<p>
+LWJGL contains code copyright under Mesa (MIT) License. Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
+</p>
+
+<h4>Lev Povalahev</h4>
+<p>
+LWJGL contains code copyright under BSD License. Copyright (c) 2002, Lev Povalahev
+</p>
+
+
+<h3>Third party code used for building the update site</h3>
+<p>The build system is based on Apache ANT. In order to build all plugins, features and the updatesite, some third-party ant tasks are required.</p>
+
+<h4>Eclipse Packages</h4>
+<p>ecj.jar and org.eclipse.osgi.jar are used for compiling the test view. These two files are copyright under the Eclipse Public License (EPL). </p>
+
+<h4>Ant4Eclipse</h4>
+<p>This ant task is copyright under the Sun Public License, see <a href="http://www.opensource.org/licenses/sunpublic.php">http://www.opensource.org/licenses/sunpublic.php</a>.</p>
+
+<h4>Packagelist</h4>
+<p>This ant tasks was created by Jens von Pilgrim, it is copyright under the Eclipse Public License (EPL) and the BSD license.</p>
+
+</body>
+</html>
Added: trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/anttasks/ant4eclipse-0.5.0.rc1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/anttasks/ant4eclipse-0.5.0.rc1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/anttasks/ecj.jar
===================================================================
(Binary files differ)
Property changes on: trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/anttasks/ecj.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/anttasks/org.eclipse.osgi_3.2.0.v20060601.jar
===================================================================
(Binary files differ)
Property changes on: trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/anttasks/org.eclipse.osgi_3.2.0.v20060601.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/anttasks/packagelist.jar
===================================================================
(Binary files differ)
Property changes on: trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/anttasks/packagelist.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/build.xml
===================================================================
--- trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/build.xml (rev 0)
+++ trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/build.xml 2008-12-14 19:00:48 UTC (rev 3163)
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Call with
+
+ant -Dversion=1.9.1 dist
+
+(C) 2008 Jens von Pilgrim, dev...@je...
+
+-->
+
+<project default="help" basedir="." name="">
+
+ <property name="eclipse.install" value="c:/devel/Eclipse3.3" />
+ <property name="eclipse.updatesite" value="http://www.lwjgl.org/update/" />
+ <property name="bundle.vendor" value="LWJGL.org" />
+
+ <taskdef name="packagelist" classname="de.jevopi.ant.PackageList" >
+ <classpath>
+ <pathelement location="./anttasks/packagelist.jar"/>
+ </classpath>
+ </taskdef>
+ <taskdef resource="net/sf/ant4eclipse/antlib.xml">
+ <classpath>
+ <pathelement location="./anttasks/ant4eclipse-0.5.0.rc1.jar"/>
+ <pathelement location="./anttasks/ecj.jar"/>
+ <pathelement location="./anttasks/org.eclipse.osgi_3.2.0.v20060601.jar"/>
+ </classpath>
+ </taskdef>
+
+ <property name="version" value="unknown" />
+ <property name="archives.dir" value="lwjgl-archives/${version}" />
+ <property name="skeletons.dir" value="plugin-skeletons" />
+
+ <property name="build.path" value="build" />
+ <property name="build.temp" value="${build.path}/temp" />
+ <property name="build.plugins" value="${build.path}/plugins" />
+
+ <property name="lwjgl.zip" value="lwjgl-${version}.zip" />
+ <property name="lwjgl_docs.zip" value="lwjgl-docs-${version}.zip" />
+ <property name="lwjgl_source.zip" value="lwjgl-source-${version}.zip" />
+
+ <property name="lwjgl.dir" value="${build.temp}/lwjgl-${version}" />
+ <property name="lwjgl_docs.dir" value="${build.temp}/javadoc" />
+ <property name="lwjgl_source.dir" value="${build.temp}/src" />
+
+ <property name="NL" value=" " />
+
+ <target name="init">
+ <echo>Building plugins for version ${version}</echo>
+ </target>
+
+ <target name="dist" depends="init" >
+
+ <mkdir dir="${build.temp}" />
+
+ <!-- Copy sekeletons -->
+ <mkdir dir="${build.plugins}" />
+ <copy todir="${build.plugins}">
+ <fileset dir="${skeletons.dir}" />
+ </copy>
+
+ <!-- Build plugin org.lwjgl -->
+ <unzip src="${archives.dir}/${lwjgl.zip}" dest="${build.temp}" />
+ <copy todir="${build.plugins}/org.lwjgl/native">
+ <fileset dir="${lwjgl.dir}/native" />
+ </copy>
+ <copy todir="${build.plugins}/org.lwjgl/">
+ <fileset dir="${lwjgl.dir}/jar"/>
+ </copy>
+ <copy todir="${build.plugins}/org.lwjgl/doc">
+ <fileset dir="${lwjgl.dir}/doc" />
+ </copy>
+ <packagelist property="bundle.export-package" pathsep=",${NL} ">
+ <fileset dir="${lwjgl.dir}/jar"/>
+ <patternset>
+ <exclude name="**/test/**" />
+ <exclude name="**/examples/**" />
+ </patternset>
+ </packagelist>
+ <pathconvert property="bundle.classpath.jars" pathsep=",${NL} ">
+ <map from="${basedir}/${lwjgl.dir}/jar/" to="" />
+ <fileset dir="${lwjgl.dir}/jar" />
+ </pathconvert>
+
+ <!-- not using manifest task, since manifest wraps at the wrong positions -->
+ <echo file="${build.plugins}/org.lwjgl/META-INF/MANIFEST.MF" encoding="UTF-8">Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: LWJGL Lightweight Java Game Library
+Bundle-SymbolicName: org.lwjgl
+Bundle-Version: ${version}
+Bundle-Activator: org.lwjgl.Activator
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.core.runtime
+Eclipse-LazyStart: true
+Bundle-Vendor: ${bundle.vendor}
+Export-Package: ${bundle.export-package}
+Bundle-ClassPath: ${bundle.classpath.jars},${NL} .
+</echo>
+
+ <!-- Build plugin org.lwjgl.doc -->
+ <copy file="${archives.dir}/${lwjgl_docs.zip}" tofile="${build.plugins}/org.lwjgl.doc/doc.zip" />
+ <echo file="${build.plugins}/org.lwjgl.doc/META-INF/MANIFEST.MF" encoding="UTF-8">Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: LWJGL Documentation
+Bundle-SymbolicName: org.lwjgl.doc;singleton:=true
+Bundle-Version: ${version}
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
+Eclipse-LazyStart: true
+Bundle-Vendor: ${bundle.vendor}
+</echo>
+
+ <!-- Build plugin org.lwjgl.source -->
+ <unzip src="${archives.dir}/${lwjgl_source.zip}" dest="${build.temp}" />
+
+ <!-- Build src zips for plugin org.lwjgl -->
+ <property name="org.lwjgl.src.dir" value="${build.plugins}/org.lwjgl.source/src/org.lwjgl_${version}" />
+ <mkdir dir="${org.lwjgl.src.dir}" />
+ <zip destfile="${org.lwjgl.src.dir}/lwjglsrc.zip">
+ <fileset dir="${lwjgl_source.dir}/generated" />
+ <fileset dir="${lwjgl_source.dir}/java">
+ <exclude name="org/lwjgl/util/**" />
+ </fileset>
+ </zip>
+ <zip destfile="${org.lwjgl.src.dir}/lwjgl_utilsrc.zip">
+ <fileset dir="${lwjgl_source.dir}/java">
+ <include name="org/lwjgl/util/**" />
+ <exclude name="org/lwjgl/util/applet/**" />
+ </fileset>
+ </zip>
+ <zip destfile="${org.lwjgl.src.dir}/lwjgl_util_applet.zip">
+ <fileset dir="${lwjgl_source.dir}/java">
+ <include name="org/lwjgl/util/applet/**" />
+ </fileset>
+ </zip>
+ <!-- Build manfest -->
+
+<!-- not using manifest task, since manifest wraps at the wrong positions -->
+ <echo file="${build.plugins}/org.lwjgl.source/META-INF/MANIFEST.MF" encoding="UTF-8">Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: LWJGL Sources
+Bundle-SymbolicName: org.lwjgl.source;singleton:=true
+Bundle-Version: ${version}
+Bundle-Localization: plugin
+Bundle-Vendor: ${bundle.vendor}
+</echo>
+
+ <!-- Build plugin org.lwjgl.test -->
+ <echo file="${build.plugins}/org.lwjgl.test/META-INF/MANIFEST.MF" encoding="UTF-8">Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: LWJGL TestView
+Bundle-SymbolicName: org.lwjgl.test;singleton:=true
+Bundle-Version: ${version}
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.views,
+ org.eclipse.core.resources,
+ org.lwjgl;bundle-version="${version}"
+Bundle-Vendor: ${bundle.vendor}
+</echo>
+
+ <!-- Build org.lwjgl.feature -->
+ <copy file="${skeletons.dir}/org.lwjgl.feature/feature.xml"
+ tofile="${build.plugins}/org.lwjgl.feature/feature.xml"
+ encoding="UTF-8" overwrite="true">
+ <filterset>
+ <filter token="VERSION" value="${version}" />
+ <filter token="PROVIDERNAME" value="${bundle.vendor}" />
+ <filter token="UPDATEURL" value="${eclipse.updatesite}" />
+ </filterset>
+ </copy>
+
+ <!-- Build update site -->
+ <copy file="${skeletons.dir}/org.lwjgl.updatesite/site.xml"
+ tofile="${build.plugins}/org.lwjgl.updatesite/site.xml"
+ encoding="UTF-8" overwrite="true">
+ <filterset>
+ <filter token="VERSION" value="${version}" />
+ <filter token="PROVIDERNAME" value="${bundle.vendor}" />
+ <filter token="UPDATEURL" value="${eclipse.updatesite}" />
+ </filterset>
+ </copy>
+
+ <!-- Eclipse build -->
+ <buildFeature
+ workspace="${build.plugins}"
+ targetPlatformLocation="${eclipse.install}"
+ projectname="org.lwjgl.feature"
+ buildPluginTarget="buildPlugin"
+ destDir="${build.plugins}/org.lwjgl.updatesite"
+ packageAsJar="true"/>
+ </target>
+
+ <target name="buildPlugin">
+ <echo>Build Plugin ${plugin.id}, Version ${plugin.version}</echo>
+ <buildPlugin
+ workspace="${build.plugins}"
+ targetPlatformLocation="${eclipse.install}"
+ projectname="${plugin.id}"
+ destDir="${build.plugins}/org.lwjgl.updatesite"
+ packageAsJar="true">
+ <eclipseLibraryCompiler/>
+ </buildPlugin>
+ </target>
+
+ <target name="clean">
+ <delete dir="${build.path}" />
+ </target>
+
+ <target name="help">
+ <echo>Call this build with version number and target dist, e.g.</echo>
+ <echo> ant -Dversion=1.1.2 dist</echo>
+ </target>
+
+</project>
\ No newline at end of file
Added: trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/.classpath
===================================================================
--- trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/.classpath (rev 0)
+++ trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/.classpath 2008-12-14 19:00:48 UTC (rev 3163)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/java"/>
+ <classpathentry exported="true" kind="lib" path="lwjgl_util_applet.jar"/>
+ <classpathentry exported="true" kind="lib" path="native/win32/"/>
+ <classpathentry exported="true" kind="lib" path="native/macosx/"/>
+ <classpathentry exported="true" kind="lib" path="native/linux/"/>
+ <classpathentry exported="true" kind="lib" path="jinput.jar"/>
+ <classpathentry exported="true" kind="lib" path="lwjgl_util.jar"/>
+ <classpathentry exported="true" kind="lib" path="lwjgl.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Added: trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/.project
===================================================================
--- trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/.project (rev 0)
+++ trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/.project 2008-12-14 19:00:48 UTC (rev 3163)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.lwjgl</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/.settings/org.eclipse.jdt.core.prefs 2008-12-14 19:00:48 UTC (rev 3163)
@@ -0,0 +1,12 @@
+#Thu Sep 13 13:53:08 CEST 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Added: trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/about.html
===================================================================
--- trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/about.html (rev 0)
+++ trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/about.html 2008-12-14 19:00:48 UTC (rev 3163)
@@ -0,0 +1,77 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<img src="lwjgl_logo.png" align="right"/>
+<h2>About This Content</h2>
+<p>The <a href="http://lwjgl.org">Lightweight Java Game Library (LWJGL)</a> is a solution aimed
+directly at professional and amateur Java programmers alike to enable <a
+ href="projects.php">commercial quality games</a> to be written in Java.
+LWJGL provides developers access to high performance crossplatform
+libraries such as OpenGL (<a href="http://www.opengl.org/"
+ target="_blank">Open Graphics Library</a>) and OpenAL (<a
+ href="http://www.openal.org" target="_blank">Open Audio Library</a>)
+allowing for state of the art 3D games and 3D sound. Additionally LWJGL
+provides access to controllers such as Gamepads, Steering wheel and
+Joysticks. All in a simple and straight forward API.</p>
+<p>LWJGL is not meant to make writing games particularly easy; it is
+primarily an enabling technology which allows developers to get at
+resources that are simply otherwise unavailable or poorly implemented on
+the existing <a href="http://java.sun.com" target="_blank">Java
+platform</a>. We anticipate that the LWJGL will, through evolution and
+extension, become the foundation for more complete game libraries and
+"game engines" as they have popularly become known, and hide some of the
+new evils we have had to expose in the APIs.</p>
+<p>LWJGL is available under a <a href="http://lwjgl.org/license.php">BSD
+license</a>, which means it's open source and freely available at no charge.</p>
+<p>Please visit us on the Freenode IRC Network: <a
+ href="irc://irc.freenode.net/lwjgl" target="_blank">#LWJGL</a>. Do idle
+if there is no one to answer any of your questions, we are on different
+timezones.</p>
+
+<h3>Plugin assembly</h3>
+<p>The plugins were assembled by Jens von Pilgrim (dev...@je...). All files related to this assembly, such as manifest files or plugin descriptors, are copyright under the Eclipse Public License (EPL) and the BSD license</p>
+
+<h3>Third party code</h3>
+
+<h4>IBM</h4>
+<p>The LWJGL Textview contains code copyright under the Eclipse Public License (EPL):<br/>
+<pre>
+Copyright (c) 2000, 2005 IBM Corporation and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+</pre>
+The source of this code can be found at:
+<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet195.java?view=markup&content-type=text%2Fvnd.viewcvs-markup&revision=HEAD">http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet195.java?view=markup&content-type=text%2Fvnd.viewcvs-markup&revision=HEAD</a>
+</p>
+
+<h4>MESA</h4>
+<p>
+LWJGL contains code copyright under Mesa (MIT) License. Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
+</p>
+
+<h4>Lev Povalahev</h4>
+<p>
+LWJGL contains code copyright under BSD License. Copyright (c) 2002, Lev Povalahev
+</p>
+
+
+<h3>Third party code used for building the update site</h3>
+<p>The build system is based on Apache ANT. In order to build all plugins, features and the updatesite, some third-party ant tasks are required.</p>
+
+<h4>Eclipse Packages</h4>
+<p>ecj.jar and org.eclipse.osgi.jar are used for compiling the test view. These two files are copyright under the Eclipse Public License (EPL). </p>
+
+<h4>Ant4Eclipse</h4>
+<p>This ant task is copyright under the Sun Public License, see <a href="http://www.opensource.org/licenses/sunpublic.php">http://www.opensource.org/licenses/sunpublic.php</a>.</p>
+
+<h4>Packagelist</h4>
+<p>This ant tasks was created by Jens von Pilgrim, it is copyright under the Eclipse Public License (EPL) and the BSD license.</p>
+
+</body>
+</html>
Added: trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/build.properties
===================================================================
--- trunk/LWJGL/eclipse-update/org.lwjgl.eclipseplugins/plugin-skeletons/org.lwjgl/build.properties ...
[truncated message content] |
|
From: <ma...@us...> - 2009-03-09 21:07:49
|
Revision: 3174
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3174&view=rev
Author: matzon
Date: 2009-03-09 21:07:38 +0000 (Mon, 09 Mar 2009)
Log Message:
-----------
updating version to 2.1.0
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 2009-02-05 16:18:42 UTC (rev 3173)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2009-03-09 21:07:38 UTC (rev 3174)
@@ -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.0.1" />
+ <property name="lwjgl.version" value="2.1.0" />
<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java"/>
<!-- ================================================================== -->
Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java 2009-02-05 16:18:42 UTC (rev 3173)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2009-03-09 21:07:38 UTC (rev 3174)
@@ -54,7 +54,7 @@
private static final String JNI_LIBRARY_NAME = "lwjgl";
/** Current version of library */
- private static final String VERSION = "2.0.1";
+ private static final String VERSION = "2.1.0";
/** 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.
|
|
From: <ma...@us...> - 2009-03-17 21:50:28
|
Revision: 3185
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3185&view=rev
Author: matzon
Date: 2009-03-17 21:50:09 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
using windows dir instead of win32/win64
Modified Paths:
--------------
trunk/LWJGL/build.xml
trunk/LWJGL/platform_build/build-applet.xml
trunk/LWJGL/platform_build/build-definitions.xml
trunk/LWJGL/platform_build/build-webstart.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2009-03-17 21:49:28 UTC (rev 3184)
+++ trunk/LWJGL/build.xml 2009-03-17 21:50:09 UTC (rev 3185)
@@ -25,7 +25,7 @@
<mkdir dir="${lwjgl.temp}/doc" taskname="initialiazing temp/doc folder" />
<mkdir dir="${lwjgl.temp}/res" taskname="initialiazing temp/res folder" />
<mkdir dir="${lwjgl.temp}/native" taskname="initialiazing temp/native folder" />
- <mkdir dir="${lwjgl.temp}/native/win32" taskname="initialiazing temp/win32 folder" />
+ <mkdir dir="${lwjgl.temp}/native/windows" taskname="initialiazing temp/windows folder" />
<mkdir dir="${lwjgl.temp}/native/linux" taskname="initialiazing temp/linux folder" />
<mkdir dir="${lwjgl.temp}/native/macosx" taskname="initialiazing temp/macosx folder" />
<mkdir dir="${lwjgl.temp}/native/solaris" taskname="initialiazing temp/solaris folder" />
@@ -41,7 +41,7 @@
<!-- Creates a distribution of LWJGL -->
<target name="release" description="Creates a distribution of LWJGL using supplied native binaries">
<!-- Warn user -->
- <echo message="Before running the release target, please manually compile all platforms and place required files in ${lwjgl.lib}/win32, ${lwjgl.lib}/linux and ${lwjgl.lib}/macosx${line.separator}Missing files will result in a successfull built, but with incomplete release zips"/>
+ <echo message="Before running the release target, please manually compile all platforms and place required files in ${lwjgl.lib}/windows, ${lwjgl.lib}/linux and ${lwjgl.lib}/macosx${line.separator}Missing files will result in a successfull built, but with incomplete release zips"/>
<input
message="All data in the ${lwjgl.dist} folder will be deleted. Continue? "
validargs="yes,no"
@@ -132,9 +132,10 @@
</delete>
<copy file="${lwjgl.lib}/jinput.jar" todir="${lwjgl.temp}/jar"/>
- <copy todir="${lwjgl.temp}/native/win32">
- <fileset dir="${lwjgl.lib}/win32">
- <patternset refid="lwjgl-win32.fileset" />
+ <copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="${lwjgl.temp}/jar"/>
+ <copy todir="${lwjgl.temp}/native/windows">
+ <fileset dir="${lwjgl.lib}/windows">
+ <patternset refid="lwjgl-windows.fileset" />
</fileset>
</copy>
<copy todir="${lwjgl.temp}/native/linux">
@@ -269,7 +270,7 @@
<!-- Compiles LWJGL on Win32 platforms -->
<target name="-compile_native_win32" if="lwjgl.platform.windows">
<ant antfile="platform_build/windows_ant/build.xml" inheritAll="false"/>
- <copy file="${lwjgl.bin}/lwjgl/lwjgl.dll" todir="${lwjgl.lib}/win32"/>
+ <copy file="${lwjgl.bin}/lwjgl/lwjgl.dll" todir="${lwjgl.lib}/windows"/>
</target>
<!-- Compiles LWJGL on Linux platforms -->
@@ -341,7 +342,7 @@
<target name="runtest" depends="all">
<fail message="test.mainclass is not set. Use 'ant -Dtest.mainclass=<main-class> runtest'" unless="test.mainclass"/>
- <condition property="native_path" value="libs/win32">
+ <condition property="native_path" value="libs/windows">
<os family="windows" />
</condition>
@@ -367,7 +368,7 @@
<javadoc destdir="${lwjgl.docs}/javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API">
<fileset refid="lwjgl.javadoc.fileset" />
<doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
- <bottom><![CDATA[<i>Copyright © 2002-2008 lwjgl.org. All Rights Reserved.</i>]]></bottom>
+ <bottom><![CDATA[<i>Copyright © 2002-2009 lwjgl.org. All Rights Reserved.</i>]]></bottom>
</javadoc>
</target>
</project>
Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml 2009-03-17 21:49:28 UTC (rev 3184)
+++ trunk/LWJGL/platform_build/build-applet.xml 2009-03-17 21:50:09 UTC (rev 3185)
@@ -30,8 +30,8 @@
<!-- create each of the native jars -->
<jar destfile="applet/windows_natives.jar" taskname="windows_natives.jar">
- <fileset dir="${lwjgl.lib}/win32">
- <patternset refid="lwjgl-win32.fileset"/>
+ <fileset dir="${lwjgl.lib}/windows">
+ <patternset refid="lwjgl-windows.fileset"/>
</fileset>
</jar>
<signjar jar="applet/windows_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
@@ -61,7 +61,8 @@
<fileset dir="${lwjgl.res}" includes="applet*"/>
</jar>
- <copy file="${lwjgl.lib}/lwjgl.jar" todir="applet"/>
+ <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"/>
@@ -77,6 +78,11 @@
<param name="output" value="applet/lwjgl.jar.lzma"/>
</antcall>
<antcall target="compress-resource">
+ <param name="input" value="applet/lwjgl-debug.jar"/>
+ <param name="output" value="applet/lwjgl-debug.jar.lzma"/>
+ </antcall>
+
+ <antcall target="compress-resource">
<param name="input" value="applet/lwjgl_util.jar"/>
<param name="output" value="applet/lwjgl_util.jar.lzma"/>
</antcall>
@@ -98,6 +104,10 @@
</antcall>
<antcall target="compress-sign-class">
<param name="dir" value="applet/"/>
+ <param name="jarfile" value="lwjgl-debug"/>
+ </antcall>
+ <antcall target="compress-sign-class">
+ <param name="dir" value="applet/"/>
<param name="jarfile" value="lwjgl_util"/>
</antcall>
<antcall target="compress-sign-class">
Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml 2009-03-17 21:49:28 UTC (rev 3184)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2009-03-17 21:50:09 UTC (rev 3185)
@@ -85,10 +85,12 @@
<include name="3rdparty/*" />
</patternset>
- <!-- Files to include in win32 package -->
- <patternset id="lwjgl-win32.fileset">
+ <!-- Files to include in windows package -->
+ <patternset id="lwjgl-windows.fileset">
<include name="lwjgl.dll" />
+ <include name="lwjgl64.dll" />
<include name="OpenAL32.dll" />
+ <include name="OpenAL64.dll" />
<include name="jinput-dx8.dll" />
<include name="jinput-raw.dll" />
</patternset>
@@ -149,7 +151,7 @@
<exclude name="applet/lwjglkeystore" />
</patternset>
- <uptodate property="lwjgl.main.built" targetfile="${lwjgl.lib}/win32/lwjgl.dll" >
+ <uptodate property="lwjgl.main.built" targetfile="${lwjgl.lib}/windows/lwjgl.dll" >
<srcfiles dir= "${lwjgl.src.native}/common" includes="*.c*"/>
<srcfiles dir= "${lwjgl.src.native}/windows" includes="*.c"/>
</uptodate>
Modified: trunk/LWJGL/platform_build/build-webstart.xml
===================================================================
--- trunk/LWJGL/platform_build/build-webstart.xml 2009-03-17 21:49:28 UTC (rev 3184)
+++ trunk/LWJGL/platform_build/build-webstart.xml 2009-03-17 21:50:09 UTC (rev 3185)
@@ -41,7 +41,7 @@
</move>
<!-- create native jars -->
- <jar destfile="${lwjgl.temp}/jnlp/native_win32.jar" basedir="${lwjgl.temp}/jnlp/temp/native/win32"/>
+ <jar destfile="${lwjgl.temp}/jnlp/native_windows.jar" basedir="${lwjgl.temp}/jnlp/temp/native/windows"/>
<jar destfile="${lwjgl.temp}/jnlp/native_linux.jar" basedir="${lwjgl.temp}/jnlp/temp/native/linux"/>
<jar destfile="${lwjgl.temp}/jnlp/native_macosx.jar" basedir="${lwjgl.temp}/jnlp/temp/native/macosx"/>
<jar destfile="${lwjgl.temp}/jnlp/native_solaris.jar" basedir="${lwjgl.temp}/jnlp/temp/native/solaris"/>
@@ -55,7 +55,7 @@
<signjar jar="${lwjgl.temp}/jnlp/native_solaris.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
<signjar jar="${lwjgl.temp}/jnlp/native_linux.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
<signjar jar="${lwjgl.temp}/jnlp/native_macosx.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
- <signjar jar="${lwjgl.temp}/jnlp/native_win32.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="${lwjgl.temp}/jnlp/native_windows.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
<signjar jar="${lwjgl.temp}/jnlp/jinput.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
</target>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <en...@us...> - 2009-04-08 20:22:39
|
Revision: 3196
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3196&view=rev
Author: endolf
Date: 2009-04-08 20:18:29 +0000 (Wed, 08 Apr 2009)
Log Message:
-----------
Updates for building windows 64 bit builds in VC express
Modified Paths:
--------------
trunk/LWJGL/build.xml
trunk/LWJGL/platform_build/windows_ant/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2009-04-05 22:07:46 UTC (rev 3195)
+++ trunk/LWJGL/build.xml 2009-04-08 20:18:29 UTC (rev 3196)
@@ -270,7 +270,9 @@
<!-- Compiles LWJGL on Win32 platforms -->
<target name="-compile_native_win32" if="lwjgl.platform.windows">
<ant antfile="platform_build/windows_ant/build.xml" inheritAll="false"/>
- <copy file="${lwjgl.bin}/lwjgl/lwjgl.dll" todir="${lwjgl.lib}/windows"/>
+ <copy todir="${lwjgl.lib}/windows">
+ <fileset dir="${lwjgl.bin}/lwjgl" includes="lwjgl*.dll"/>
+ </copy>
</target>
<!-- Compiles LWJGL on Linux platforms -->
Modified: trunk/LWJGL/platform_build/windows_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build.xml 2009-04-05 22:07:46 UTC (rev 3195)
+++ trunk/LWJGL/platform_build/windows_ant/build.xml 2009-04-08 20:18:29 UTC (rev 3196)
@@ -4,15 +4,11 @@
<property name="native" location="../../src/native"/>
<property environment="env"/>
<property name="sdkhome" location="${env.MSSDK}"/>
- <property name="program_files" location="${env.ProgramFiles}"/>
- <property name="alhome" location="${program_files}\OpenAL 1.1 with EFX SDK"/>
- <property name="dllname" value="lwjgl.dll"/>
<target name="compile_dir">
<apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
<arg line="/Ox /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c"/>
<arg value="/I${sdkhome}\include"/>
- <arg value="/I${alhome}\include"/>
<arg value="/I${java.home}\..\include"/>
<arg value="/I${java.home}\..\include\win32"/>
<arg value="/I${native}\common"/>
@@ -31,8 +27,7 @@
<srcfile/>
<arg line="/Fe${dllname} /link"/>
<arg value="/LIBPATH:${java.home}\..\lib"/>
- <arg value="/LIBPATH:${sdkhome}\lib"/>
- <arg value="/LIBPATH:${alhome}\libs"/>
+ <arg value="/LIBPATH:${sdkhomelib}"/>
<arg value="/OPT:REF"/>
<arg value="/OPT:ICF"/>
<arg line="/DLL /DELAYLOAD:jawt.dll ${libs}"/>
@@ -50,8 +45,13 @@
</target>
<target name="compile">
- <echo message="${sdkhome}"/>
- <echo message="${program_files}"/>
+ <condition property="sdkhomelib" value="${sdkhome}\lib" else="${sdkhome}\lib\x64">
+ <equals arg1="${os.arch}" arg2="x86"/>
+ </condition>
+ <condition property="dllname" value="lwjgl.dll" else="lwjgl64.dll">
+ <equals arg1="${os.arch}" arg2="x86"/>
+ </condition>
+ <echo message="${sdkhomelib}"/>
<property name="libs" value="Kernel32.lib ole32.lib OpenGL32.Lib Version.lib user32.lib Gdi32.lib Advapi32.lib jawt.lib delayimp.lib winmm.lib"/>
<antcall target="compile_dir"/>
<antcall target="link"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <en...@us...> - 2009-04-08 21:54:10
|
Revision: 3197
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3197&view=rev
Author: endolf
Date: 2009-04-08 21:53:59 +0000 (Wed, 08 Apr 2009)
Log Message:
-----------
Updates for solaris and linux builds.
Modified Paths:
--------------
trunk/LWJGL/build.xml
trunk/LWJGL/platform_build/linux_ant/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2009-04-08 20:18:29 UTC (rev 3196)
+++ trunk/LWJGL/build.xml 2009-04-08 21:53:59 UTC (rev 3197)
@@ -254,13 +254,15 @@
<antcall target="-compile_native_win32" />
<condition property="lwjgl.platform.linux">
- <or>
- <os name="Linux" />
- <os name="SunOS" />
- </or>
+ <os name="Linux" />
</condition>
<antcall target="-compile_native_linux" />
+ <condition property="lwjgl.platform.solaris">
+ <os name="SunOS" />
+ </condition>
+ <antcall target="-compile_native_solaris" />
+
<condition property="lwjgl.platform.macosx">
<os name="Mac OS X" />
</condition>
@@ -283,6 +285,15 @@
</copy>
</target>
+ <!-- Compiles LWJGL on solaris platforms -->
+ <target name="-compile_native_solaris" if="lwjgl.platform.solaris">
+ <!-- Reusing the linux ant task, but copy the output to solaris -->
+ <ant antfile="platform_build/linux_ant/build.xml" inheritAll="false"/>
+ <copy todir="${lwjgl.lib}/solaris">
+ <fileset dir="${lwjgl.bin}/lwjgl" includes="liblwjgl*.so"/>
+ </copy>
+ </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"/>
Modified: trunk/LWJGL/platform_build/linux_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build.xml 2009-04-08 20:18:29 UTC (rev 3196)
+++ trunk/LWJGL/platform_build/linux_ant/build.xml 2009-04-08 21:53:59 UTC (rev 3197)
@@ -4,12 +4,14 @@
<property name="native" location="../../src/native"/>
<property name="libname32" value="liblwjgl.so"/>
<property name="libname64" value="liblwjgl64.so"/>
- <property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt"/>
- <property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt"/>
- <property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
-
+ <property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" />
+ <property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" />
+ <property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
+
<target name="clean">
<delete>
+ <fileset dir="x32"/>
+ <fileset dir="x64"/>
<fileset dir="." includes="*.o"/>
<fileset dir="." includes="*.so"/>
</delete>
@@ -22,22 +24,49 @@
<condition property="xf86vm_lib" value="-lXxf86vm" else="-Wl,-static,-lXxf86vm,-call_shared">
<os name="SunOS" />
</condition>
- <condition property="libs" value="${libs64}" else="${libs32} ${xf86vm_lib}">
- <equals arg1="${hwplatform}" arg2="x86_64"/>
- </condition>
- <condition property="libname" value="${libname64}" else="${libname32}">
- <equals arg1="${hwplatform}" arg2="x86_64"/>
- </condition>
<condition property="cflags_pthread" value="-pthreads" else="-pthread">
<os name="SunOS" />
</condition>
- <condition property="version_script_flags" value="" else="-Wl,--version-script=${native}/linux/lwjgl.map">
+ <condition property="version_script_flags32" value="" else="-Wl,--version-script=${native}/linux/lwjgl.map">
<os name="SunOS" />
</condition>
+ <condition property="version_script_flags64" value="-m64" else="-Wl,--version-script=${native}/linux/lwjgl.map">
+ <and>
+ <os name="SunOS" />
+ </and>
+ </condition>
+ <condition property="cflags64" value="-O2 -m64 -Wall -c -fPIC -std=c99 -Wunused" else="-O2 -Wall -c -fPIC -std=c99 -Wunused">
+ <os name="SunOS" />
+ </condition>
- <property name="linker_flags" value="${version_script_flags} -shared -O2 -Wall -o ${libname} ${libs}"/>
- <apply dir="." executable="gcc" dest="." skipemptyfilesets="true" failonerror="true">
- <arg line="${cflags} ${cflags_pthread}"/>
+ <property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/>
+ <property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/>
+
+ <condition property="build.32bit.only">
+ <not>
+ <or>
+ <equals arg1="${hwplatform}" arg2="x86_64"/>
+ <equals arg1="${hwplatform}" arg2="i86pc"/>
+ </or>
+ </not>
+ </condition>
+
+ <!-- On linux, the 64 bit jre doesn't have the 32 bit libs -->
+ <condition property="build.64bit.only">
+ <and>
+ <os name="Linux"/>
+ <equals arg1="${hwplatform}" arg2="x86_64"/>
+ </and>
+ </condition>
+
+ <antcall target="compile32"/>
+ <antcall target="compile64"/>
+ </target>
+
+ <target name="compile32" unless="build.64bit.only">
+ <mkdir dir="x32"/>
+ <apply dir="x32" executable="gcc" skipemptyfilesets="true" failonerror="true">
+ <arg line="${cflags32} ${cflags_pthread}"/>
<arg value="-I${java.home}/include"/>
<arg value="-I${java.home}/include/linux"/>
<arg value="-I${java.home}/../include"/>
@@ -52,12 +81,37 @@
</apply>
<apply dir="." parallel="true" executable="gcc" failonerror="true">
<srcfile/>
- <arg line="${linker_flags}"/>
- <fileset dir="." includes="*.o"/>
+ <arg line="${linker_flags32}"/>
+ <fileset dir="x32" includes="*.o"/>
</apply>
<apply dir="." parallel="true" executable="strip" failonerror="true">
- <fileset file="${libname}"/>
+ <fileset file="${libname32}"/>
</apply>
</target>
+
+ <target name="compile64" unless="build.32bit.only">
+ <mkdir dir="x64"/>
+ <apply dir="x64" executable="gcc" skipemptyfilesets="true" failonerror="true">
+ <arg line="${cflags64} ${cflags_pthread}"/>
+ <arg value="-I${java.home}/include"/>
+ <arg value="-I${java.home}/include/linux"/>
+ <arg value="-I${java.home}/../include"/>
+ <arg value="-I${java.home}/../include/linux"/>
+ <arg value="-I${java.home}/../include/solaris"/>
+ <arg value="-I${native}/common"/>
+ <arg value="-I${native}/linux"/>
+ <mapper type="glob" from="*.c" to="*.o"/>
+ <fileset dir="${native}/linux" includes="*.c"/>
+ <fileset dir="${native}/generated" includes="*.c"/>
+ <fileset dir="${native}/common" includes="*.c"/>
+ </apply>
+ <apply dir="." parallel="true" executable="gcc" failonerror="true">
+ <srcfile/>
+ <arg line="${linker_flags64}"/>
+ <fileset dir="x64" includes="*.o"/>
+ </apply>
+ <apply dir="." parallel="true" executable="strip" failonerror="true">
+ <fileset file="${libname64}"/>
+ </apply>
+ </target>
</project>
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <en...@us...> - 2009-04-09 20:22:48
|
Revision: 3198
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3198&view=rev
Author: endolf
Date: 2009-04-09 20:22:45 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
Parameterise the signing of the applet, and don't fail if the debug jar is missing.
Modified Paths:
--------------
trunk/LWJGL/build.xml
trunk/LWJGL/platform_build/build-applet.xml
trunk/LWJGL/platform_build/build-definitions.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2009-04-08 21:53:59 UTC (rev 3197)
+++ trunk/LWJGL/build.xml 2009-04-09 20:22:45 UTC (rev 3198)
@@ -132,7 +132,7 @@
</delete>
<copy file="${lwjgl.lib}/jinput.jar" todir="${lwjgl.temp}/jar"/>
- <copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="${lwjgl.temp}/jar"/>
+ <copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="${lwjgl.temp}/jar" failonerror="false"/>
<copy todir="${lwjgl.temp}/native/windows">
<fileset dir="${lwjgl.lib}/windows">
<patternset refid="lwjgl-windows.fileset" />
Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml 2009-04-08 21:53:59 UTC (rev 3197)
+++ trunk/LWJGL/platform_build/build-applet.xml 2009-04-09 20:22:45 UTC (rev 3198)
@@ -12,12 +12,19 @@
</target>
<target name="applet-release">
- <input message="Please type the password for the keystore" addproperty="sign.pwd"/>
+ <input message="Please enter the keystore" addproperty="keystore.location" defaultvalue="applet/lwjglkeystore"/>
+ <input message="Please enter the keystore alias" addproperty="keystore.alias" defaultvalue="lwjgl"/>
+ <input message="Please type the password for the keystore" addproperty="sign.pwd" defaultvalue="123456"/>
<antcall target="-applet">
- <param name="keystore" value="signing/matzon_java_code_signing.keystore"/>
+ <!--
+ <param name="keystore" value="signing/matzon_java_code_signing.keystore"/>
<param name="alias" value="oddlabs_java_code_signing"/>
<param name="password" value="${sign.pwd}"/>
+ -->
+ <param name="keystore" value="${keystore.location}"/>
+ <param name="alias" value="${keystore.alias}"/>
+ <param name="password" value="${sign.pwd}"/>
</antcall>
</target>
@@ -62,7 +69,7 @@
</jar>
<copy file="${lwjgl.lib}/lwjgl.jar" todir="applet"/>
- <copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet"/>
+ <copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet" failonerror="false"/>
<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"/>
Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml 2009-04-08 21:53:59 UTC (rev 3197)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2009-04-09 20:22:45 UTC (rev 3198)
@@ -91,8 +91,8 @@
<include name="lwjgl64.dll" />
<include name="OpenAL32.dll" />
<include name="OpenAL64.dll" />
- <include name="jinput-dx8.dll" />
- <include name="jinput-raw.dll" />
+ <include name="jinput-dx8*.dll" />
+ <include name="jinput-raw*.dll" />
</patternset>
<!-- Files to include in linux, glibc2.3 package -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <en...@us...> - 2009-04-09 21:18:23
|
Revision: 3199
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3199&view=rev
Author: endolf
Date: 2009-04-09 21:18:19 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
Make the release build also compile the debug jar
Modified Paths:
--------------
trunk/LWJGL/build.xml
trunk/LWJGL/platform_build/build-applet.xml
trunk/LWJGL/platform_build/build-generator.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2009-04-09 20:22:45 UTC (rev 3198)
+++ trunk/LWJGL/build.xml 2009-04-09 21:18:19 UTC (rev 3199)
@@ -62,6 +62,7 @@
<antcall target="compile" />
<antcall target="javadoc" />
<antcall target="-createjars" />
+ <antcall target="debug-jars"/>
<antcall target="applet-release" />
<!-- copy resources to res folder -->
@@ -94,6 +95,15 @@
</fileset>
</move>
</target>
+
+ <target name="debug-jars" description="Creates the Java archives ONLY, the debug version of lwjgl jar, and places them in libs/" depends="jars">
+ <!-- <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="generate-debug"/>
+ <antcall target="compile"/>
+ <antcall target="-createjars"/>
+ <move tofile="libs/lwjgl-debug.jar" file="${lwjgl.temp}/jar/lwjgl.jar"/>
+ </target>
<!-- Packages the java files -->
<target name="-createjars">
@@ -132,7 +142,7 @@
</delete>
<copy file="${lwjgl.lib}/jinput.jar" todir="${lwjgl.temp}/jar"/>
- <copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="${lwjgl.temp}/jar" failonerror="false"/>
+ <copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="${lwjgl.temp}/jar"/>
<copy todir="${lwjgl.temp}/native/windows">
<fileset dir="${lwjgl.lib}/windows">
<patternset refid="lwjgl-windows.fileset" />
Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml 2009-04-09 20:22:45 UTC (rev 3198)
+++ trunk/LWJGL/platform_build/build-applet.xml 2009-04-09 21:18:19 UTC (rev 3199)
@@ -69,7 +69,7 @@
</jar>
<copy file="${lwjgl.lib}/lwjgl.jar" todir="applet"/>
- <copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet" failonerror="false"/>
+ <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"/>
Modified: trunk/LWJGL/platform_build/build-generator.xml
===================================================================
--- trunk/LWJGL/platform_build/build-generator.xml 2009-04-09 20:22:45 UTC (rev 3198)
+++ trunk/LWJGL/platform_build/build-generator.xml 2009-04-09 21:18:19 UTC (rev 3199)
@@ -18,6 +18,8 @@
<!-- 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"/>
+
<!-- Generate OpenAL -->
<target name="generate-openal" depends="generators" description="Generates java and native source for AL">
<apply executable="apt" parallel="true">
@@ -55,6 +57,25 @@
</apply>
</target>
+ <!-- Generate OpenGL -->
+ <target name="generate-opengl-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.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="-Ageneratechecks"/>
+ <arg value="-Acontextspecific"/>
+ <arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/>
+ <fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>
+ </apply>
+ </target>
+
<!-- Generate context capabilities -->
<target name="generate-opengl-references" depends="generators" description="Generates java and native source for GL">
<apply executable="apt" parallel="true">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2009-05-26 20:39:25
|
Revision: 3215
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3215&view=rev
Author: matzon
Date: 2009-05-26 20:39:23 +0000 (Tue, 26 May 2009)
Log Message:
-----------
fix windows issue with mouse down true when released outside window
Modified Paths:
--------------
trunk/LWJGL/platform_build/windows_ant/build.xml
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
Modified: trunk/LWJGL/platform_build/windows_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build.xml 2009-05-23 09:37:10 UTC (rev 3214)
+++ trunk/LWJGL/platform_build/windows_ant/build.xml 2009-05-26 20:39:23 UTC (rev 3215)
@@ -52,7 +52,7 @@
<equals arg1="${os.arch}" arg2="x86"/>
</condition>
<echo message="${sdkhomelib}"/>
- <property name="libs" value="Kernel32.lib ole32.lib OpenGL32.Lib Version.lib user32.lib Gdi32.lib Advapi32.lib jawt.lib delayimp.lib winmm.lib"/>
+ <property name="libs" value="Kernel32.lib ole32.lib OpenGL32.Lib Version.lib user32.lib Gdi32.lib Advapi32.lib jawt.lib delayimp.lib winmm.lib Comctl32.lib"/>
<antcall target="compile_dir"/>
<antcall target="link"/>
</target>
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java 2009-05-23 09:37:10 UTC (rev 3214)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java 2009-05-26 20:39:23 UTC (rev 3215)
@@ -62,6 +62,7 @@
private final static int WM_MBUTTONUP = 0x0208;
private final static int WM_MBUTTONDBLCLK = 0x0209;
private final static int WM_MOUSEWHEEL = 0x020A;
+ private final static int WM_MOUSELEAVE = 0x02A3;
private final static int WM_KEYDOWN = 256;
private final static int WM_KEYUP = 257;
private final static int WM_SYSKEYUP = 261;
@@ -149,6 +150,8 @@
private long small_icon;
private long large_icon;
+ private boolean trackingMouse = false;
+
WindowsDisplay() {
current_display = this;
}
@@ -669,8 +672,18 @@
}
private void handleMouseMoved(int x, int y, long millis) {
- if (mouse != null)
- mouse.handleMouseMoved(x, y, millis, shouldGrab());
+ if (mouse != null) {
+ mouse.handleMouseMoved(x, y, millis, shouldGrab());
+
+ // if we're not tracking mouse and we get a mouse move event - START TRACKING!
+ if(!trackingMouse && !Mouse.isGrabbed()) {
+ LWJGLUtil.log("initial mouse move - need tracking");
+
+ if (nTrackMouse(hwnd)) {
+ trackingMouse = true;
+ }
+ }
+ }
}
private void handleMouseScrolled(int amount, long millis) {
@@ -796,6 +809,9 @@
case WM_MBUTTONUP:
handleMouseButton(2, 0, millis);
return 0;
+ case WM_MOUSELEAVE:
+ handleMouseLeave(millis);
+ return 0;
case WM_SYSCHAR:
case WM_CHAR:
handleChar(wParam, lParam, millis);
@@ -886,4 +902,17 @@
return "Rect: top = " + top + " bottom = " + bottom + " left = " + left + " right = " + right;
}
}
+
+
+
+
+ private static native boolean nTrackMouse(long hwnd);
+
+ private void handleMouseLeave(long millis) {
+ handleMouseButton(0, 0, millis);
+ handleMouseButton(1, 0, millis);
+ handleMouseButton(2, 0, millis);
+ trackingMouse = false;
+ }
+
}
Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c 2009-05-23 09:37:10 UTC (rev 3214)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c 2009-05-26 20:39:23 UTC (rev 3215)
@@ -489,3 +489,14 @@
return GetSystemMetrics(index);
}
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nTrackMouse(JNIEnv *env, jclass unused, jlong hwnd_int) {
+ HWND hwnd = (HWND)(INT_PTR)hwnd_int;
+
+ TRACKMOUSEEVENT tme;
+ tme.cbSize = sizeof(TRACKMOUSEEVENT);
+ tme.dwFlags = TME_LEAVE;
+ tme.hwndTrack = hwnd;
+
+ return _TrackMouseEvent(&tme);
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2009-06-19 10:33:03
|
Revision: 3224
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3224&view=rev
Author: spasi
Date: 2009-06-19 10:32:57 +0000 (Fri, 19 Jun 2009)
Log Message:
-----------
Added support for GREMEDY_string_marker.
Modified Paths:
--------------
trunk/LWJGL/platform_build/build-definitions.xml
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opengl/GREMEDY_string_marker.java
Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml 2009-06-15 13:08:52 UTC (rev 3223)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2009-06-19 10:32:57 UTC (rev 3224)
@@ -14,7 +14,7 @@
<property name="lwjgl.res" location="res" />
<property name="lwjgl.version" value="2.2.0" />
- <property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java"/>
+ <property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.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"/>
<!-- ================================================================== -->
<!-- Filesets used for targets -->
<!-- ================================================================== -->
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/GREMEDY_string_marker.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GREMEDY_string_marker.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GREMEDY_string_marker.java 2009-06-19 10:32:57 UTC (rev 3224)
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2002-2008 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.opengl;
+
+import org.lwjgl.util.generator.AutoSize;
+import org.lwjgl.util.generator.Const;
+import org.lwjgl.util.generator.GLsizei;
+
+import java.nio.ByteBuffer;
+
+public interface GREMEDY_string_marker {
+
+ void glStringMarkerGREMEDY(@AutoSize("string") @GLsizei int len, @Const ByteBuffer string);
+
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2009-08-12 13:06:22
|
Revision: 3232
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3232&view=rev
Author: spasi
Date: 2009-08-12 13:06:11 +0000 (Wed, 12 Aug 2009)
Log Message:
-----------
Completed GL32 support.
Added Generator support for wrapping GL pointers.
Added support for passing command-line arguments to tests.
Added test for ARB_sync functionality.
Temp fix to NV_shader_buffer_load.
Modified Paths:
--------------
trunk/LWJGL/build.xml
trunk/LWJGL/src/java/org/lwjgl/test/opengl/VersionTest.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java
Added Paths:
-----------
trunk/LWJGL/src/java/org/lwjgl/opengl/GLSync.java
trunk/LWJGL/src/java/org/lwjgl/opengl/PointerWrapper.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLpointer.java
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2009-08-05 18:54:47 UTC (rev 3231)
+++ trunk/LWJGL/build.xml 2009-08-12 13:06:11 UTC (rev 3232)
@@ -389,6 +389,7 @@
<java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true">
<sysproperty key="org.lwjgl.util.Debug" value="true"/>
<sysproperty key="java.library.path" value="${native_path_expanded}"/>
+ <arg line="${args}"/>
</java>
</target>
Added: trunk/LWJGL/src/java/org/lwjgl/opengl/GLSync.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GLSync.java (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLSync.java 2009-08-12 13:06:11 UTC (rev 3232)
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2002-2008 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.opengl;
+
+/**
+ * @author spasi <sp...@us...>
+ */
+public final class GLSync implements PointerWrapper {
+
+ private final long sync;
+
+ GLSync(final long sync) {
+ this.sync = sync;
+ }
+
+ public long getPointer() {
+ return sync;
+ }
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/java/org/lwjgl/opengl/PointerWrapper.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/PointerWrapper.java (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/PointerWrapper.java 2009-08-12 13:06:11 UTC (rev 3232)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2002-2008 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.opengl;
+
+/** @author spasi <sp...@us...> */
+public interface PointerWrapper {
+
+ long getPointer();
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java 2009-08-12 13:06:11 UTC (rev 3232)
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 2002-2008 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.opengl;
+
+import org.lwjgl.BufferUtils;
+import org.lwjgl.LWJGLException;
+import org.lwjgl.Sys;
+import org.lwjgl.opengl.*;
+
+import java.nio.IntBuffer;
+import java.util.Random;
+
+/**
+ * @author spasi <sp...@us...>
+ */
+public final class SyncTest {
+
+ private SyncTest() {
+ }
+
+ public static void main(String[] args) {
+ runTest(args);
+ cleanup();
+ System.exit(0);
+ }
+
+ private static void runTest(String[] args) {
+ if ( args.length < 2 )
+ argsError("Insufficient number of arguments.");
+
+ int clears = 1;
+ int timeout = 0;
+
+ try {
+ clears = Integer.parseInt(args[0]);
+ timeout = Integer.parseInt(args[1]);
+ } catch (NumberFormatException e) {
+ argsError("Invalid number format.");
+ }
+
+ ContextAttribs ca = new ContextAttribs();
+
+ try {
+ DisplayMode[] modes = Display.getAvailableDisplayModes();
+
+ DisplayMode displayMode = chooseMode(modes, 1024, 768);
+ if ( displayMode == null )
+ displayMode = chooseMode(modes, 800, 600);
+ if ( displayMode == null )
+ displayMode = chooseMode(modes, 640, 480);
+ if ( displayMode == null )
+ kill("Failed to set an appropriate display mode.");
+
+ System.out.println("Setting display mode to: " + displayMode);
+ Display.setDisplayMode(displayMode);
+ Display.create(new PixelFormat(8, 24, 0), ca);
+ } catch (LWJGLException e) {
+ kill(e.getMessage());
+ }
+
+ System.out.println("\n---------\n");
+
+ final String version = GL11.glGetString(GL11.GL_VERSION);
+
+ System.out.println("GL Version: " + version);
+ System.out.println("ARB_sync: " + GLContext.getCapabilities().GL_ARB_sync);
+
+ if ( !GLContext.getCapabilities().OpenGL32 && !GLContext.getCapabilities().GL_ARB_sync )
+ kill("OpenGL3.2 or ARB_sync support is required for this test.");
+
+ System.out.println("\n---------\n");
+
+ System.out.println("Clearing the framebuffer a gazillion times...");
+
+ Random rand = new Random(System.currentTimeMillis());
+ for ( int i = 0; i < clears; i++ ) {
+ GL11.glClearColor(rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), 1.0f);
+ GL11.glClear(GL11.GL_COLOR_BUFFER_BIT);
+ }
+
+ GLSync sync = GL32.glFenceSync(GL32.GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+
+ System.out.println("\nWaiting on fence...");
+ long time = Sys.getTime();
+ int status = GL32.glClientWaitSync(sync, 0, timeout < 0 ? GL32.GL_TIMEOUT_IGNORED : timeout * 1000 * 1000);
+ System.out.println("\nFence sync complete after: " + ((Sys.getTime() - time) / (double)Sys.getTimerResolution()) + " seconds.");
+ System.out.print("\nWait Status: ");
+ switch ( status ) {
+ case GL32.GL_ALREADY_SIGNALED:
+ System.out.println("ALREADY_SIGNALED");
+ break;
+ case GL32.GL_CONDITION_SATISFIED:
+ System.out.println("CONDITION_SATISFIED");
+ break;
+ case GL32.GL_TIMEOUT_EXPIRED:
+ System.out.println("TIMEOUT_EXPIRED");
+ break;
+ case GL32.GL_WAIT_FAILED:
+ System.out.println("WAIT_FAILED");
+ break;
+ default:
+ System.out.println("Unexpected wait status: 0x" + Integer.toHexString(status));
+ }
+
+ IntBuffer property = BufferUtils.createIntBuffer(1);
+ GL32.glGetSynciv(sync, GL32.GL_SYNC_STATUS, null, property);
+ System.out.println("Sync Status: " + (property.get(0) == GL32.GL_UNSIGNALED ? "UNSIGNALED" : "SIGNALED"));
+
+ GL32.glDeleteSync(sync);
+
+ int error = GL11.glGetError();
+ if ( error != 0 )
+ System.out.println("\nTest failed with OpenGL error: " + error);
+ else
+ System.out.println("\nTest completed successfully.");
+ }
+
+ private static DisplayMode chooseMode(DisplayMode[] modes, int width, int height) {
+ DisplayMode bestMode = null;
+
+ for ( int i = 0; i < modes.length; i++ ) {
+ DisplayMode mode = modes[i];
+ if ( mode.getWidth() == width && mode.getHeight() == height && mode.getFrequency() <= 85 ) {
+ if ( bestMode == null || (mode.getBitsPerPixel() >= bestMode.getBitsPerPixel() && mode.getFrequency() > bestMode.getFrequency()) )
+ bestMode = mode;
+ }
+ }
+
+ return bestMode;
+ }
+
+ private static void cleanup() {
+ if ( Display.isCreated() )
+ Display.destroy();
+ }
+
+ private static void argsError(final String msg) {
+ System.out.println("\nInvalid arguments error: " + msg);
+ System.out.println("\nUsage: SyncTest <clears> <timeout>:\n");
+ System.out.println("clears\t- Number of times to clear the framebuffer.");
+ System.out.println("timeout\t- WaitSync timeout in milliseconds.");
+
+ cleanup();
+ System.exit(-1);
+ }
+
+ static void kill(String reason) {
+ System.out.println("The SyncTest program was terminated because an error occured.\n");
+ System.out.println("Reason: " + (reason == null ? "Unknown" : reason));
+
+ cleanup();
+ System.exit(-1);
+ }
+
+}
\ No newline at end of file
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/VersionTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/VersionTest.java 2009-08-05 18:54:47 UTC (rev 3231)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/VersionTest.java 2009-08-12 13:06:11 UTC (rev 3232)
@@ -79,6 +79,10 @@
ca = ca.withDebug(true);
else if ( "fc".equalsIgnoreCase(args[i]) )
ca = ca.withForwardCompatible(true);
+ else if ( "core".equalsIgnoreCase(args[i]) )
+ ca = ca.withProfileCore(true);
+ else if ( "compatibility".equalsIgnoreCase(args[i]) )
+ ca = ca.withProfileCompatibility(true);
else
argsError("Unknown argument: \'" + args[i] + "\'");
}
@@ -108,8 +112,12 @@
final String version = GL11.glGetString(GL11.GL_VERSION);
- System.out.println("GL Version requested: " + majorInput + '.' + minorInput);
- System.out.println("GL Version returned : " + version);
+ System.out.print("GL Version requested: " + majorInput + '.' + minorInput);
+ if ( ca.isProfileCore() )
+ System.out.print(" - Core Profile");
+ else if ( ca.isProfileCompatibility() )
+ System.out.print(" - Compatibility Profile");
+ System.out.println("\nGL Version returned : " + version);
final StringTokenizer version_tokenizer = new StringTokenizer(version, ". ");
@@ -126,6 +134,9 @@
} else
System.out.println("\tThe requested version was returned. :)");
+ if ( ca.isProfileCompatibility() && !GLContext.getCapabilities().GL_ARB_compatibility )
+ System.out.println("\tThe driver does not support the Compatibility Profile.");
+
System.out.println("\n---------\n");
System.out.println("Debug mode: " + ca.isDebug());
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java 2009-08-05 18:54:47 UTC (rev 3231)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java 2009-08-12 13:06:11 UTC (rev 3232)
@@ -41,6 +41,8 @@
* $Id$
*/
+import org.lwjgl.opengl.PointerWrapper;
+
import java.io.PrintWriter;
import java.nio.*;
import java.util.HashMap;
@@ -82,7 +84,6 @@
native_types_to_primitive.put(GLuint64EXT.class, PrimitiveType.Kind.LONG);
native_types_to_primitive.put(GLint64.class, PrimitiveType.Kind.LONG);
native_types_to_primitive.put(GLuint64.class, PrimitiveType.Kind.LONG);
- native_types_to_primitive.put(GLsync.class, PrimitiveType.Kind.LONG);
}
public PrimitiveType.Kind getPrimitiveTypeFromNativeType(Class native_type) {
@@ -197,14 +198,14 @@
else if ( type.equals(DoubleBuffer.class) )
return new Class[] { GLclampd.class, GLdouble.class };
else if ( type.equals(LongBuffer.class) )
- return new Class[] { GLint64EXT.class, GLuint64EXT.class, GLint64.class, GLuint64.class, GLsync.class };
+ return new Class[] { GLint64EXT.class, GLuint64EXT.class, GLint64.class, GLuint64.class };
else
return new Class[] { };
}
private static Class[] getValidPrimitiveTypes(Class type) {
if ( type.equals(long.class) )
- return new Class[] { GLintptrARB.class, GLuint.class, GLintptr.class, GLsizeiptrARB.class, GLsizeiptr.class, GLint64EXT.class, GLuint64EXT.class, GLint64.class, GLuint64.class, GLsync.class };
+ return new Class[] { GLintptrARB.class, GLuint.class, GLintptr.class, GLsizeiptrARB.class, GLsizeiptr.class, GLint64EXT.class, GLuint64EXT.class, GLint64.class, GLuint64.class };
else if ( type.equals(int.class) )
return new Class[] { GLbitfield.class, GLenum.class, GLhandleARB.class, GLint.class, GLuint.class,
GLsizei.class };
@@ -240,6 +241,8 @@
valid_types = getValidPrimitiveTypes(type);
else if ( String.class.equals(type) )
valid_types = new Class[] { GLubyte.class };
+ else if ( PointerWrapper.class.isAssignableFrom(type) )
+ valid_types = new Class[] { GLpointer.class };
else
valid_types = new Class[] { };
return valid_types;
Added: trunk/LWJGL/src/java/org/lwjgl/util/generator/GLpointer.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/GLpointer.java (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/GLpointer.java 2009-08-12 13:06:11 UTC (rev 3232)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2002-2008 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.util.generator;
+
+/**
+ * @author spasi <sp...@us...>
+ */
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+@Target({ElementType.PARAMETER, ElementType.METHOD})
+public @interface GLpointer {
+ String value(); // The native pointer type.
+}
\ No newline at end of file
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java 2009-08-05 18:54:47 UTC (rev 3231)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java 2009-08-12 13:06:11 UTC (rev 3232)
@@ -41,6 +41,8 @@
* $Id$
*/
+import org.lwjgl.opengl.PointerWrapper;
+
import com.sun.mirror.apt.*;
import com.sun.mirror.declaration.*;
import com.sun.mirror.type.*;
@@ -82,7 +84,7 @@
Utils.printDocComment(writer, method);
writer.print("\tpublic static native ");
}
- printResultType(writer, method);
+ printResultType(writer, method, true);
writer.print(" " + Utils.getSimpleNativeMethodName(method, generate_error_checks, context_specific));
if (mode == Mode.BUFFEROBJECT)
writer.print(Utils.BUFFER_OBJECT_METHOD_POSTFIX);
@@ -131,7 +133,7 @@
if (!first_parameter)
writer.print(", ");
first_parameter = false;
- printResultType(writer, method);
+ printResultType(writer, method, native_stub);
writer.print(" " + Utils.CACHED_BUFFER_NAME);
}
return first_parameter;
@@ -147,7 +149,10 @@
throw new RuntimeException("type of " + param + " is not a nio Buffer parameter but is annotated as buffer object");
writer.print("long " + param.getSimpleName() + Utils.BUFFER_OBJECT_PARAMETER_POSTFIX);
} else {
- writer.print(type_info.getType().getSimpleName());
+ if ( native_stub && param.getAnnotation(GLpointer.class) != null )
+ writer.print("long");
+ else
+ writer.print(type_info.getType().getSimpleName());
writer.print(" " + param.getSimpleName());
if (buffer_type != null && native_stub)
writer.print(", int " + param.getSimpleName() + NativeMethodStubsGenerator.BUFFER_POSITION_POSTFIX);
@@ -179,7 +184,7 @@
private static void printMethodWithMultiType(AnnotationProcessorEnvironment env, TypeMap type_map, PrintWriter writer, InterfaceDeclaration interface_decl, MethodDeclaration method, Map<ParameterDeclaration, TypeInfo> typeinfos_instance, Mode mode, boolean generate_error_checks, boolean context_specific) {
Utils.printDocComment(writer, method);
writer.print("\tpublic static ");
- printResultType(writer, method);
+ printResultType(writer, method, false);
StripPostfix strip_annotation = method.getAnnotation(StripPostfix.class);
String method_name = method.getSimpleName();
if (strip_annotation != null && mode == Mode.NORMAL)
@@ -204,8 +209,11 @@
writer.print("\t\t");
boolean has_result = !result_type.equals(env.getTypeUtils().getVoidType());
if (has_result) {
- printResultType(writer, method);
+ printResultType(writer, method, false);
writer.print(" " + Utils.RESULT_VAR_NAME + " = ");
+
+ if ( method.getAnnotation(GLpointer.class) != null )
+ writer.print("new " + method.getReturnType() + "(");
}
writer.print(Utils.getSimpleNativeMethodName(method, generate_error_checks, context_specific));
if (mode == Mode.BUFFEROBJECT)
@@ -217,6 +225,8 @@
writer.print(", ");
writer.print(Utils.FUNCTION_POINTER_VAR_NAME);
}
+ if ( has_result && method.getAnnotation(GLpointer.class) != null )
+ writer.print(")");
writer.println(");");
if (generate_error_checks && method.getAnnotation(NoErrorCheck.class) == null)
writer.println("\t\t" + type_map.getErrorCheckMethodName() + ";");
@@ -373,6 +383,8 @@
writer.print(" : 0");
} else
writer.print("0");
+ } else if ( param.getAnnotation(GLpointer.class) != null ) {
+ writer.print(".getPointer()");
}
}
}
@@ -492,7 +504,10 @@
writer.println("\t\tBufferChecks.checkNullTerminated(" + name + ");");
}
- private static void printResultType(PrintWriter writer, MethodDeclaration method) {
- writer.print(Utils.getMethodReturnType(method).toString());
+ private static void printResultType(PrintWriter writer, MethodDeclaration method, boolean native_stub) {
+ if ( native_stub && method.getAnnotation(GLpointer.class) != null )
+ writer.print("long");
+ else
+ writer.print(Utils.getMethodReturnType(method).toString());
}
}
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java 2009-08-05 18:54:47 UTC (rev 3231)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java 2009-08-12 13:06:11 UTC (rev 3232)
@@ -71,6 +71,8 @@
writer.print(", ");
if (mode == Mode.BUFFEROBJECT && param.getAnnotation(BufferObject.class) != null) {
writer.print("jlong " + param.getSimpleName() + Utils.BUFFER_OBJECT_PARAMETER_POSTFIX);
+ } else if ( param.getAnnotation(GLpointer.class) != null ) {
+ writer.print("jlong " + param.getSimpleName());
} else {
JNITypeTranslator translator = new JNITypeTranslator();
param.getType().accept(translator);
@@ -81,14 +83,22 @@
}
private static void generateMethodStub(AnnotationProcessorEnvironment env, TypeMap type_map, PrintWriter writer, String interface_name, MethodDeclaration method, Mode mode, boolean generate_error_checks, boolean context_specific) {
- TypeMirror result_type = Utils.getMethodReturnType(method);
- JNITypeTranslator translator = new JNITypeTranslator();
- result_type.accept(translator);
- if (!context_specific)
+ if ( !context_specific )
writer.print("static ");
else
writer.print("JNIEXPORT ");
- writer.print(translator.getSignature() + " JNICALL ");
+
+ TypeMirror result_type = Utils.getMethodReturnType(method);
+
+ if ( method.getAnnotation(GLpointer.class) != null ) {
+ writer.print("jlong");
+ } else {
+ JNITypeTranslator translator = new JNITypeTranslator();
+ result_type.accept(translator);
+ writer.print(translator.getSignature());
+ }
+ writer.print(" JNICALL ");
+
writer.print(Utils.getQualifiedNativeMethodName(interface_name, method, generate_error_checks, context_specific));
if (mode == Mode.BUFFEROBJECT)
writer.print(Utils.BUFFER_OBJECT_METHOD_POSTFIX);
@@ -140,8 +150,11 @@
writer.print("safeNewBufferCached(env, ");
else
writer.print("safeNewBuffer(env, ");
- } else if (String.class.equals(java_result_type))
+ } else if (String.class.equals(java_result_type)) {
writer.print("NewStringNativeUnsigned(env, ");
+ } else if ( method.getAnnotation(GLpointer.class) != null ) {
+ writer.print("(jlong)");
+ }
writer.print(Utils.RESULT_VAR_NAME);
if (Buffer.class.isAssignableFrom(java_result_type)) {
writer.print(", ");
@@ -176,6 +189,8 @@
writer.print(translator.getSignature());
writer.print("*)");
}
+ if ( param.getAnnotation(GLpointer.class) != null )
+ writer.print("(" + param.getAnnotation(GLpointer.class).value() + ")");
if (param.getAnnotation(Result.class) != null || is_indirect)
writer.print("&");
if (param.getAnnotation(Result.class) != null) {
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java 2009-08-05 18:54:47 UTC (rev 3231)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java 2009-08-12 13:06:11 UTC (rev 3232)
@@ -42,6 +42,8 @@
* $Id$
*/
+import org.lwjgl.opengl.PointerWrapper;
+
import com.sun.mirror.declaration.*;
import com.sun.mirror.type.*;
import com.sun.mirror.util.*;
@@ -77,8 +79,14 @@
StringBuilder signature = new StringBuilder();
if (declaration.getAnnotation(Const.class) != null)
signature.append("const ");
- // Use the name of the native type annotation as the C type name
- signature.append(getAnnotationType().getSimpleName());
+
+ if ( declaration.getAnnotation(GLpointer.class) != null ) {
+ signature.append(declaration.getAnnotation(GLpointer.class).value());
+ } else {
+ // Use the name of the native type annotation as the C type name
+ signature.append(getAnnotationType().getSimpleName());
+ }
+
if (is_indirect)
signature.append(" *");
return signature.toString();
@@ -131,6 +139,8 @@
}
public void visitClassType(ClassType t) {
+ is_indirect = true;
+
Class<?> c = getClassFromType(t);
if (String.class.equals(c)) {
native_types = new ArrayList<Class>();
@@ -141,9 +151,13 @@
} else if (Buffer.class.isAssignableFrom(c)) {
PrimitiveType.Kind kind = getPrimitiveKindFromBufferClass(c);
getNativeTypeFromAnnotatedPrimitiveType(kind);
+ } else if ( PointerWrapper.class.isAssignableFrom(c) ) {
+ native_types = new ArrayList<Class>();
+ native_types.add(GLpointer.class);
+
+ is_indirect = false;
} else
throw new RuntimeException(t + " is not allowed");
- is_indirect = true;
}
public void visitPrimitiveType(PrimitiveType t) {
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java 2009-08-05 18:54:47 UTC (rev 3231)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java 2009-08-12 13:06:11 UTC (rev 3232)
@@ -70,22 +70,22 @@
int GL_CONDITION_SATISFIED = 0x911C;
int GL_WAIT_FAILED = 0x911D;
- @GLsync
- long glFenceSync(@GLenum int condition, @GLbitfield int flags);
+ @GLpointer("GLsync")
+ GLSync glFenceSync(@GLenum int condition, @GLbitfield int flags);
- boolean glIsSync(@GLsync long sync);
+ boolean glIsSync(@GLpointer("GLsync") GLSync sync);
- void glDeleteSync(@GLsync long sync);
+ void glDeleteSync(@GLpointer("GLsync") GLSync sync);
@GLenum
- int glClientWaitSync(@GLsync long sync, @GLbitfield int flags, @GLuint64 long timeout);
+ int glClientWaitSync(@GLpointer("GLsync") GLSync sync, @GLbitfield int flags, @GLuint64 long timeout);
- void glWaitSync(@GLsync long sync, @GLbitfield int flags, @GLuint64 long timeout);
+ void glWaitSync(@GLpointer("GLsync") GLSync sync, @GLbitfield int flags, @GLuint64 long timeout);
@StripPostfix("params")
void glGetInteger64v(@GLenum int pname, @OutParameter @Check("1") @GLint64 LongBuffer params);
- void glGetSynciv(@GLsync long sync, @GLenum int pname,
+ void glGetSynciv(@GLpointer("GLsync") GLSync sync, @GLenum int pname,
@AutoSize("values") @GLsizei int bufSize,
@OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,
@OutParameter IntBuffer values);
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java 2009-08-05 18:54:47 UTC (rev 3231)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java 2009-08-12 13:06:11 UTC (rev 3232)
@@ -35,8 +35,8 @@
import java.nio.Buffer;
import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
import java.nio.LongBuffer;
-import java.nio.IntBuffer;
p...
[truncated message content] |
|
From: <ma...@us...> - 2009-11-15 19:24:05
|
Revision: 3247
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3247&view=rev
Author: matzon
Date: 2009-11-15 19:23:48 +0000 (Sun, 15 Nov 2009)
Log Message:
-----------
updating to 2.2.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 2009-11-12 22:12:49 UTC (rev 3246)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2009-11-15 19:23:48 UTC (rev 3247)
@@ -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.2.0" />
+ <property name="lwjgl.version" value="2.2.1" />
<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.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 2009-11-12 22:12:49 UTC (rev 3246)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2009-11-15 19:23:48 UTC (rev 3247)
@@ -54,7 +54,7 @@
private static final String JNI_LIBRARY_NAME = "lwjgl";
/** Current version of library */
- private static final String VERSION = "2.2.0";
+ private static final String VERSION = "2.2.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.
|
|
From: <ma...@us...> - 2010-01-25 21:14:28
|
Revision: 3265
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3265&view=rev
Author: matzon
Date: 2010-01-25 21:14:15 +0000 (Mon, 25 Jan 2010)
Log Message:
-----------
2.2.2
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-01-17 11:54:08 UTC (rev 3264)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2010-01-25 21:14:15 UTC (rev 3265)
@@ -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.2.1" />
+ <property name="lwjgl.version" value="2.2.2" />
<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.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-01-17 11:54:08 UTC (rev 3264)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2010-01-25 21:14:15 UTC (rev 3265)
@@ -54,7 +54,7 @@
private static final String JNI_LIBRARY_NAME = "lwjgl";
/** Current version of library */
- private static final String VERSION = "2.2.1";
+ private static final String VERSION = "2.2.2";
/** 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.
|
|
From: <sp...@us...> - 2010-01-31 16:41:03
|
Revision: 3267
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3267&view=rev
Author: spasi
Date: 2010-01-31 16:40:51 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
Improved compatibility mode detection
Removed support for indirect buffers as arguments to GL functions
Added missing tokens in GL30 & GL32
Added support for AMD_seamless_cubemap_per_texture & AMD_shader_stencil_export
Fixed AMD_vertex_shader_tessellator typo
Added AMD extensions to the build process >.<
Modified Paths:
--------------
trunk/LWJGL/platform_build/build-definitions.xml
trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorVisitor.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_seamless_cubemap_per_texture.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_shader_stencil_export.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_tessellator.java
Removed Paths:
-------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_tesselator.java
Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml 2010-01-26 22:18:48 UTC (rev 3266)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2010-01-31 16:40:51 UTC (rev 3267)
@@ -14,7 +14,7 @@
<property name="lwjgl.res" location="res" />
<property name="lwjgl.version" value="2.2.2" />
- <property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.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"/>
+ <property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/AMD*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.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"/>
<!-- ================================================================== -->
<!-- Filesets used for targets -->
<!-- ================================================================== -->
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java 2010-01-26 22:18:48 UTC (rev 3266)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java 2010-01-31 16:40:51 UTC (rev 3267)
@@ -173,13 +173,13 @@
static native long getFunctionAddress(String name);
/**
- * Determine which extensions are available. Helper method to ContextCapabilities.
+ * Determine which extensions are available and returns the context profile mask. Helper method to ContextCapabilities.
*
- * @return A Set containing all available extension strings.
+ * @param supported_extensions the Set to fill with the available extension names
+ *
+ * @return the context profile mask, will be 0 for any version < 3.2
*/
- static Set getSupportedExtensions() {
- final Set supported_extensions = new HashSet();
-
+ static int getSupportedExtensions(final Set supported_extensions) {
// Detect OpenGL version first
final String version = GL11.glGetString(GL11.GL_VERSION);
@@ -225,6 +225,8 @@
if ( 1 < majorVersion || 1 <= minorVersion )
supported_extensions.add("OpenGL11");
+ int profileMask = 0;
+
if ( majorVersion < 3 ) {
// Parse EXTENSIONS string
final String extensions_string = GL11.glGetString(GL11.GL_EXTENSIONS);
@@ -242,9 +244,15 @@
for ( int i = 0; i < extensionCount; i++ )
supported_extensions.add(GL30.glGetStringi(GL11.GL_EXTENSIONS, i));
+
+ // Get the context profile mask for versions >= 3.2
+ if ( 3 < majorVersion || 2 <= minorVersion ) {
+ GL11.glGetInteger(GL32.GL_CONTEXT_PROFILE_MASK, buffer);
+ profileMask = buffer.get(0);
+ }
}
- return supported_extensions;
+ return profileMask;
}
/**
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java 2010-01-26 22:18:48 UTC (rev 3266)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java 2010-01-31 16:40:51 UTC (rev 3267)
@@ -55,6 +55,7 @@
private final static String ALL_INIT_METHOD_NAME = "initAllStubs";
private final static String POINTER_INITIALIZER_POSTFIX = "_initNativeFunctionAddresses";
private final static String CACHED_EXTS_VAR_NAME = "supported_extensions";
+ private final static String PROFILE_MASK_VAR_NAME = "profileMask";
private final static String EXTENSION_PREFIX = "GL_";
private final static String CORE_PREFIX = "Open";
@@ -128,10 +129,11 @@
// Get the supported extensions set.
writer.println("\t\tGLContext.setCapabilities(this);");
- writer.println("\t\tSet " + CACHED_EXTS_VAR_NAME + " = GLContext.getSupportedExtensions();");
+ writer.println("\t\tSet " + CACHED_EXTS_VAR_NAME + " = new HashSet(256);");
+ writer.println("\t\tint " + PROFILE_MASK_VAR_NAME + " = GLContext.getSupportedExtensions(" + CACHED_EXTS_VAR_NAME + ");");
// Force forward compatible mode when OpenGL version is 3.1 or higher and ARB_compatibility is not available.
- writer.println("\t\tif ( supported_extensions.contains(\"OpenGL31\") && !supported_extensions.contains(\"GL_ARB_compatibility\") )");
+ writer.println("\t\tif ( supported_extensions.contains(\"OpenGL31\") && !(supported_extensions.contains(\"GL_ARB_compatibility\") || (profileMask & GL32.GL_CONTEXT_COMPATIBILITY_PROFILE_BIT) != 0) )");
writer.println("\t\t\tforwardCompatible = true;");
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-01-26 22:18:48 UTC (rev 3266)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java 2010-01-31 16:40:51 UTC (rev 3267)
@@ -117,6 +117,7 @@
writer.println("import org.lwjgl.LWJGLUtil;");
writer.println("import org.lwjgl.BufferUtils;");
writer.println("import java.util.Set;");
+ writer.println("import java.util.HashSet;");
writer.println("import java.nio.IntBuffer;");
writer.println();
ContextCapabilitiesGenerator.generateClassPrologue(writer, context_specific);
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorVisitor.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorVisitor.java 2010-01-26 22:18:48 UTC (rev 3266)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorVisitor.java 2010-01-31 16:40:51 UTC (rev 3267)
@@ -175,7 +175,8 @@
java_writer.println();
java_writer.println("import org.lwjgl.LWJGLException;");
java_writer.println("import org.lwjgl.BufferChecks;");
- java_writer.println("import org.lwjgl.NondirectBufferWrapper;");
+ // DISABLED: indirect buffer support
+ //java_writer.println("import org.lwjgl.NondirectBufferWrapper;");
java_writer.println("import java.nio.*;");
java_writer.println();
java_writer.print("public ");
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java 2010-01-26 22:18:48 UTC (rev 3266)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java 2010-01-31 16:40:51 UTC (rev 3267)
@@ -238,7 +238,8 @@
writer.println(");");
if (generate_error_checks && method.getAnnotation(NoErrorCheck.class) == null)
writer.println("\t\t" + type_map.getErrorCheckMethodName() + ";");
- printNondirectParameterCopies(writer, method, mode);
+ // DISABLED: indirect buffer support
+ //printNondirectParameterCopies(writer, method, mode);
if (has_result)
writer.println("\t\treturn " + Utils.RESULT_VAR_NAME + ";");
writer.println("\t}");
@@ -491,7 +492,7 @@
}
NullTerminated null_terminated = param.getAnnotation(NullTerminated.class);
if (Buffer.class.isAssignableFrom(java_type)) {
- boolean indirect_buffer_allowed = param.getAnnotation(CachedReference.class) == null;
+ boolean indirect_buffer_allowed = false && param.getAnnotation(CachedReference.class) == null; // DISABLED: indirect buffer support
boolean out_parameter = param.getAnnotation(OutParameter.class) != null;
TypeInfo typeinfo = typeinfos.get(param);
printParameterCheck(writer, param.getSimpleName(), typeinfo.getType().getSimpleName(), check_value, can_be_null, null_terminated, indirect_buffer_allowed, out_parameter);
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_seamless_cubemap_per_texture.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_seamless_cubemap_per_texture.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_seamless_cubemap_per_texture.java 2010-01-31 16:40:51 UTC (rev 3267)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2002-2008 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.opengl;
+
+public interface AMD_seamless_cubemap_per_texture {
+
+ /**
+ * Accepted by the <pname> parameter of TexParameterf, TexParameteri,
+ * TexParameterfv, TexParameteriv, GetTexParameterfv, and GetTexParameteriv:
+ */
+ int GL_TEXTURE_CUBE_MAP_SEAMLESS = ARB_seamless_cube_map.GL_TEXTURE_CUBE_MAP_SEAMLESS;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_shader_stencil_export.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_shader_stencil_export.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_shader_stencil_export.java 2010-01-31 16:40:51 UTC (rev 3267)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2002-2008 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.opengl;
+
+public interface AMD_shader_stencil_export {
+}
\ No newline at end of file
Deleted: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_tesselator.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_tesselator.java 2010-01-26 22:18:48 UTC (rev 3266)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_tesselator.java 2010-01-31 16:40:51 UTC (rev 3267)
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2002-2008 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.opengl;
-
-import org.lwjgl.util.generator.GLenum;
-
-public interface AMD_vertex_shader_tesselator {
-
- /** Returned by the <type> parameter of GetActiveUniform: */
- int GL_SAMPLER_BUFFER_AMD = 0x9001;
- int GL_INT_SAMPLER_BUFFER_AMD = 0x9002;
- int GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD = 0x9003;
-
- /** Accepted by TessellationModeAMD */
- int GL_DISCRETE_AMD = 0x9006;
- int GL_CONTINUOUS_AMD = 0x9007;
-
- /** Accepted by GetIntegerv */
- int GL_TESSELLATION_MODE_AMD = 0x9004;
-
- /** Accepted by GetFloatv */
- int GL_TESSELLATION_FACTOR_AMD = 0x9005;
-
- void glTessellationFactorAMD(float factor);
-
- void glTessellationModeAMD(@GLenum int mode);
-
-}
\ No newline at end of file
Copied: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_tessellator.java (from rev 3264, trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_tesselator.java)
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_tessellator.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_tessellator.java 2010-01-31 16:40:51 UTC (rev 3267)
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2002-2008 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.opengl;
+
+import org.lwjgl.util.generator.GLenum;
+
+public interface AMD_vertex_shader_tessellator {
+
+ /** Returned by the <type> parameter of GetActiveUniform: */
+ int GL_SAMPLER_BUFFER_AMD = 0x9001;
+ int GL_INT_SAMPLER_BUFFER_AMD = 0x9002;
+ int GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD = 0x9003;
+
+ /** Accepted by TessellationModeAMD */
+ int GL_DISCRETE_AMD = 0x9006;
+ int GL_CONTINUOUS_AMD = 0x9007;
+
+ /** Accepted by GetIntegerv */
+ int GL_TESSELLATION_MODE_AMD = 0x9004;
+
+ /** Accepted by GetFloatv */
+ int GL_TESSELLATION_FACTOR_AMD = 0x9005;
+
+ void glTessellationFactorAMD(float factor);
+
+ void glTessellationModeAMD(@GLenum int mode);
+
+}
\ No newline at end of file
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java 2010-01-26 22:18:48 UTC (rev 3266)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java 2010-01-31 16:40:51 UTC (rev 3267)
@@ -62,11 +62,17 @@
int GL_CLIP_DISTANCE3 = GL11.GL_CLIP_PLANE3;
int GL_CLIP_DISTANCE4 = GL11.GL_CLIP_PLANE4;
int GL_CLIP_DISTANCE5 = GL11.GL_CLIP_PLANE5;
+ int GL_CLIP_DISTANCE6 = 0x3006;
+ int GL_CLIP_DISTANCE7 = 0x3007;
int GL_MAX_CLIP_DISTANCES = GL11.GL_MAX_CLIP_PLANES;
int GL_MAX_VARYING_COMPONENTS = GL20.GL_MAX_VARYING_FLOATS;
+ int GL_BUFFER_ACCESS_FLAGS = 0x911F;
+ int GL_BUFFER_MAP_LENGTH = 0x9120;
+ int GL_BUFFER_MAP_OFFSET = 0x9121;
+
String glGetStringi(@GLenum int name, @GLuint int index);
@StripPostfix("value")
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java 2010-01-26 22:18:48 UTC (rev 3266)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java 2010-01-31 16:40:51 UTC (rev 3267)
@@ -44,6 +44,10 @@
// ----------------------[ OpenGL 3.2 ]----------------------
// ----------------------------------------------------------
+ int GL_CONTEXT_PROFILE_MASK = 0x9126;
+ int GL_CONTEXT_CORE_PROFILE_BIT = 0x00000001;
+ int GL_CONTEXT_COMPATIBILITY_PROFILE_BIT = 0x00000002;
+
int GL_MAX_VERTEX_OUTPUT_COMPONENTS = 0x9122;
int GL_MAX_GEOMETRY_INPUT_COMPONENTS = 0x9123;
int GL_MAX_GEOMETRY_OUTPUT_COMPONENTS = 0x9124;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-02-03 21:06:33
|
Revision: 3268
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3268&view=rev
Author: matzon
Date: 2010-02-03 21:03:32 +0000 (Wed, 03 Feb 2010)
Log Message:
-----------
prepare for 2.3
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-01-31 16:40:51 UTC (rev 3267)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2010-02-03 21:03:32 UTC (rev 3268)
@@ -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.2.2" />
+ <property name="lwjgl.version" value="2.3" />
<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/AMD*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.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-01-31 16:40:51 UTC (rev 3267)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2010-02-03 21:03:32 UTC (rev 3268)
@@ -54,7 +54,7 @@
private static final String JNI_LIBRARY_NAME = "lwjgl";
/** Current version of library */
- private static final String VERSION = "2.2.2";
+ private static final String VERSION = "2.3";
/** 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.
|
|
From: <ma...@us...> - 2010-03-08 21:29:43
|
Revision: 3278
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3278&view=rev
Author: matzon
Date: 2010-03-08 21:29:32 +0000 (Mon, 08 Mar 2010)
Log Message:
-----------
added new XRandR stuff
fixed credits doc a bit
Modified Paths:
--------------
trunk/LWJGL/doc/CREDITS
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
Added Paths:
-----------
trunk/LWJGL/src/java/org/lwjgl/opengl/XRandR.java
Modified: trunk/LWJGL/doc/CREDITS
===================================================================
--- trunk/LWJGL/doc/CREDITS 2010-02-21 21:27:35 UTC (rev 3277)
+++ trunk/LWJGL/doc/CREDITS 2010-03-08 21:29:32 UTC (rev 3278)
@@ -1,11 +1,8 @@
The following people have helped to make this project what it is today:
-active developers:
- Caspian Rychlik-Prince <cp...@sh...>
- Brian Matzon <br...@ma...>
- Elias Naur <eli...@gm...>
- Ioannis Tsakpinis <sp...@us...>
-
-contributors:
- Niels J\xF8rgensen <nj...@ni...>
- Tristan Campbell <tr...@ha...>
- Gregory Pierce <gre...@ya...>
@@ -16,6 +13,8 @@
- Kevin Glass <ke...@co...>
- Atsuya Takagi
- kappaOne
+ - Simon Felix
+ - Ryan McNally
additional credits goes to:
- Joseph I. Valenzuela [OpenAL stuff]
@@ -26,6 +25,7 @@
- OpenAL, Creative Labs - http://openal.org/
- jinput, Sun - https://jinput.dev.java.net/
- lzma, p7zip - http://p7zip.sourceforge.net/
+ - JOGL, Sun - http://kenai.com/projects/jogl/pages/Home
Please see the /doc/3rdparty/ directory for licenses.
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2010-02-21 21:27:35 UTC (rev 3277)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2010-03-08 21:29:32 UTC (rev 3278)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002-2008 LWJGL Project
+ * Copyright (c) 2002-2010 LWJGL Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -38,17 +38,15 @@
* @author elias_naur
*/
+import java.awt.Canvas;
import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
-import java.awt.Canvas;
-import java.awt.event.FocusListener;
-import java.awt.event.FocusEvent;
-
import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
import org.lwjgl.LWJGLUtil;
+import org.lwjgl.opengl.XRandR.Screen;
final class LinuxDisplay implements DisplayImplementation {
/* X11 constants */
@@ -113,6 +111,8 @@
/** Saved mode to restore with */
private DisplayMode saved_mode;
private DisplayMode current_mode;
+
+ private Screen[] savedXrandrConfig;
private boolean keyboard_grabbed;
private boolean pointer_grabbed;
@@ -522,7 +522,14 @@
public void resetDisplayMode() {
lockAWT();
try {
- switchDisplayMode(saved_mode);
+ if( current_displaymode_extension == XRANDR && savedXrandrConfig.length > 0 )
+ {
+ XRandR.setConfiguration( savedXrandrConfig );
+ }
+ else
+ {
+ switchDisplayMode(saved_mode);
+ }
if (isXF86VidModeSupported())
doSetGamma(saved_gamma);
} catch (LWJGLException e) {
@@ -608,6 +615,7 @@
throw new LWJGLException("No modes available");
switch (current_displaymode_extension) {
case XRANDR:
+ savedXrandrConfig = XRandR.getConfiguration();
saved_mode = getCurrentXRandrMode();
break;
case XF86VIDMODE:
@@ -880,7 +888,14 @@
if (current_window_mode == FULLSCREEN_NETWM) {
nIconifyWindow(getDisplay(), getWindow(), getDefaultScreen());
try {
- switchDisplayModeOnTmpDisplay(saved_mode);
+ if( current_displaymode_extension == XRANDR && savedXrandrConfig.length > 0 )
+ {
+ XRandR.setConfiguration( savedXrandrConfig );
+ }
+ else
+ {
+ switchDisplayModeOnTmpDisplay(saved_mode);
+ }
setGammaRampOnTmpDisplay(saved_gamma);
} catch (LWJGLException e) {
LWJGLUtil.log("Failed to restore saved mode: " + e.getMessage());
Added: trunk/LWJGL/src/java/org/lwjgl/opengl/XRandR.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/XRandR.java (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/XRandR.java 2010-03-08 21:29:32 UTC (rev 3278)
@@ -0,0 +1,250 @@
+/*
+ * 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.opengl;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+/**
+ * Utility for working with the xrandr commmand-line utility. Assumes
+ * xrandr v1.2 or higher.
+ *
+ * @author ryanm
+ */
+public class XRandR {
+
+ private static Screen[] current;
+
+ private static Map /* <String, Screen[]> */screens;
+
+ private static void populate() {
+ if (screens == null) {
+ screens = new HashMap/* <String, Screen[]> */();
+
+ // ProcessBuilder pb = new ProcessBuilder( "xrandr", "-q" );
+ // pb.redirectErrorStream();
+ try {
+ // Process p= pb.start();
+ Process p = Runtime.getRuntime().exec(new String[] { "xrandr", "-q"});
+
+ List/* <Screen> */currentList = new ArrayList/* <Screen> */();
+ List/* <Screen> */possibles = new ArrayList/* <Screen> */();
+ String name = null;
+
+ BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
+ String line;
+ while ((line = br.readLine()) != null) {
+ line = line.trim();
+ String[] sa = line.split("\\s+");
+
+ if (sa[1].equals("connected")) {
+ // found a new screen block
+ if (name != null) {
+ screens.put(name, possibles.toArray(new Screen[possibles.size()]));
+ possibles.clear();
+ }
+ name = sa[0];
+
+ // record the current config
+ currentList.add(new Screen(name, sa[2]));
+ } else if (Pattern.matches("\\d*x\\d*", sa[0])) {
+ // found a new mode line
+ possibles.add(new Screen(name, sa[0]));
+ }
+ }
+
+ screens.put(name, possibles.toArray(new Screen[possibles.size()]));
+
+ current = (Screen[]) currentList.toArray(new Screen[currentList.size()]);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ /**
+ * @return The current screen configuration, or an empty array if
+ * xrandr is not supported
+ */
+ public static Screen[] getConfiguration() {
+ populate();
+
+ return (Screen[]) current.clone();
+ }
+
+ /**
+ * @param screens
+ * The desired screen set, may not be <code>null</code>
+ */
+ public static void setConfiguration(Screen[]/* ... */screens) {
+ if (screens.length == 0) {
+ throw new IllegalArgumentException("Must specify at least one screen");
+ }
+
+ List/* <String> */cmd = new ArrayList/* <String> */();
+ cmd.add("xrandr");
+
+ // switch off those in the current set not in the new set
+ for (int i = 0; i < current.length; i++) {
+ boolean found = false;
+ for (int j = 0; j < screens.length; j++) {
+ if (screens[j].name.equals(current[i].name)) {
+ found = true;
+ break;
+ }
+ }
+
+ if (!found) {
+ cmd.add("--output");
+ cmd.add(current[i].name);
+ cmd.add("--off");
+ }
+ }
+
+ // set up new set
+ for (int i = 0; i < screens.length; i++) {
+ screens[i].getArgs(cmd);
+ }
+
+ try {
+ // ProcessBuilder pb = new ProcessBuilder( cmd );
+ // pb.redirectErrorStream();
+ // Process p = pb.start();
+ Process p = Runtime.getRuntime().exec((String[]) cmd.toArray(new String[cmd.size()]));
+ // no output is expected, but check anyway
+ BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
+ String line;
+ while ((line = br.readLine()) != null) {
+ System.out.println(line);
+ }
+ current = screens;
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ /**
+ * @return the name of connected screens, or an empty array if
+ * xrandr is not supported
+ */
+ public static String[] getScreenNames() {
+ populate();
+ return (String[]) screens.keySet().toArray(new String[screens.size()]);
+ }
+
+ /**
+ * @param name
+ * @return the possible resolutions of the named screen, or
+ * <code>null</code> if there is no such screen
+ */
+ public static Screen[] getResolutions(String name) {
+ populate();
+ // clone the array to prevent held copies being altered
+ return (Screen[]) ((Screen[]) screens.get(name)).clone();
+ }
+
+ /**
+ * Encapsulates the configuration of a monitor. Resolution is
+ * fixed, position is mutable
+ *
+ * @author ryanm
+ */
+ public static class Screen implements Cloneable {
+
+ /**
+ * Name for this output
+ */
+ public final String name;
+
+ /**
+ * Width in pixels
+ */
+ public final int width;
+
+ /**
+ * Height in pixels
+ */
+ public final int height;
+
+ /**
+ * Position on the x-axis, in pixels
+ */
+ public int xPos = 0;
+
+ /**
+ * Position on the y-axis, in pixels
+ */
+ public int yPos = 0;
+
+ /**
+ * @param name
+ * name of the screen
+ * @param conf
+ * config string, format either widthxheight or
+ * widthxheight+xPos+yPos
+ */
+ private Screen(String name, String conf) {
+ this.name = name;
+
+ String[] sa = conf.split("\\D");
+ width = Integer.parseInt(sa[0]);
+ height = Integer.parseInt(sa[1]);
+
+ if (sa.length > 2) {
+ xPos = Integer.parseInt(sa[2]);
+ yPos = Integer.parseInt(sa[3]);
+ }
+ }
+
+ private void getArgs(List/* <String> */argList) {
+ argList.add("--output");
+ argList.add(name);
+ argList.add("--mode");
+ argList.add(width + "x" + height);
+ argList.add("--pos");
+ argList.add(xPos + "x" + yPos);
+ }
+
+ // @Override
+ public String toString() {
+ return name + " " + width + "x" + height + " @ " + xPos + "x" + yPos;
+ }
+ }
+}
Property changes on: trunk/LWJGL/src/java/org/lwjgl/opengl/XRandR.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2010-03-14 00:20:01
|
Revision: 3286
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3286&view=rev
Author: spasi
Date: 2010-03-14 00:19:48 +0000 (Sun, 14 Mar 2010)
Log Message:
-----------
Added Charset encoding to StringUtils
Changed shader tests to use the String APIs
Finished ARB_uniform_buffer_object shader test
Fixed native code compiler warnings
Made the generator check file timestamps to avoid unnecessary 3+ min builds
Modified Paths:
--------------
trunk/LWJGL/platform_build/build-definitions.xml
trunk/LWJGL/src/java/org/lwjgl/opengl/StringUtils.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/Shader.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderFP.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderFSH.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderVP.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderVSH.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShadersTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/shaderUNI.vsh
trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorVisitor.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml 2010-03-13 00:45:44 UTC (rev 3285)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2010-03-14 00:19:48 UTC (rev 3286)
@@ -49,6 +49,7 @@
<include name="org/lwjgl/test/opengl/shaders/shaderFSH.vsh" />
<include name="org/lwjgl/test/opengl/shaders/shaderVP.vp" />
<include name="org/lwjgl/test/opengl/shaders/shaderVSH.vsh" />
+ <include name="org/lwjgl/test/opengl/shaders/shaderUNI.vsh" />
</fileset>
<!-- Files to include in the lwjgl_util.jar file -->
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/StringUtils.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/StringUtils.java 2010-03-13 00:45:44 UTC (rev 3285)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/StringUtils.java 2010-03-14 00:19:48 UTC (rev 3286)
@@ -34,7 +34,10 @@
import org.lwjgl.BufferUtils;
import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
import java.nio.IntBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
/** @author spasi */
final class StringUtils {
@@ -60,6 +63,14 @@
}
};
+ private static final ThreadLocal infiniteSeqTL = new ThreadLocal() {
+ protected Object initialValue() {
+ return new InfiniteCharSequence();
+ }
+ };
+
+ private static CharsetEncoder encoder = Charset.forName("US-ASCII").newEncoder();
+
private StringUtils() {
}
@@ -129,14 +140,17 @@
return lengths;
}
- /*
+ static InfiniteCharSequence getInfiniteSeq() {
+ return (InfiniteCharSequence)infiniteSeqTL.get();
+ }
+
+ /**
* Reads a byte string from the specified buffer.
*
* @param buffer
*
* @return the buffer as a String.
*/
-
static String getString(final ByteBuffer buffer) {
final int length = buffer.remaining();
final char[] charArray = getArray(length);
@@ -147,6 +161,12 @@
return new String(charArray, 0, length);
}
+ private static void encode(final ByteBuffer buffer, final CharSequence string) {
+ final InfiniteCharSequence infiniteSeq = getInfiniteSeq();
+ infiniteSeq.setString(string);
+ encoder.encode(infiniteSeq.buffer, buffer, true);
+ }
+
/**
* Returns a buffer containing the specified string as bytes.
*
@@ -157,8 +177,7 @@
static ByteBuffer getBuffer(final CharSequence string) {
final ByteBuffer buffer = getBuffer(string.length());
- for ( int i = 0; i < string.length(); i++ )
- buffer.put((byte)string.charAt(i));
+ encode(buffer, string);
buffer.flip();
return buffer;
@@ -174,8 +193,7 @@
static ByteBuffer getBufferOffset(final CharSequence string, final int offset) {
final ByteBuffer buffer = getBufferOffset(offset + string.length());
- for ( int i = 0; i < string.length(); i++ )
- buffer.put((byte)string.charAt(i));
+ encode(buffer, string);
buffer.flip();
return buffer;
@@ -191,14 +209,21 @@
static ByteBuffer getBufferNT(final CharSequence string) {
final ByteBuffer buffer = getBuffer(string.length() + 1);
- for ( int i = 0; i < string.length(); i++ )
- buffer.put((byte)string.charAt(i));
+ encode(buffer, string);
buffer.put((byte)0);
buffer.flip();
return buffer;
}
+ private static int getTotalLength(final CharSequence[] strings) {
+ int length = 0;
+ for ( int i = 0; i < strings.length; i++ )
+ length += strings[i].length();
+
+ return length;
+ }
+
/**
* Returns a buffer containing the specified strings as bytes.
*
@@ -207,17 +232,14 @@
* @return the Strings as a ByteBuffer
*/
static ByteBuffer getBuffer(final CharSequence[] strings) {
- int length = 0;
- for ( int i = 0; i < strings.length; i++ )
- length += strings[i].length();
+ final ByteBuffer buffer = getBuffer(getTotalLength(strings));
- final ByteBuffer buffer = getBuffer(length);
-
+ final InfiniteCharSequence infiniteSeq = getInfiniteSeq();
for ( int i = 0; i < strings.length; i++ ) {
- final CharSequence string = strings[i];
- for ( int j = 0; j < string.length(); j++ )
- buffer.put((byte)string.charAt(i));
+ infiniteSeq.setString(strings[i]);
+ encoder.encode(infiniteSeq.buffer, buffer, true);
}
+ infiniteSeq.clear();
buffer.flip();
return buffer;
@@ -231,18 +253,15 @@
* @return the Strings as a ByteBuffer
*/
static ByteBuffer getBufferNT(final CharSequence[] strings) {
- int length = 0;
- for ( int i = 0; i < strings.length; i++ )
- length += strings[i].length() + 1;
+ final ByteBuffer buffer = getBuffer(getTotalLength(strings) + strings.length);
- final ByteBuffer buffer = getBuffer(length);
-
+ final InfiniteCharSequence infiniteSeq = getInfiniteSeq();
for ( int i = 0; i < strings.length; i++ ) {
- final CharSequence string = strings[i];
- for ( int j = 0; j < string.length(); j++ )
- buffer.put((byte)string.charAt(i));
+ infiniteSeq.setString(strings[i]);
+ encoder.encode(infiniteSeq.buffer, buffer, true);
buffer.put((byte)0);
}
+ infiniteSeq.clear();
buffer.flip();
return buffer;
@@ -265,4 +284,41 @@
return buffer;
}
+ /**
+ * A mutable CharSequence with very large initial length. We can wrap this in a re-usable CharBuffer for decoding.
+ * We cannot subclass CharBuffer because of {@link CharBuffer#toString(int,int)}.
+ */
+ private static class InfiniteCharSequence implements CharSequence {
+
+ final CharBuffer buffer;
+
+ CharSequence string;
+
+ InfiniteCharSequence() {
+ buffer = CharBuffer.wrap(this);
+ }
+
+ void setString(final CharSequence string) {
+ this.string = string;
+ this.buffer.position(0);
+ this.buffer.limit(string.length());
+ }
+
+ void clear() {
+ this.string = null;
+ }
+
+ public int length() {
+ return Integer.MAX_VALUE;
+ }
+
+ public char charAt(final int index) {
+ return string.charAt(index);
+ }
+
+ public CharSequence subSequence(final int start, final int end) {
+ return string.subSequence(start, end);
+ }
+ }
+
}
\ No newline at end of file
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/Shader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/Shader.java 2010-03-13 00:45:44 UTC (rev 3285)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/Shader.java 2010-03-14 00:19:48 UTC (rev 3286)
@@ -1,31 +1,31 @@
-/*
+/*
* Copyright (c) 2002-2008 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
+ * modification, are permitted provided that the following conditions are
* met:
- *
- * * Redistributions of source code must retain the above copyright
+ *
+ * * 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
+ * * 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
+ * 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
+ * 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.
*/
@@ -73,8 +73,8 @@
return int_buffer.get(0);
}
- protected static ByteBuffer getShaderText(String file) {
- ByteBuffer shader = null;
+ protected static String getShaderText(String file) {
+ String shader = null;
try {
ClassLoader loader = ShadersTest.class.getClassLoader();
@@ -93,10 +93,10 @@
fileBuffer.flip();
- shader = BufferUtils.createByteBuffer(fileBuffer.limit());
- shader.put(fileBuffer);
+ byte[] array = new byte[fileBuffer.remaining()];
+ fileBuffer.get(array);
+ shader = new String(array);
- shader.clear();
fileBuffer.clear();
} catch (IOException e) {
ShadersTest.kill("Failed to read the shader source file: " + file, e);
@@ -105,17 +105,13 @@
return shader;
}
- protected static void checkProgramError(String programFile, ByteBuffer programSource) {
+ protected static void checkProgramError(String programFile, String programSource) {
if ( GL11.glGetError() == GL11.GL_INVALID_OPERATION ) {
- programSource.clear();
- final byte[] bytes = new byte[programSource.capacity()];
- programSource.get(bytes);
-
final int errorPos = glGetInteger(ARBProgram.GL_PROGRAM_ERROR_POSITION_ARB);
int lineStart = 0;
int lineEnd = -1;
- for ( int i = 0; i < bytes.length; i++ ) {
- if ( bytes[i] == '\n' ) {
+ for ( int i = 0; i < programSource.length(); i++ ) {
+ if ( programSource.charAt(i) == '\n' ) {
if ( i <= errorPos ) {
lineStart = i + 1;
} else {
@@ -126,29 +122,17 @@
}
if ( lineEnd == -1 )
- lineEnd = bytes.length;
+ lineEnd = programSource.length();
ShadersTest.kill("Low-level program error in file: " + programFile
- + "\n\tError line: " + new String(bytes, lineStart, lineEnd - lineStart)
+ + "\n\tError line: " + programSource.substring(lineStart, lineEnd)
+ "\n\tError message: " + GL11.glGetString(ARBProgram.GL_PROGRAM_ERROR_STRING_ARB));
}
}
protected static int getUniformLocation(int ID, String name) {
- fileBuffer.clear();
+ final int location = ARBShaderObjects.glGetUniformLocationARB(ID, name);
- int length = name.length();
-
- char[] charArray = new char[length];
- name.getChars(0, length, charArray, 0);
-
- for ( int i = 0; i < length; i++ )
- fileBuffer.put((byte)charArray[i]);
- fileBuffer.put((byte)0); // Must be null-terminated.
- fileBuffer.flip();
-
- final int location = ARBShaderObjects.glGetUniformLocationARB(ID, fileBuffer);
-
if ( location == -1 )
throw new IllegalArgumentException("The uniform \"" + name + "\" does not exist in the Shader Program.");
@@ -159,42 +143,25 @@
ARBShaderObjects.glGetObjectParameterARB(ID, ARBShaderObjects.GL_OBJECT_INFO_LOG_LENGTH_ARB, programBuffer);
final int logLength = programBuffer.get(0);
-
if ( logLength <= 1 )
return;
- final ByteBuffer log = BufferUtils.createByteBuffer(logLength);
-
- ARBShaderObjects.glGetInfoLogARB(ID, null, log);
-
- final char[] charArray = new char[logLength];
- for ( int i = 0; i < logLength; i++ )
- charArray[i] = (char)log.get();
-
System.out.println("\nInfo Log of Shader Object: " + file);
System.out.println("--------------------------");
- System.out.println(new String(charArray, 0, logLength));
+ System.out.println(ARBShaderObjects.glGetInfoLogARB(ID, logLength));
+
}
protected static void printShaderProgramInfoLog(int ID) {
ARBShaderObjects.glGetObjectParameterARB(ID, ARBShaderObjects.GL_OBJECT_INFO_LOG_LENGTH_ARB, programBuffer);
final int logLength = programBuffer.get(0);
-
if ( logLength <= 1 )
return;
- final ByteBuffer log = BufferUtils.createByteBuffer(logLength);
-
- ARBShaderObjects.glGetInfoLogARB(ID, null, log);
-
- final char[] charArray = new char[logLength];
- for ( int i = 0; i < logLength; i++ )
- charArray[i] = (char)log.get();
-
System.out.println("\nShader Program Info Log: ");
System.out.println("--------------------------");
- System.out.println(new String(charArray, 0, logLength));
+ System.out.println(ARBShaderObjects.glGetInfoLogARB(ID, logLength));
}
}
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderFP.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderFP.java 2010-03-13 00:45:44 UTC (rev 3285)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderFP.java 2010-03-14 00:19:48 UTC (rev 3286)
@@ -1,31 +1,31 @@
-/*
+/*
* Copyright (c) 2002-2008 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
+ * modification, are permitted provided that the following conditions are
* met:
- *
- * * Redistributions of source code must retain the above copyright
+ *
+ * * 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
+ * * 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
+ * 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
+ * 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.
*/
@@ -38,8 +38,6 @@
package org.lwjgl.test.opengl.shaders;
-import java.nio.ByteBuffer;
-
import org.lwjgl.opengl.ARBFragmentProgram;
import org.lwjgl.opengl.ARBProgram;
import org.lwjgl.opengl.ARBVertexProgram;
@@ -48,12 +46,12 @@
final class ShaderFP extends Shader {
final String vpFile;
- final ByteBuffer vpSource;
+ final String vpSource;
final int vpID;
final String fpFile;
- final ByteBuffer fpSource;
+ final String fpSource;
final int fpID;
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderFSH.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderFSH.java 2010-03-13 00:45:44 UTC (rev 3285)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderFSH.java 2010-03-14 00:19:48 UTC (rev 3286)
@@ -1,31 +1,31 @@
-/*
+/*
* Copyright (c) 2002-2008 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
+ * modification, are permitted provided that the following conditions are
* met:
- *
- * * Redistributions of source code must retain the above copyright
+ *
+ * * 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
+ * * 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
+ * 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
+ * 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.
*/
@@ -38,8 +38,6 @@
package org.lwjgl.test.opengl.shaders;
-import java.nio.ByteBuffer;
-
import org.lwjgl.opengl.ARBFragmentShader;
import org.lwjgl.opengl.ARBShaderObjects;
import org.lwjgl.opengl.ARBVertexShader;
@@ -48,12 +46,12 @@
final class ShaderFSH extends Shader {
final String vshFile;
- final ByteBuffer vshSource;
+ final String vshSource;
final int vshID;
final String fshFile;
- final ByteBuffer fshSource;
+ final String fshSource;
final int fshID;
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java 2010-03-13 00:45:44 UTC (rev 3285)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java 2010-03-14 00:19:48 UTC (rev 3286)
@@ -38,24 +38,28 @@
package org.lwjgl.test.opengl.shaders;
import org.lwjgl.BufferUtils;
-import org.lwjgl.opengl.ARBUniformBufferObject;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL20;
+import org.lwjgl.opengl.*;
-import java.nio.ByteBuffer;
+import java.nio.FloatBuffer;
import java.nio.IntBuffer;
final class ShaderUNI extends Shader {
final String file;
- final ByteBuffer source;
+ final String source;
final int shaderID;
final int programID;
- final int uniformA;
- final int uniformB;
+ final int bufferID;
+ final FloatBuffer buffer;
+ final int uniformA_index;
+ final int uniformA_offset;
+
+ final int uniformB_index;
+ final int uniformB_offset;
+
ShaderUNI(final String shaderFile) {
file = shaderFile;
source = getShaderText(shaderFile);
@@ -81,39 +85,74 @@
if ( programBuffer.get(0) == GL11.GL_FALSE )
ShadersTest.kill("A linking error occured in a shader program.");
- uniformA = getUniformLocation(programID, "uniformA");
- uniformB = getUniformLocation(programID, "uniformB");
+ final String[] uniformNames = { "uniformA", "uniformB" };
- String[] uniformNames = { "uniformA", "uniformB" };
- IntBuffer tmp = BufferUtils.createIntBuffer(uniformNames.length);
+ IntBuffer indexes = BufferUtils.createIntBuffer(uniformNames.length);
+ IntBuffer params = BufferUtils.createIntBuffer(uniformNames.length);
+ IntBuffer getBuffer = BufferUtils.createIntBuffer(16);
+ IntBuffer buffers = BufferUtils.createIntBuffer(1);
- ARBUniformBufferObject.glGetUniformIndices(programID, toByteBuffer(uniformNames), tmp);
+ // Get uniform block index and data size
+ final int blockIndex = ARBUniformBufferObject.glGetUniformBlockIndex(programID, "test");
+ ARBUniformBufferObject.glGetActiveUniformBlock(programID, blockIndex, ARBUniformBufferObject.GL_UNIFORM_BLOCK_DATA_SIZE, getBuffer);
+ final int blockSize = getBuffer.get(0);
- System.out.println("uniformA index = " + tmp.get(0));
- System.out.println("uniformB index = " + tmp.get(1));
- }
+ System.out.println("blockSize = " + blockSize);
- private static ByteBuffer toByteBuffer(String[] strs) {
- int length = 0;
- for ( int i = 0; i < strs.length; i++ )
- length += strs[i].length() + 1; // +1 for the NULL-character
+ // Create uniform buffer object and allocate a ByteBuffer
+ GL15.glGenBuffers(buffers);
+ bufferID = buffers.get(0);
+ GL15.glBindBuffer(ARBUniformBufferObject.GL_UNIFORM_BUFFER, bufferID);
+ GL15.glBufferData(ARBUniformBufferObject.GL_UNIFORM_BUFFER, blockSize, GL15.GL_DYNAMIC_DRAW);
+ buffer = BufferUtils.createFloatBuffer(blockSize);
- final ByteBuffer buff = BufferUtils.createByteBuffer(length);
- for ( int i = 0; i < strs.length; i++ ) {
- buff.put(strs[i].getBytes());
- buff.put((byte)0); // The ending NULL-character
- }
- buff.flip();
+ // Attach UBO and associate uniform block to binding point 0
+ ARBUniformBufferObject.glBindBufferBase(ARBUniformBufferObject.GL_UNIFORM_BUFFER, 0, bufferID);
+ ARBUniformBufferObject.glUniformBlockBinding(programID, blockIndex, 0);
- return buff;
+ // Get uniform information
+ ARBUniformBufferObject.glGetUniformIndices(programID, uniformNames, indexes);
+ uniformA_index = indexes.get(0);
+ uniformB_index = indexes.get(1);
+
+ ARBUniformBufferObject.glGetActiveUniforms(programID, indexes, ARBUniformBufferObject.GL_UNIFORM_OFFSET, params);
+ uniformA_offset = params.get(0);
+ uniformB_offset = params.get(1);
+
+ System.out.println("\nuniformA index = " + uniformA_index);
+ System.out.println("uniformB index = " + uniformB_index);
+
+ System.out.println("\nuniformA offset = " + uniformA_offset + " - should be 0 for std140");
+ System.out.println("uniformB offset = " + uniformB_offset + " - should be 16 for std140");
+
+ Util.checkGLError();
}
void render() {
GL20.glUseProgram(programID);
- GL20.glUniform2f(uniformA, ShadersTest.getSin(), ShadersTest.getSpecularity() * 8.0f);
- GL20.glUniform3f(uniformB, 0.0f, 0.7f, 0.0f);
+ //* -- std140 layout
+ // Uniform A
+ buffer.put(0, ShadersTest.getSin()).put(1, ShadersTest.getSpecularity() * 8.0f);
+ // Uniform B - str140 alignment at 16 bytes
+ buffer.put(4, 0.0f).put(5, 0.7f).put(6, 0.0f);
+ GL15.glBindBuffer(ARBUniformBufferObject.GL_UNIFORM_BUFFER, bufferID);
+ GL15.glBufferData(ARBUniformBufferObject.GL_UNIFORM_BUFFER, buffer, GL15.GL_DYNAMIC_DRAW);
+ //*/
+
+ /* -- non-std140 layout
+ // Uniform A
+ buffer.put(ShadersTest.getSin()).put(ShadersTest.getSpecularity() * 8.0f);
+ buffer.flip();
+ GL15.glBufferSubData(ARBUniformBufferObject.GL_UNIFORM_BUFFER, uniformA_offset, buffer);
+ // Uniform B
+ buffer.clear();
+ buffer.put(0.0f).put(0.7f).put(0.0f);
+ buffer.flip();
+ GL15.glBufferSubData(ARBUniformBufferObject.GL_UNIFORM_BUFFER, uniformB_offset, buffer);
+ //*/
+
ShadersTest.renderObject();
GL20.glUseProgram(0);
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderVP.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderVP.java 2010-03-13 00:45:44 UTC (rev 3285)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderVP.java 2010-03-14 00:19:48 UTC (rev 3286)
@@ -1,31 +1,31 @@
-/*
+/*
* Copyright (c) 2002-2008 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
+ * modification, are permitted provided that the following conditions are
* met:
- *
- * * Redistributions of source code must retain the above copyright
+ *
+ * * 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
+ * * 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
+ * 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
+ * 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.
*/
@@ -38,8 +38,6 @@
package org.lwjgl.test.opengl.shaders;
-import java.nio.ByteBuffer;
-
import org.lwjgl.opengl.ARBProgram;
import org.lwjgl.opengl.ARBVertexProgram;
import org.lwjgl.opengl.GL11;
@@ -47,7 +45,7 @@
final class ShaderVP extends Shader {
final String file;
- final ByteBuffer source;
+ final String source;
final int ID;
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderVSH.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderVSH.java 2010-03-13 00:45:44 UTC (rev 3285)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderVSH.java 2010-03-14 00:19:48 UTC (rev 3286)
@@ -1,31 +1,31 @@
-/*
+/*
* Copyright (c) 2002-2008 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
+ * modification, are permitted provided that the following conditions are
* met:
- *
- * * Redistributions of source code must retain the above copyright
+ *
+ * * 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
+ * * 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 ...
[truncated message content] |
|
From: <ma...@us...> - 2010-03-17 18:58:25
|
Revision: 3291
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3291&view=rev
Author: matzon
Date: 2010-03-17 18:58:18 +0000 (Wed, 17 Mar 2010)
Log Message:
-----------
2.4 release
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-03-17 18:55:59 UTC (rev 3290)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2010-03-17 18:58:18 UTC (rev 3291)
@@ -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.3" />
+ <property name="lwjgl.version" value="2.4" />
<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/AMD*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.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-03-17 18:55:59 UTC (rev 3290)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2010-03-17 18:58:18 UTC (rev 3291)
@@ -54,7 +54,7 @@
private static final String JNI_LIBRARY_NAME = "lwjgl";
/** Current version of library */
- private static final String VERSION = "2.3";
+ private static final String VERSION = "2.4";
/** 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.
|
|
From: <sp...@us...> - 2010-03-27 01:12:12
|
Revision: 3296
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3296&view=rev
Author: spasi
Date: 2010-03-27 01:12:05 +0000 (Sat, 27 Mar 2010)
Log Message:
-----------
Added support for APPLE extensions.
Modified Paths:
--------------
trunk/LWJGL/platform_build/build-definitions.xml
trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_element_array.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_aux_depth_stencil.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_client_storage.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_element_array.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_fence.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_float_pixels.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_flush_buffer_range.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_packed_pixels.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_rgb_422.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_row_bytes.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_texture_range.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_vertex_array_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_vertex_array_range.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_vertex_program_evaluators.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_ycbcr_422.java
Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml 2010-03-26 19:52:40 UTC (rev 3295)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2010-03-27 01:12:05 UTC (rev 3296)
@@ -14,7 +14,7 @@
<property name="lwjgl.res" location="res" />
<property name="lwjgl.version" value="2.4" />
- <property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/AMD*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.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"/>
+ <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/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java,org/lwjgl/opengl/GREMEDY*.java"/>
<!-- ================================================================== -->
<!-- Filesets used for targets -->
<!-- ================================================================== -->
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_aux_depth_stencil.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_aux_depth_stencil.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_aux_depth_stencil.java 2010-03-27 01:12:05 UTC (rev 3296)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2002-2008 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.opengl;
+
+public interface APPLE_aux_depth_stencil {
+
+ /** Accepted by the <pname> parameter of GetIntegerv. */
+ int GL_AUX_DEPTH_STENCIL_APPLE = 0x8A14;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_client_storage.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_client_storage.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_client_storage.java 2010-03-27 01:12:05 UTC (rev 3296)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2002-2008 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.opengl;
+
+public interface APPLE_client_storage {
+
+ /** Accepted by the <pname> parameters of PixelStore: */
+ int GL_UNPACK_CLIENT_STORAGE_APPLE = 0x85B2;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_element_array.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_element_array.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_element_array.java 2010-03-27 01:12:05 UTC (rev 3296)
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2002-2008 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.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.Buffer;
+import java.nio.IntBuffer;
+
+public interface APPLE_element_array {
+
+ /**
+ * Accepted by the <array> parameter of EnableClientState and
+ * DisableClientState and the <value> parameter of IsEnabled:
+ */
+ int GL_ELEMENT_ARRAY_APPLE = 0x8768;
+
+ /**
+ * Accepted by the <value> parameter of GetBooleanv, GetIntegerv,
+ * GetFloatv, and GetDoublev:
+ */
+ int GL_ELEMENT_ARRAY_TYPE_APPLE = 0x8769;
+
+ /** Accepted by the <pname> parameter of GetPointerv: */
+ int GL_ELEMENT_ARRAY_POINTER_APPLE = 0x876A;
+
+ void glElementPointerAPPLE(@AutoType("pointer") @GLenum int type,
+ @Check
+ @Const
+ @GLubyte
+ @GLushort
+ @GLuint Buffer pointer);
+
+ void glDrawElementArrayAPPLE(@GLenum int mode, int first, @GLsizei int count);
+
+ void glDrawRangeElementArrayAPPLE(@GLenum int mode, @GLuint int start, @GLuint int end, int first, @GLsizei int count);
+
+ void glMultiDrawElementArrayAPPLE(@GLenum int mode,
+ @Const IntBuffer first,
+ @Const @Check("first.remaining()") @GLsizei IntBuffer count,
+ @AutoSize("first") @GLsizei int primcount);
+
+ void glMultiDrawRangeElementArrayAPPLE(@GLenum int mode, @GLuint int start, @GLuint int end,
+ @Const IntBuffer first,
+ @Const @Check("first.remaining()") @GLsizei IntBuffer count,
+ @AutoSize("first") @GLsizei int primcount);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_fence.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_fence.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_fence.java 2010-03-27 01:12:05 UTC (rev 3296)
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2002-2008 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.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.IntBuffer;
+
+public interface APPLE_fence {
+
+ /** Accepted by the <object> parameter of TestObjectAPPLE and FinishObjectAPPLE: */
+ int GL_DRAW_PIXELS_APPLE = 0x8A0A;
+ int GL_FENCE_APPLE = 0x8A0B;
+
+ void glGenFencesAPPLE(@AutoSize("fences") @GLsizei int n, @OutParameter @GLuint IntBuffer fences);
+
+ @Alternate("glGenFencesAPPLE")
+ @GLreturn("fences")
+ void glGenFencesAPPLE2(@Constant("1") @GLsizei int n, @OutParameter @GLuint IntBuffer fences);
+
+ void glDeleteFencesAPPLE(@AutoSize("fences") @GLsizei int n, @Const @GLuint IntBuffer fences);
+
+ @Alternate("glDeleteFencesAPPLE")
+ void glDeleteFencesAPPLE(@Constant("1") @GLsizei int n, @Const @GLuint @Constant(value = "APIUtils.getBufferInt().put(0, fence), 0", keepParam = true) int fence);
+
+ void glSetFenceAPPLE(@GLuint int fence);
+
+ boolean glIsFenceAPPLE(@GLuint int fence);
+
+ boolean glTestFenceAPPLE(@GLuint int fence);
+
+ void glFinishFenceAPPLE(@GLuint int fence);
+
+ boolean glTestObjectAPPLE(@GLenum int object, @GLuint int name);
+
+ void glFinishObjectAPPLE(@GLenum int object, int name);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_float_pixels.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_float_pixels.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_float_pixels.java 2010-03-27 01:12:05 UTC (rev 3296)
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2002-2008 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.opengl;
+
+public interface APPLE_float_pixels {
+
+ /**
+ * Accepted by the parameters of DrawPixels, ReadPixels, TexImage1D,
+ * TexImage2D, TexImage3D, TexSubImage1D, TexSubImage2D, TexSubImage3D, and
+ * GetTexImage:
+ */
+ int GL_HALF_APPLE = 0x140B;
+
+ /** Accepted by the GetBooleanv: */
+ int GL_COLOR_FLOAT_APPLE = 0x8A0F;
+
+ /**
+ * Accepted by the parameter of TexImage1D,
+ * TexImage2D, and TexImage3D:
+ */
+ int GL_RGBA_FLOAT32_APPLE = 0x8814;
+ int GL_RGB_FLOAT32_APPLE = 0x8815;
+ int GL_ALPHA_FLOAT32_APPLE = 0x8816;
+ int GL_INTENSITY_FLOAT32_APPLE = 0x8817;
+ int GL_LUMINANCE_FLOAT32_APPLE = 0x8818;
+ int GL_LUMINANCE_ALPHA_FLOAT32_APPLE = 0x8819;
+ int GL_RGBA_FLOAT16_APPLE = 0x881A;
+ int GL_RGB_FLOAT16_APPLE = 0x881B;
+ int GL_ALPHA_FLOAT16_APPLE = 0x881C;
+ int GL_INTENSITY_FLOAT16_APPLE = 0x881D;
+ int GL_LUMINANCE_FLOAT16_APPLE = 0x881E;
+ int GL_LUMINANCE_ALPHA_FLOAT16_APPLE = 0x881F;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_flush_buffer_range.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_flush_buffer_range.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_flush_buffer_range.java 2010-03-27 01:12:05 UTC (rev 3296)
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2002-2008 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.opengl;
+
+import org.lwjgl.util.generator.GLenum;
+import org.lwjgl.util.generator.GLintptr;
+import org.lwjgl.util.generator.GLsizeiptr;
+
+public interface APPLE_flush_buffer_range {
+
+ /**
+ * Accepted by the <pname> parameter of BufferParameteriAPPLE and
+ * GetBufferParameteriv:
+ */
+ int GL_BUFFER_SERIALIZED_MODIFY_APPLE = 0x8A12;
+ int GL_BUFFER_FLUSHING_UNMAP_APPLE = 0x8A13;
+
+ void glBufferParameteriAPPLE(@GLenum int target, @GLenum int pname, int param);
+
+ void glFlushMappedBufferRangeAPPLE(@GLenum int target, @GLintptr long offset, @GLsizeiptr long size);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java 2010-03-27 01:12:05 UTC (rev 3296)
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2002-2008 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.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.IntBuffer;
+
+public interface APPLE_object_purgeable {
+
+ /**
+ * Accepted by the <option> parameter of ObjectPurgeable, and returned
+ * by ObjectPurgeable:
+ */
+ int GL_RELEASED_APPLE = 0x8A19;
+ int GL_VOLATILE_APPLE = 0x8A1A;
+
+ /**
+ * Accepted by the <option> parameters of ObjectUnpurgeable, and
+ * returned by ObjectUnpurgeable:
+ */
+ int GL_RETAINED_APPLE = 0x8A1B;
+ int GL_UNDEFINED_APPLE = 0x8A1C;
+
+ /** Accepted by the <pname> parameters of GetObjectParameteriv: */
+ int GL_PURGEABLE_APPLE = 0x8A1D;
+
+ /**
+ * Accepted by the <objectType> parameters of ObjectPurgeableAPPLE,
+ * ObjectUnpurgeableAPPLE and GetObjectParameteriv:
+ */
+ int GL_BUFFER_OBJECT_APPLE = 0x85B3;
+
+ @GLenum
+ int glObjectPurgeableAPPLE(@GLenum int objectType, @GLuint int name, @GLenum int option);
+
+ @GLenum
+ int glObjectUnpurgeableAPPLE(@GLenum int objectType, @GLuint int name, @GLenum int option);
+
+ @StripPostfix("params")
+ void glGetObjectParameterivAPPLE(@GLenum int objectType, @GLuint int name, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
+
+ @Alternate("glGetObjectParameterivAPPLE")
+ @GLreturn("params")
+ @StripPostfix("params")
+ void glGetObjectParameterivAPPLE2(@GLenum int objectType, @GLuint int name, @GLenum int pname, @OutParameter IntBuffer params);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_packed_pixels.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_packed_pixels.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_packed_pixels.java 2010-03-27 01:12:05 UTC (rev 3296)
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2002-2008 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.opengl;
+
+public interface APPLE_packed_pixels {
+
+ /**
+ * Accepted by the <type> parameter of DrawPixels, ReadPixels, TexImage1D,
+ * TexImage2D, GetTexImage, TexImage3D, TexSubImage1D,
+ * TexSubImage2D, TexSubImage3D, GetHistogram, GetMinmax,
+ * ConvolutionFilter1D, ConvolutionFilter2D, ConvolutionFilter3D,
+ * GetConvolutionFilter, SeparableFilter2D, SeparableFilter3D,
+ * GetSeparableFilter, ColorTable, GetColorTable, TexImage4DSGIS,
+ * and TexSubImage4DSGIS:
+ */
+ int GL_UNSIGNED_BYTE_3_3_2 = 0x8032;
+ int GL_UNSIGNED_BYTE_2_3_3_REV = 0x8362;
+ int GL_UNSIGNED_SHORT_5_6_5 = 0x8363;
+ int GL_UNSIGNED_SHORT_5_6_5_REV = 0x8364;
+ int GL_UNSIGNED_SHORT_4_4_4_4 = 0x8033;
+ int GL_UNSIGNED_SHORT_4_4_4_4_REV = 0x8365;
+ int GL_UNSIGNED_SHORT_5_5_5_1 = 0x8034;
+ int GL_UNSIGNED_SHORT_1_5_5_5_REV = 0x8366;
+ int GL_UNSIGNED_INT_8_8_8_8 = 0x8035;
+ int GL_UNSIGNED_INT_8_8_8_8_REV = 0x8367;
+ int GL_UNSIGNED_INT_10_10_10_2 = 0x8036;
+ int GL_UNSIGNED_INT_2_10_10_10_REV = 0x8368;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_rgb_422.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_rgb_422.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_rgb_422.java 2010-03-27 01:12:05 UTC (rev 3296)
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2002-2008 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.opengl;
+
+public interface APPLE_rgb_422 {
+
+ /**
+ * Accepted by the <format> parameter of DrawPixels, ReadPixels, TexImage1D,
+ * TexImage2D, GetTexImage, TexImage3D, TexSubImage1D, TexSubImage2D,
+ * TexSubImage3D, GetHistogram, GetMinmax, ConvolutionFilter1D,
+ * ConvolutionFilter2D, GetConvolutionFilter, SeparableFilter2D,
+ * GetSeparableFilter, ColorTable, GetColorTable:
+ */
+ int GL_RGB_422_APPLE = 0x8A1F;
+
+ /**
+ * Accepted by the <type> parameter of DrawPixels, ReadPixels, TexImage1D,
+ * TexImage2D, GetTexImage, TexImage3D, TexSubImage1D, TexSubImage2D,
+ * TexSubImage3D, GetHistogram, GetMinmax, ConvolutionFilter1D,
+ * ConvolutionFilter2D, GetConvolutionFilter, SeparableFilter2D,
+ * GetSeparableFilter, ColorTable, GetColorTable:
+ */
+ int GL_UNSIGNED_SHORT_8_8_APPLE = 0x85BA;
+ int GL_UNSIGNED_SHORT_8_8_REV_APPLE = 0x85BB;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_row_bytes.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_row_bytes.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_row_bytes.java 2010-03-27 01:12:05 UTC (rev 3296)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2002-2008 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 PROVIDE...
[truncated message content] |
|
From: <sp...@us...> - 2010-03-31 15:46:30
|
Revision: 3299
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3299&view=rev
Author: spasi
Date: 2010-03-31 15:46:16 +0000 (Wed, 31 Mar 2010)
Log Message:
-----------
Added support for NVX_gpu_memory_info (experimental extension).
Added support for initializing extensions that are not exposed in GL_EXTENSIONS (enables EXT_direct_state_access and NV_primitive_restart on AMD GPUs, use at your own risk).
Updated @Optional functions for AMD GPUs (driver version: 10.3)
Modified Paths:
--------------
trunk/LWJGL/platform_build/build-definitions.xml
trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorVisitor.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_half_float.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_primitive_restart.java
Added Paths:
-----------
trunk/LWJGL/src/java/org/lwjgl/util/generator/ForceInit.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_texture_env_combine3.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NVX_gpu_memory_info.java
Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml 2010-03-28 23:11:17 UTC (rev 3298)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2010-03-31 15:46:16 UTC (rev 3299)
@@ -14,7 +14,7 @@
<property name="lwjgl.res" location="res" />
<property name="lwjgl.version" value="2.4" />
- <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/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java,org/lwjgl/opengl/GREMEDY*.java"/>
+ <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"/>
<!-- ================================================================== -->
<!-- Filesets used for targets -->
<!-- ================================================================== -->
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java 2010-03-28 23:11:17 UTC (rev 3298)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java 2010-03-31 15:46:16 UTC (rev 3299)
@@ -164,6 +164,8 @@
public static void generateInitStubs(PrintWriter writer, InterfaceDeclaration d, boolean context_specific) {
if ( d.getMethods().size() > 0 ) {
if ( context_specific ) {
+ if ( d.getAnnotation(ForceInit.class) != null )
+ writer.println("\t\t" + CACHED_EXTS_VAR_NAME + ".add(\"" + translateFieldName(d.getSimpleName()) + "\");");
writer.print("\t\tif (" + CACHED_EXTS_VAR_NAME + ".contains(\"");
writer.print(translateFieldName(d.getSimpleName()) + "\")");
writer.print(" && !" + getAddressesInitializerName(d.getSimpleName()) + "(");
@@ -218,7 +220,7 @@
continue;
if ( !first )
- writer.println(" &&");
+ writer.println(" &");
else
first = false;
Added: trunk/LWJGL/src/java/org/lwjgl/util/generator/ForceInit.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/ForceInit.java (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/ForceInit.java 2010-03-31 15:46:16 UTC (rev 3299)
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2002-2008 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.util.generator;
+
+/**
+ * Extensions marked with ForceInit will be initialized by LWJGL even if not exposed in the GL_EXTENSIONS string.
+ *
+ * @author spasi
+ */
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@Target({ ElementType.TYPE })
+public @interface ForceInit {
+}
\ No newline at end of file
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorVisitor.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorVisitor.java 2010-03-28 23:11:17 UTC (rev 3298)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorVisitor.java 2010-03-31 15:46:16 UTC (rev 3299)
@@ -186,6 +186,7 @@
//java_writer.println("import org.lwjgl.NondirectBufferWrapper;");
java_writer.println("import java.nio.*;");
java_writer.println();
+ Utils.printDocComment(java_writer, d);
java_writer.print("public ");
boolean is_final = Utils.isFinal(d);
if (is_final)
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java 2010-03-28 23:11:17 UTC (rev 3298)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java 2010-03-31 15:46:16 UTC (rev 3299)
@@ -149,11 +149,12 @@
public static void printDocComment(PrintWriter writer, Declaration decl) {
String doc_comment = decl.getDocComment();
if (doc_comment != null) {
- writer.println("\t/**");
+ String tab = decl instanceof InterfaceDeclaration ? "" : "\t";
+ writer.println(tab + "/**");
StringTokenizer doc_lines = new StringTokenizer(doc_comment, "\n");
while (doc_lines.hasMoreTokens())
- writer.println("\t *" + doc_lines.nextToken());
- writer.println("\t */");
+ writer.println(tab + " * " + doc_lines.nextToken());
+ writer.println(tab + " */");
} else if ( (decl instanceof MethodDeclaration) && decl.getAnnotation(Alternate.class) != null )
writer.println("\t/** Overloads " + decl.getAnnotation(Alternate.class).value() + " */");
}
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_texture_env_combine3.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_texture_env_combine3.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_texture_env_combine3.java 2010-03-31 15:46:16 UTC (rev 3299)
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2002-2008 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.opengl;
+
+public interface ATI_texture_env_combine3 {
+
+ /**
+ * Accepted by the <params> parameter of TexEnvf, TexEnvi, TexEnvfv,
+ * and TexEnviv when the <pname> parameter value is COMBINE_RGB_ARB
+ * or COMBINE_ALPHA_ARB
+ */
+ int GL_MODULATE_ADD_ATI = 0x8744;
+ int GL_MODULATE_SIGNED_ADD_ATI = 0x8745;
+ int GL_MODULATE_SUBTRACT_ATI = 0x8746;
+
+}
\ No newline at end of file
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java 2010-03-28 23:11:17 UTC (rev 3298)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java 2010-03-31 15:46:16 UTC (rev 3299)
@@ -35,6 +35,7 @@
import java.nio.*;
+@ForceInit
@Dependent
@DeprecatedGL
public interface EXT_direct_state_access {
@@ -518,9 +519,11 @@
value parameters
*/
+ @Optional(reason = "AMD does not expose this (last driver checked: 10.3)")
@Dependent("OpenGL30")
void glEnableClientStateiEXT(@GLenum int array, @GLuint int index);
+ @Optional(reason = "AMD does not expose this (last driver checked: 10.3)")
@Dependent("OpenGL30")
void glDisableClientStateiEXT(@GLenum int array, @GLuint int index);
@@ -562,6 +565,7 @@
and before state value parameters
*/
+ @Optional(reason = "AMD does not expose this (last driver checked: 10.3)")
@Dependent("OpenGL30")
@StripPostfix("params")
void glGetFloati_vEXT(@GLenum int pname, @GLuint int index, @OutParameter @Check("16") FloatBuffer params);
@@ -572,6 +576,7 @@
@StripPostfix("params")
void glGetFloati_vEXT2(@GLenum int pname, @GLuint int index, @OutParameter FloatBuffer params);
+ @Optional(reason = "AMD does not expose this (last driver checked: 10.3)")
@Dependent("OpenGL30")
@StripPostfix("params")
void glGetDoublei_vEXT(@GLenum int pname, @GLuint int index, @OutParameter @Check("16") DoubleBuffer params);
@@ -582,6 +587,7 @@
@StripPostfix("params")
void glGetDoublei_vEXT2(@GLenum int pname, @GLuint int index, @OutParameter DoubleBuffer params);
+ @Optional(reason = "AMD does not expose this (last driver checked: 10.3)")
@Dependent("OpenGL30")
@StripPostfix(value = "params", hasPostfix = false)
void glGetPointeri_vEXT(@GLenum int pname, @GLuint int index, @Result @GLvoid ByteBuffer params);
@@ -812,6 +818,7 @@
@GLshort
@GLint Buffer img);
+ @Dependent("OpenGL13")
void glGetCompressedTexImage(@GLenum int target, int lod,
@OutParameter
@BufferObject(BufferKind.PackPBO)
@@ -946,6 +953,7 @@
@Dependent("OpenGL20")
void glProgramUniform4fEXT(@GLuint int program, int location, float v0, float v1, float v2, float v3);
+ @Dependent("OpenGL20")
void glProgramUniform1iEXT(@GLuint int program, int location, int v0);
@Dependent("OpenGL20")
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java 2010-03-28 23:11:17 UTC (rev 3298)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java 2010-03-31 15:46:16 UTC (rev 3299)
@@ -63,7 +63,6 @@
// ----------------------[ ARB_draw_elements_base_vertex ]----------------------
// -----------------------------------------------------------------------------
- @Optional(reason = "AMD's 3.2 implementation does not expose this (last driver checked: 10.1)")
void glDrawElementsBaseVertex(@GLenum int mode, @AutoSize("indices") @GLsizei int count, @AutoType("indices") @GLenum int type,
@BufferObject(BufferKind.ElementVBO)
@Const
@@ -71,7 +70,6 @@
@GLushort
@GLuint Buffer indices, int basevertex);
- @Optional(reason = "AMD's 3.2 implementation does not expose this (last driver checked: 10.1)")
void glDrawRangeElementsBaseVertex(@GLenum int mode, @GLuint int start, @GLuint int end, @AutoSize("indices") @GLsizei int count, @AutoType("indices") @GLenum int type,
@BufferObject(BufferKind.ElementVBO)
@Const
@@ -79,7 +77,6 @@
@GLushort
@GLuint Buffer indices, int basevertex);
- @Optional(reason = "AMD's 3.2 implementation does not expose this (last driver checked: 10.1)")
void glDrawElementsInstancedBaseVertex(@GLenum int mode, @AutoSize("indices") @GLsizei int count, @AutoType("indices") @GLenum int type,
@BufferObject(BufferKind.ElementVBO)
@Const
@@ -326,7 +323,6 @@
@Alternate("glGetInteger64i_v")
@GLreturn("data")
@StripPostfix(value = "data", postfix = "64")
- @Optional(reason = "NV's 3.2 implementation does not expose this (last driver checked: 19?.??)")
void glGetInteger64i_v2(@GLenum int value, @GLuint int index, @OutParameter @GLint64 LongBuffer data);
@StripPostfix("values")
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java 2010-03-28 23:11:17 UTC (rev 3298)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java 2010-03-31 15:46:16 UTC (rev 3299)
@@ -46,12 +46,16 @@
// ----------------------[ ARB_draw_buffers_blend ]----------------------
// ----------------------------------------------------------------------
+ @Optional(reason = "AMD's 4.0 implementation does not expose this (last driver checked: 10.3)")
void glBlendEquationi(@GLuint int buf, @GLenum int mode);
+ @Optional(reason = "AMD's 4.0 implementation does not expose this (last driver checked: 10.3)")
void glBlendEquationSeparatei(@GLuint int buf, @GLenum int modeRGB, @GLenum int modeAlpha);
+ @Optional(reason = "AMD's 4.0 implementation does not expose this (last driver checked: 10.3)")
void glBlendFunci(@GLuint int buf, @GLenum int src, @GLenum int dst);
+ @Optional(reason = "AMD's 4.0 implementation does not expose this (last driver checked: 10.3)")
void glBlendFuncSeparatei(@GLuint int buf, @GLenum int srcRGB, @GLenum int dstRGB, @GLenum int srcAlpha, @GLenum int dstAlpha);
// -----------------------------------------------------------------
@@ -182,6 +186,7 @@
*/
int GL_MIN_SAMPLE_SHADING_VALUE = 0x8C37;
+ @Optional(reason = "AMD's 4.0 implementation does not expose this (last driver checked: 10.3)")
void glMinSampleShading(@GLclampf float value);
// ---------------------------------------------------------------------
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NVX_gpu_memory_info.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NVX_gpu_memory_info.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NVX_gpu_memory_info.java 2010-03-31 15:46:16 UTC (rev 3299)
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2002-2008 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.opengl;
+
+/** Experimental extension, may be removed/changed in the future. */
+public interface NVX_gpu_memory_info {
+
+ /** Accepted by the <pname> parameter of GetIntegerv: */
+ int GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX = 0x9047;
+ int GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX = 0x9048;
+ int GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX = 0x9049;
+ int GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX = 0x904A;
+ int GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX = 0x904B;
+
+}
\ No newline at end of file
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_half_float.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_half_float.java 2010-03-28 23:11:17 UTC (rev 3298)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_half_float.java 2010-03-31 15:46:16 UTC (rev 3299)
@@ -78,23 +78,34 @@
void glSecondaryColor3hNV(@GLhalf short red, @GLhalf short green, @GLhalf short blue);
+ @Optional(reason = "AMD does not expose this (last driver checked: 10.3)")
+ void glVertexWeighthNV(@GLhalf short weight);
+
+ @Optional(reason = "AMD does not expose this (last driver checked: 10.3)")
void glVertexAttrib1hNV(@GLuint int index, @GLhalf short x);
+ @Optional(reason = "AMD does not expose this (last driver checked: 10.3)")
void glVertexAttrib2hNV(@GLuint int index, @GLhalf short x, @GLhalf short y);
+ @Optional(reason = "AMD does not expose this (last driver checked: 10.3)")
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)")
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)")
@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)")
@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)")
@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)")
@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_primitive_restart.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_primitive_restart.java 2010-03-28 23:11:17 UTC (rev 3298)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_primitive_restart.java 2010-03-31 15:46:16 UTC (rev 3299)
@@ -33,6 +33,7 @@
import org.lwjgl.util.generator.*;
+@ForceInit
public interface NV_primitive_restart {
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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 © 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.
|
Thanks for helping keep SourceForge clean.
X