Menu
▾
▴
java-game-lib-cvs — Commits to the repository will be send to this list.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(134) |
Sep
(52) |
Oct
(13) |
Nov
(342) |
Dec
(163) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(44) |
Feb
(62) |
Mar
(158) |
Apr
(38) |
May
(70) |
Jun
(58) |
Jul
(104) |
Aug
(207) |
Sep
(83) |
Oct
(122) |
Nov
(23) |
Dec
(49) |
| 2004 |
Jan
(119) |
Feb
(132) |
Mar
(192) |
Apr
(140) |
May
(77) |
Jun
(74) |
Jul
(201) |
Aug
(63) |
Sep
(102) |
Oct
(70) |
Nov
(173) |
Dec
(78) |
| 2005 |
Jan
(174) |
Feb
(197) |
Mar
(105) |
Apr
(59) |
May
(77) |
Jun
(43) |
Jul
(21) |
Aug
(18) |
Sep
(47) |
Oct
(37) |
Nov
(74) |
Dec
(50) |
| 2006 |
Jan
(44) |
Feb
(19) |
Mar
(32) |
Apr
(24) |
May
(31) |
Jun
(55) |
Jul
(138) |
Aug
(28) |
Sep
(12) |
Oct
(41) |
Nov
(58) |
Dec
(24) |
| 2007 |
Jan
(28) |
Feb
(14) |
Mar
(10) |
Apr
(68) |
May
(30) |
Jun
(26) |
Jul
(18) |
Aug
(63) |
Sep
(19) |
Oct
(29) |
Nov
(20) |
Dec
(10) |
| 2008 |
Jan
(38) |
Feb
(7) |
Mar
(37) |
Apr
(120) |
May
(41) |
Jun
(36) |
Jul
(39) |
Aug
(24) |
Sep
(28) |
Oct
(30) |
Nov
(36) |
Dec
(75) |
| 2009 |
Jan
(46) |
Feb
(22) |
Mar
(50) |
Apr
(70) |
May
(134) |
Jun
(105) |
Jul
(75) |
Aug
(34) |
Sep
(38) |
Oct
(34) |
Nov
(19) |
Dec
(20) |
| 2010 |
Jan
(11) |
Feb
(20) |
Mar
(65) |
Apr
(83) |
May
(104) |
Jun
(73) |
Jul
(78) |
Aug
(57) |
Sep
(43) |
Oct
(35) |
Nov
(9) |
Dec
(4) |
| 2011 |
Jan
(21) |
Feb
(11) |
Mar
(18) |
Apr
(10) |
May
(18) |
Jun
(15) |
Jul
(48) |
Aug
(25) |
Sep
(17) |
Oct
(45) |
Nov
(15) |
Dec
(12) |
| 2012 |
Jan
(21) |
Feb
(9) |
Mar
(12) |
Apr
(9) |
May
(9) |
Jun
(5) |
Jul
(1) |
Aug
(10) |
Sep
(12) |
Oct
(1) |
Nov
(28) |
Dec
(5) |
| 2013 |
Jan
(4) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2016 |
Jan
(2) |
Feb
(1) |
Mar
(1) |
Apr
(1) |
May
(2) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sp...@us...> - 2011-07-10 22:38:28
|
Revision: 3566
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3566&view=rev
Author: spasi
Date: 2011-07-10 22:38:21 +0000 (Sun, 10 Jul 2011)
Log Message:
-----------
Attempt to fix ant release.
Modified Paths:
--------------
trunk/LWJGL/platform_build/build-generator.xml
Modified: trunk/LWJGL/platform_build/build-generator.xml
===================================================================
--- trunk/LWJGL/platform_build/build-generator.xml 2011-07-10 19:16:46 UTC (rev 3565)
+++ trunk/LWJGL/platform_build/build-generator.xml 2011-07-10 22:38:21 UTC (rev 3566)
@@ -50,7 +50,7 @@
<!-- Proxy target to generate it all -->
<target name="generate-all" depends="generate-openal, generate-opengl, generate-opengl-capabilities, generate-opengl-references, generate-opengles, generate-opengles-capabilities, generate-opencl, generate-opencl-capabilities" description="Generates java and native source"/>
- <target name="generate-debug" depends="generate-openal-debug, generate-opengl-debug, generate-opengl-capabilities-debug, generate-opengl-references, generate-opencl-debug, generate-opencl-capabilities-debug" description="Generates java and native source with debug functionality"/>
+ <target name="generate-debug" depends="generate-openal-debug, generate-opengl-debug, generate-opengl-capabilities-debug, generate-opengl-references, generate-opengles-debug, generate-opengles-capabilities-debug, generate-opencl-debug, generate-opencl-capabilities-debug" description="Generates java and native source with debug functionality"/>
<!-- ********************************************************************************
*********************************************************************************
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2011-07-10 19:16:52
|
Revision: 3565
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3565&view=rev
Author: spasi
Date: 2011-07-10 19:16:46 +0000 (Sun, 10 Jul 2011)
Log Message:
-----------
Attempt (2) to fix MacOS build.
Modified Paths:
--------------
trunk/LWJGL/platform_build/macosx_ant/build.xml
Modified: trunk/LWJGL/platform_build/macosx_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/macosx_ant/build.xml 2011-07-10 18:48:23 UTC (rev 3564)
+++ trunk/LWJGL/platform_build/macosx_ant/build.xml 2011-07-10 19:16:46 UTC (rev 3565)
@@ -20,7 +20,7 @@
<target name="compile">
<apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}">
- <arg line="${cflags} -ObjC -O2 -Wall -Wunused -c -fPIC -I${sdkroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${native}/macosx"/>
+ <arg line="${cflags} -ObjC -O2 -Wall -Wunused -c -fPIC -I${sdkroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${native}/common/opengl -I${native}/macosx"/>
<!-- Map from *.m and *.c to .o -->
<mapper type="regexp" from="^(.*)\.(c|m)" to="\1.o"/>
<fileset dir="${native}/macosx" includes="*.m"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2011-07-10 18:48:29
|
Revision: 3564
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3564&view=rev
Author: spasi
Date: 2011-07-10 18:48:23 +0000 (Sun, 10 Jul 2011)
Log Message:
-----------
Attempt to fix MacOS build.
Modified Paths:
--------------
trunk/LWJGL/platform_build/macosx_ant/build.xml
Modified: trunk/LWJGL/platform_build/macosx_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/macosx_ant/build.xml 2011-07-10 18:18:51 UTC (rev 3563)
+++ trunk/LWJGL/platform_build/macosx_ant/build.xml 2011-07-10 18:48:23 UTC (rev 3564)
@@ -26,6 +26,7 @@
<fileset dir="${native}/macosx" includes="*.m"/>
<fileset dir="${native}/macosx" includes="*.c"/>
<fileset dir="${native}/common" includes="*.c"/>
+ <fileset dir="${native}/common/opengl" includes="*.c"/>
<fileset dir="${native}/generated/openal" includes="*.c"/>
<fileset dir="${native}/generated/opencl" includes="*.c"/>
<fileset dir="${native}/generated/opengl" includes="*.c"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2011-07-10 18:18:57
|
Revision: 3563
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3563&view=rev
Author: spasi
Date: 2011-07-10 18:18:51 +0000 (Sun, 10 Jul 2011)
Log Message:
-----------
Fixed display creation.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/test/opengles/MappedIndexedVBOTest.java
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengles/MappedIndexedVBOTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengles/MappedIndexedVBOTest.java 2011-07-10 17:45:43 UTC (rev 3562)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengles/MappedIndexedVBOTest.java 2011-07-10 18:18:51 UTC (rev 3563)
@@ -45,6 +45,7 @@
import org.lwjgl.Sys;
import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
+import org.lwjgl.opengl.ContextType;
import org.lwjgl.opengl.Display;
import org.lwjgl.opengl.DisplayMode;
import org.lwjgl.opengles.GLContext;
@@ -85,7 +86,7 @@
static {
try {
- Display.createES();
+ Display.create(ContextType.GLES);
System.out.println("Created OpenGL.");
if ( !GLContext.getCapabilities().GL_OES_mapbuffer ) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2011-07-10 17:45:50
|
Revision: 3562
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3562&view=rev
Author: spasi
Date: 2011-07-10 17:45:43 +0000 (Sun, 10 Jul 2011)
Log Message:
-----------
Replaced Display.createES() with Display.create(ContextType.GLES).
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
Added Paths:
-----------
trunk/LWJGL/src/java/org/lwjgl/opengl/ContextType.java
Added: trunk/LWJGL/src/java/org/lwjgl/opengl/ContextType.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/ContextType.java (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/ContextType.java 2011-07-10 17:45:43 UTC (rev 3562)
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2002-2011 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+/**
+ * This enum can be used in the default Display.create method to specify
+ * the context type that will be created.
+ *
+ * @author Spasi
+ */
+public enum ContextType {
+
+ GL,
+ GLES,
+
+}
\ No newline at end of file
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java 2011-07-10 16:58:16 UTC (rev 3561)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java 2011-07-10 17:45:43 UTC (rev 3562)
@@ -730,7 +730,7 @@
}
/**
- * Create the OpenGL context. If isFullscreen() is true or if windowed
+ * Create the Display with the specified context type. If isFullscreen() is true or if windowed
* context are not supported on the platform, the display mode will be switched to the mode returned by
* getDisplayMode(), and a fullscreen context will be created. If isFullscreen() is false, a windowed context
* will be created with the dimensions given in the mode returned by getDisplayMode(). If a context can't be
@@ -738,15 +738,39 @@
* <p/>
* <p>The window created will be set up in orthographic 2D projection, with 1:1 pixel ratio with GL coordinates.
*
+ * @param type the context type to create
+ *
* @throws LWJGLException
*/
- public static void create() throws LWJGLException {
+ public static void create(ContextType type) throws LWJGLException {
synchronized ( GlobalLock.lock ) {
- create(new PixelFormat());
+ switch ( type ) {
+ case GL:
+ create(new PixelFormat());
+ break;
+ case GLES:
+ create(new org.lwjgl.opengles.PixelFormat());
+ break;
+ }
}
}
/**
+ * Create the OpenGL context. If isFullscreen() is true or if windowed
+ * context are not supported on the platform, the display mode will be switched to the mode returned by
+ * getDisplayMode(), and a fullscreen context will be created. If isFullscreen() is false, a windowed context
+ * will be created with the dimensions given in the mode returned by getDisplayMode(). If a context can't be
+ * created with the given parameters, a LWJGLException will be thrown.
+ * <p/>
+ * <p>The window created will be set up in orthographic 2D projection, with 1:1 pixel ratio with GL coordinates.
+ *
+ * @throws LWJGLException
+ */
+ public static void create() throws LWJGLException {
+ create(ContextType.GL);
+ }
+
+ /**
* Create the OpenGL context with the given minimum parameters. If isFullscreen() is true or if windowed
* context are not supported on the platform, the display mode will be switched to the mode returned by
* getDisplayMode(), and a fullscreen context will be created. If isFullscreen() is false, a windowed context
@@ -878,23 +902,6 @@
}
/**
- * Create the OpenGL ES context. If isFullscreen() is true or if windowed
- * context are not supported on the platform, the display mode will be switched to the mode returned by
- * getDisplayMode(), and a fullscreen context will be created. If isFullscreen() is false, a windowed context
- * will be created with the dimensions given in the mode returned by getDisplayMode(). If a context can't be
- * created with the given parameters, a LWJGLException will be thrown.
- * <p/>
- * <p>The window created will be set up in orthographic 2D projection, with 1:1 pixel ratio with GL coordinates.
- *
- * @throws LWJGLException
- */
- public static void createES() throws LWJGLException {
- synchronized ( GlobalLock.lock ) {
- create(new org.lwjgl.opengles.PixelFormat());
- }
- }
-
- /**
* Create the OpenGL ES context with the given minimum parameters. If isFullscreen() is true or if windowed
* context are not supported on the platform, the display mode will be switched to the mode returned by
* getDisplayMode(), and a fullscreen context will be created. If isFullscreen() is false, a windowed context
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2011-07-10 16:58:31
|
Revision: 3561
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3561&view=rev
Author: spasi
Date: 2011-07-10 16:58:16 +0000 (Sun, 10 Jul 2011)
Log Message:
-----------
Merged OpenGL ES branch.
Modified Paths:
--------------
trunk/LWJGL/build.xml
trunk/LWJGL/platform_build/build-definitions.xml
trunk/LWJGL/platform_build/build-generator.xml
trunk/LWJGL/platform_build/linux_ant/build.xml
trunk/LWJGL/platform_build/macosx_ant/build.xml
trunk/LWJGL/platform_build/mingw_ant/build.xml
trunk/LWJGL/platform_build/windows_ant/build.xml
trunk/LWJGL/src/java/org/lwjgl/opencl/APIUtil.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CallbackUtil.java
trunk/LWJGL/src/java/org/lwjgl/opencl/InfoUtilFactory.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
trunk/LWJGL/src/java/org/lwjgl/opengl/CallbackUtil.java
trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/DrawableLWJGL.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplayPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
trunk/LWJGL/src/java/org/lwjgl/opengl/Pbuffer.java
trunk/LWJGL/src/java/org/lwjgl/opengl/PixelFormat.java
trunk/LWJGL/src/java/org/lwjgl/opengl/SharedDrawable.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplayPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutCL.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/FieldsGenerator.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/RegisterStubsGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/Matrix4f.java
trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
trunk/LWJGL/src/templates/org/lwjgl/opencl/CL10.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_texture_lod_bias.java
Added Paths:
-----------
trunk/LWJGL/libs/linux/libEGL.so
trunk/LWJGL/libs/linux/libGLESv2.so
trunk/LWJGL/libs/linux/x64/
trunk/LWJGL/libs/linux/x64/libEGL.so
trunk/LWJGL/libs/linux/x64/libGLESv2.so
trunk/LWJGL/libs/windows/libEGL.dll
trunk/LWJGL/libs/windows/libEGL.lib
trunk/LWJGL/libs/windows/libGLESv2.dll
trunk/LWJGL/platform_build/linux_ant/build_es.xml
trunk/LWJGL/platform_build/windows_ant/build_es.xml
trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java
trunk/LWJGL/src/java/org/lwjgl/opengl/ContextGL.java
trunk/LWJGL/src/java/org/lwjgl/opengl/ContextGLES.java
trunk/LWJGL/src/java/org/lwjgl/opengl/DrawableGL.java
trunk/LWJGL/src/java/org/lwjgl/opengl/DrawableGLES.java
trunk/LWJGL/src/java/org/lwjgl/opengl/NVPresentVideoUtil.java
trunk/LWJGL/src/java/org/lwjgl/opengl/NVVideoCaptureUtil.java
trunk/LWJGL/src/java/org/lwjgl/opengl/PixelFormatLWJGL.java
trunk/LWJGL/src/java/org/lwjgl/opengles/
trunk/LWJGL/src/java/org/lwjgl/opengles/APIUtil.java
trunk/LWJGL/src/java/org/lwjgl/opengles/ContextAttribs.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGL.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLConfig.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLContext.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLDisplay.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLImageOES.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLKHRFenceSync.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLKHRReusableSync.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLNVSync.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLSurface.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLSyncKHR.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLSyncNV.java
trunk/LWJGL/src/java/org/lwjgl/opengles/GLChecks.java
trunk/LWJGL/src/java/org/lwjgl/opengles/GLContext.java
trunk/LWJGL/src/java/org/lwjgl/opengles/PeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengles/PixelFormat.java
trunk/LWJGL/src/java/org/lwjgl/opengles/PowerManagementEventException.java
trunk/LWJGL/src/java/org/lwjgl/opengles/StateTracker.java
trunk/LWJGL/src/java/org/lwjgl/opengles/Util.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/
trunk/LWJGL/src/java/org/lwjgl/test/opengles/FullScreenWindowedTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/Gears.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/MappedIndexedVBOTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/QuadRenderer.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/BufferObject.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/BufferObjectArray.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/BufferObjectElement.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/GLLight.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/GLMatrix.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/GLObject.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Geometry.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/ImmediateModeBuffer.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Shader.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/ShaderProgram.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Sphere.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/EGLint64NV.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/EGLuint64NV.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLESCapabilitiesGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLESGeneratorProcessorFactory.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLESTypeMap.java
trunk/LWJGL/src/native/common/EGL/
trunk/LWJGL/src/native/common/EGL/egl.h
trunk/LWJGL/src/native/common/EGL/eglext.h
trunk/LWJGL/src/native/common/EGL/eglplatform.h
trunk/LWJGL/src/native/common/GLES2/
trunk/LWJGL/src/native/common/GLES2/gl2.h
trunk/LWJGL/src/native/common/GLES2/gl2ext.h
trunk/LWJGL/src/native/common/GLES2/gl2extimg.h
trunk/LWJGL/src/native/common/GLES2/gl2platform.h
trunk/LWJGL/src/native/common/KHR/
trunk/LWJGL/src/native/common/KHR/khrplatform.h
trunk/LWJGL/src/native/common/opengl/
trunk/LWJGL/src/native/common/opengl/extgl.c
trunk/LWJGL/src/native/common/opengl/extgl.h
trunk/LWJGL/src/native/common/opengl/extgl_types.h
trunk/LWJGL/src/native/common/opengl/org_lwjgl_opengl_CallbackUtil.c
trunk/LWJGL/src/native/common/opengl/org_lwjgl_opengl_GLContext.c
trunk/LWJGL/src/native/common/opengl/org_lwjgl_opengl_NVPresentVideoUtil.c
trunk/LWJGL/src/native/common/opengl/org_lwjgl_opengl_NVVideoCaptureUtil.c
trunk/LWJGL/src/native/common/opengles/
trunk/LWJGL/src/native/common/opengles/extgl.c
trunk/LWJGL/src/native/common/opengles/extgl.h
trunk/LWJGL/src/native/common/opengles/extgl_egl.c
trunk/LWJGL/src/native/common/opengles/extgl_egl.h
trunk/LWJGL/src/native/common/opengles/extgl_types.h
trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGL.c
trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGLKHRFenceSync.c
trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGLKHRReusableSync.c
trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGLNVSync.c
trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_GLContext.c
trunk/LWJGL/src/native/linux/opengl/
trunk/LWJGL/src/native/linux/opengl/GLX.c
trunk/LWJGL/src/native/linux/opengl/GLX.h
trunk/LWJGL/src/native/linux/opengl/context.c
trunk/LWJGL/src/native/linux/opengl/context.h
trunk/LWJGL/src/native/linux/opengl/display.c
trunk/LWJGL/src/native/linux/opengl/extgl_glx.c
trunk/LWJGL/src/native/linux/opengl/extgl_glx.h
trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_Display.c
trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c
trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_LinuxCanvasImplementation.c
trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_LinuxContextImplementation.c
trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_Pbuffer.c
trunk/LWJGL/src/native/linux/opengles/
trunk/LWJGL/src/native/linux/opengles/context.c
trunk/LWJGL/src/native/linux/opengles/context.h
trunk/LWJGL/src/native/linux/opengles/display.c
trunk/LWJGL/src/native/linux/opengles/extgl_glx.c
trunk/LWJGL/src/native/linux/opengles/org_lwjgl_opengl_Display.c
trunk/LWJGL/src/native/windows/opengl/
trunk/LWJGL/src/native/windows/opengl/WGL.c
trunk/LWJGL/src/native/windows/opengl/WGL.h
trunk/LWJGL/src/native/windows/opengl/context.c
trunk/LWJGL/src/native/windows/opengl/context.h
trunk/LWJGL/src/native/windows/opengl/extgl_wgl.c
trunk/LWJGL/src/native/windows/opengl/extgl_wgl.h
trunk/LWJGL/src/native/windows/opengl/org_lwjgl_opengl_Pbuffer.c
trunk/LWJGL/src/native/windows/opengl/org_lwjgl_opengl_WindowsContextImplementation.c
trunk/LWJGL/src/native/windows/opengl/org_lwjgl_opengl_WindowsPeerInfo.c
trunk/LWJGL/src/native/windows/opengles/
trunk/LWJGL/src/native/windows/opengles/context.c
trunk/LWJGL/src/native/windows/opengles/context.h
trunk/LWJGL/src/native/windows/opengles/extgl_wgl.c
trunk/LWJGL/src/native/windows/opengles/org_lwjgl_opengl_WindowsPeerInfo.c
trunk/LWJGL/src/templates/org/lwjgl/opencl/AMD_device_memory_flags.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/AMD_offline_devices.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/AMD_popcnt.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_multi_draw_indirect.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_present_video.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_video_capture.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/
trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_compressed_3DC_texture.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_compressed_ATC_texture.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_performance_monitor.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_program_binary_Z400.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/ANGLE_framebuffer_blit.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/ANGLE_framebuffer_multisample.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_framebuffer_multisample.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_rgb_422.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_texture_format_BGRA8888.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_texture_max_level.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/ARB_draw_buffers.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/ARB_half_float_pixel.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/ARB_texture_rectangle.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/ARM_mali_shader_binary.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/ARM_rgba8.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/DMP_shader_binary.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_Cg_shader.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_bgra.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_blend_minmax.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_discard_framebuffer.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_frag_depth.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_multi_draw_arrays.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_packed_float.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_read_format_bgra.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_shader_texture_lod.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_array.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_compression_dxt1.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_compression_latc.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_compression_s3tc.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_filter_anisotropic.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_format_BGRA8888.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_lod_bias.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_type_2_10_10_10_REV.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_multisamples_render_to_texture.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_program_binary.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_shader_binary.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_texture_compression_pvrtc.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_coverage_sample.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_depth_nonlinear.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_draw_path.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_fbo_color_attachments.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_fence.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_framebuffer_vertex_attrib_array.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_get_tex_image.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_read_buffer.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_shader_framebuffer_fetch.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_system_time.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_EGL_image.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_EGL_image_external.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_EGL_sync.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_blend_equation_separate.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_blend_func_separate.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_blend_subtract.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_compressed_ETC1_RGB8_texture.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_compressed_paletted_texture.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_depth24.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_depth32.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_depth_texture.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_element_index_uint.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_fbo_render_mipmap.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_get_program_binary.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_mapbuffer.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_packed_depth_stencil.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_rgb8_rgba8.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_standard_derivatives.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_stencil1.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_stencil4.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_stencil8.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_3D.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float_linear.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_half_float.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_half_float_linear.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_npot.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_vertex_array_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_vertex_half_float.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_vertex_type_10_10_10_2.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_driver_control.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_extended_get.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_extended_get2.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_performance_monitor_global_mode.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_tiled_rendering.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_writeonly_rendering.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/VIV_shader_binary.java
Removed Paths:
-------------
trunk/LWJGL/libs/linux/x64/libEGL.so
trunk/LWJGL/libs/linux/x64/libGLESv2.so
trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractDrawable.java
trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java
trunk/LWJGL/src/java/org/lwjgl/opengles/APIUtil.java
trunk/LWJGL/src/java/org/lwjgl/opengles/ContextAttribs.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGL.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLConfig.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLContext.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLDisplay.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLImageOES.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLKHRFenceSync.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLKHRReusableSync.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLNVSync.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLSurface.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLSyncKHR.java
trunk/LWJGL/src/java/org/lwjgl/opengles/EGLSyncNV.java
trunk/LWJGL/src/java/org/lwjgl/opengles/GLChecks.java
trunk/LWJGL/src/java/org/lwjgl/opengles/GLContext.java
trunk/LWJGL/src/java/org/lwjgl/opengles/PeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengles/PixelFormat.java
trunk/LWJGL/src/java/org/lwjgl/opengles/PowerManagementEventException.java
trunk/LWJGL/src/java/org/lwjgl/opengles/StateTracker.java
trunk/LWJGL/src/java/org/lwjgl/opengles/Util.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/FullScreenWindowedTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/Gears.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/MappedIndexedVBOTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/QuadRenderer.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/BufferObject.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/BufferObjectArray.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/BufferObjectElement.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/GLLight.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/GLMatrix.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/GLObject.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Geometry.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/ImmediateModeBuffer.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Shader.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/ShaderProgram.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Sphere.java
trunk/LWJGL/src/native/common/EGL/egl.h
trunk/LWJGL/src/native/common/EGL/eglext.h
trunk/LWJGL/src/native/common/EGL/eglplatform.h
trunk/LWJGL/src/native/common/GLES2/gl2.h
trunk/LWJGL/src/native/common/GLES2/gl2ext.h
trunk/LWJGL/src/native/common/GLES2/gl2extimg.h
trunk/LWJGL/src/native/common/GLES2/gl2platform.h
trunk/LWJGL/src/native/common/KHR/khrplatform.h
trunk/LWJGL/src/native/common/extgl.c
trunk/LWJGL/src/native/common/extgl.h
trunk/LWJGL/src/native/common/extgl_types.h
trunk/LWJGL/src/native/common/opengl/extgl.c
trunk/LWJGL/src/native/common/opengl/extgl.h
trunk/LWJGL/src/native/common/opengl/extgl_types.h
trunk/LWJGL/src/native/common/opengl/org_lwjgl_opengl_CallbackUtil.c
trunk/LWJGL/src/native/common/opengl/org_lwjgl_opengl_GLContext.c
trunk/LWJGL/src/native/common/opengl/org_lwjgl_opengl_NVPresentVideoUtil.c
trunk/LWJGL/src/native/common/opengl/org_lwjgl_opengl_NVVideoCaptureUtil.c
trunk/LWJGL/src/native/common/opengles/extgl.c
trunk/LWJGL/src/native/common/opengles/extgl.h
trunk/LWJGL/src/native/common/opengles/extgl_egl.c
trunk/LWJGL/src/native/common/opengles/extgl_egl.h
trunk/LWJGL/src/native/common/opengles/extgl_types.h
trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGL.c
trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGLKHRFenceSync.c
trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGLKHRReusableSync.c
trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGLNVSync.c
trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_GLContext.c
trunk/LWJGL/src/native/common/org_lwjgl_opengl_CallbackUtil.c
trunk/LWJGL/src/native/common/org_lwjgl_opengl_GLContext.c
trunk/LWJGL/src/native/linux/context.c
trunk/LWJGL/src/native/linux/context.h
trunk/LWJGL/src/native/linux/display.c
trunk/LWJGL/src/native/linux/extgl_glx.c
trunk/LWJGL/src/native/linux/extgl_glx.h
trunk/LWJGL/src/native/linux/opengl/GLX.c
trunk/LWJGL/src/native/linux/opengl/GLX.h
trunk/LWJGL/src/native/linux/opengl/context.c
trunk/LWJGL/src/native/linux/opengl/context.h
trunk/LWJGL/src/native/linux/opengl/display.c
trunk/LWJGL/src/native/linux/opengl/extgl_glx.c
trunk/LWJGL/src/native/linux/opengl/extgl_glx.h
trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_Display.c
trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c
trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_LinuxCanvasImplementation.c
trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_LinuxContextImplementation.c
trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_Pbuffer.c
trunk/LWJGL/src/native/linux/opengles/context.c
trunk/LWJGL/src/native/linux/opengles/context.h
trunk/LWJGL/src/native/linux/opengles/display.c
trunk/LWJGL/src/native/linux/opengles/extgl_glx.c
trunk/LWJGL/src/native/linux/opengles/org_lwjgl_opengl_Display.c
trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c
trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c
trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxCanvasImplementation.c
trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxContextImplementation.c
trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Pbuffer.c
trunk/LWJGL/src/native/windows/context.c
trunk/LWJGL/src/native/windows/context.h
trunk/LWJGL/src/native/windows/extgl_wgl.c
trunk/LWJGL/src/native/windows/extgl_wgl.h
trunk/LWJGL/src/native/windows/opengl/WGL.c
trunk/LWJGL/src/native/windows/opengl/WGL.h
trunk/LWJGL/src/native/windows/opengl/context.c
trunk/LWJGL/src/native/windows/opengl/context.h
trunk/LWJGL/src/native/windows/opengl/extgl_wgl.c
trunk/LWJGL/src/native/windows/opengl/extgl_wgl.h
trunk/LWJGL/src/native/windows/opengl/org_lwjgl_opengl_Pbuffer.c
trunk/LWJGL/src/native/windows/opengl/org_lwjgl_opengl_WindowsContextImplementation.c
trunk/LWJGL/src/native/windows/opengl/org_lwjgl_opengl_WindowsPeerInfo.c
trunk/LWJGL/src/native/windows/opengles/context.c
trunk/LWJGL/src/native/windows/opengles/context.h
trunk/LWJGL/src/native/windows/opengles/extgl_wgl.c
trunk/LWJGL/src/native/windows/opengles/org_lwjgl_opengl_WindowsPeerInfo.c
trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c
trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsContextImplementation.c
trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsPeerInfo.c
trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_compressed_3DC_texture.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_compressed_ATC_texture.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_performance_monitor.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_program_binary_Z400.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/ANGLE_framebuffer_blit.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/ANGLE_framebuffer_multisample.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_framebuffer_multisample.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_rgb_422.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_texture_format_BGRA8888.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_texture_max_level.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/ARB_draw_buffers.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/ARB_half_float_pixel.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/ARB_texture_rectangle.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/ARM_mali_shader_binary.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/ARM_rgba8.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/DMP_shader_binary.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_Cg_shader.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_bgra.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_blend_minmax.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_discard_framebuffer.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_frag_depth.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_multi_draw_arrays.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_packed_float.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_read_format_bgra.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_shader_texture_lod.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_array.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_compression_dxt1.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_compression_latc.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_compression_s3tc.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_filter_anisotropic.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_format_BGRA8888.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_lod_bias.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_type_2_10_10_10_REV.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_multisamples_render_to_texture.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_program_binary.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_shader_binary.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_texture_compression_pvrtc.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_coverage_sample.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_depth_nonlinear.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_draw_path.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_fbo_color_attachments.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_fence.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_framebuffer_vertex_attrib_array.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_get_tex_image.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_read_buffer.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_shader_framebuffer_fetch.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_system_time.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_EGL_image.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_EGL_image_external.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_EGL_sync.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_blend_equation_separate.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_blend_func_separate.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_blend_subtract.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_compressed_ETC1_RGB8_texture.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_compressed_paletted_texture.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_depth24.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_depth32.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_depth_texture.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_element_index_uint.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_fbo_render_mipmap.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_get_program_binary.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_mapbuffer.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_packed_depth_stencil.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_rgb8_rgba8.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_standard_derivatives.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_stencil1.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_stencil4.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_stencil8.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_3D.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float_linear.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_half_float.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_half_float_linear.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_npot.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_vertex_array_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_vertex_half_float.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_vertex_type_10_10_10_2.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_driver_control.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_extended_get.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_extended_get2.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_performance_monitor_global_mode.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_tiled_rendering.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_writeonly_rendering.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/VIV_shader_binary.java
Property Changed:
----------------
trunk/LWJGL/
trunk/LWJGL/libs/
trunk/LWJGL/libs/windows/
trunk/LWJGL/src/native/common/
trunk/LWJGL/src/native/linux/
Property changes on: trunk/LWJGL
___________________________________________________________________
Modified: svn:ignore
- .classpath
*.class
*.class~
*.java~
.nbattrs
.project
dist
libs
temp
+ *.class
*.class~
*.java~
.classpath
.nbattrs
.project
bin
dist
libs
temp
Added: svn:mergeinfo
+ /branches/opengles/LWJGL:3533-3560
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2011-07-10 10:26:36 UTC (rev 3560)
+++ trunk/LWJGL/build.xml 2011-07-10 16:58:16 UTC (rev 3561)
@@ -9,16 +9,17 @@
<import file="platform_build/build-maven.xml"/>
<!-- ================================================================== -->
- <!-- Everything below this line is targets. -->
- <!-- Do not modify, unless you know what you're doing -->
+ <!-- Everything below this line is targets. -->
+ <!-- Do not modify, unless you know what you're doing -->
<!-- ================================================================== -->
<!-- ================================================================== -->
- <!-- Initialize build -->
+ <!-- Initialize build -->
<!-- ================================================================== -->
<target name="-initialize">
<mkdir dir="${lwjgl.bin}" taskname="initialiazing bin folder" />
<mkdir dir="${lwjgl.bin}/lwjgl" taskname="initialiazing native bin folder" />
+ <mkdir dir="${lwjgl.bin}/lwjgles" taskname="initialiazing native OpenGL ES bin folder"/>
<mkdir dir="${lwjgl.lib}" taskname="initialiazing lib folder" />
<mkdir dir="${lwjgl.dist}" taskname="initialiazing dist folder" />
<mkdir dir="${lwjgl.docs}/javadoc" taskname="initialiazing docs folder" />
@@ -48,6 +49,7 @@
<!-- Useful when we need to force native recompilation -->
<target name="clean-native" description="Cleans native files generated by this ant script" depends="clean-generated-native">
<delete dir="${lwjgl.bin}/lwjgl" quiet="true" failonerror="false" taskname="cleaning native bin folder" />
+ <delete dir="${lwjgl.bin}/lwjgles" quiet="true" failonerror="false" taskname="cleaning native OpenGL ES bin folder"/>
</target>
<!-- Creates a distribution of LWJGL -->
@@ -111,6 +113,12 @@
<antcall target="-jars_NoDEP" />
</target>
+ <!-- Create ONLY the jar archives for the ES build -->
+ <target name="jars_es" description="Creates the Java archives ONLY for the ES build and places them in libs/"
+ depends="-initialize, generate-all, compile, -createjars_es">
+ <antcall target="-jars_NoDEP"/>
+ </target>
+
<target name="-jars_NoDEP">
<move todir="libs/">
<fileset dir="${lwjgl.temp}/jar">
@@ -161,6 +169,22 @@
</jar>
</target>
+ <!-- Packages the java files for the ES build -->
+ <target name="-createjars_es">
+ <!-- Create lwjgl.jar -->
+ <jar destfile="${lwjgl.temp}/jar/lwjgl.jar" taskname="lwjgl.jar">
+ <fileset refid="lwjgl_es.fileset"/>
+ <manifest>
+ <attribute name="Sealed" value="true"/>
+ </manifest>
+ </jar>
+
+ <!-- Create lwjgl_test.jar -->
+ <jar destfile="${lwjgl.temp}/jar/lwjgl_test.jar" taskname="lwjgl_test.jar">
+ <fileset refid="lwjgl_test_es.fileset"/>
+ </jar>
+ </target>
+
<!-- Distributes files -->
<target name="-distribute">
<delete>
@@ -227,25 +251,35 @@
<class name="org.lwjgl.opengl.LinuxKeyboard" />
<class name="org.lwjgl.opengl.LinuxDisplay" />
<class name="org.lwjgl.opengl.LinuxPeerInfo" />
- <class name="org.lwjgl.opengl.LinuxPbufferPeerInfo" />
- <class name="org.lwjgl.opengl.LinuxDisplayPeerInfo" />
- <class name="org.lwjgl.opengl.LinuxAWTGLCanvasPeerInfo" />
- <class name="org.lwjgl.opengl.LinuxContextImplementation" />
- <class name="org.lwjgl.opengl.LinuxCanvasImplementation" />
</javah>
+ <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/linux/opengl" force="yes">
+ <class name="org.lwjgl.opengl.LinuxPbufferPeerInfo"/>
+ <class name="org.lwjgl.opengl.LinuxDisplayPeerInfo"/>
+ <class name="org.lwjgl.opengl.LinuxAWTGLCanvasPeerInfo"/>
+ <class name="org.lwjgl.opengl.LinuxContextImplementation"/>
+ <class name="org.lwjgl.opengl.LinuxCanvasImplementation"/>
+ </javah>
+
<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/windows" force="yes">
+ <class name="org.lwjgl.WindowsSysImplementation"/>
<class name="org.lwjgl.opengl.WindowsKeyboard" />
- <class name="org.lwjgl.opengl.WindowsPbufferPeerInfo" />
- <class name="org.lwjgl.opengl.WindowsDisplay" />
<class name="org.lwjgl.opengl.WindowsRegistry" />
- <class name="org.lwjgl.WindowsSysImplementation" />
- <class name="org.lwjgl.opengl.WindowsAWTGLCanvasPeerInfo" />
- <class name="org.lwjgl.opengl.WindowsPeerInfo" />
- <class name="org.lwjgl.opengl.WindowsDisplayPeerInfo" />
- <class name="org.lwjgl.opengl.WindowsContextImplementation" />
+ <class name="org.lwjgl.opengl.WindowsDisplay"/>
+ <class name="org.lwjgl.opengl.WindowsDisplayPeerInfo"/>
+ <class name="org.lwjgl.opengl.WindowsAWTGLCanvasPeerInfo"/>
</javah>
+ <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/windows/opengl" force="yes">
+ <class name="org.lwjgl.opengl.WindowsPbufferPeerInfo"/>
+ <class name="org.lwjgl.opengl.WindowsPeerInfo"/>
+ <class name="org.lwjgl.opengl.WindowsContextImplementation"/>
+ </javah>
+
+ <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/windows/opengles" force="yes">
+ <class name="org.lwjgl.opengl.WindowsPeerInfo"/>
+ </javah>
+
<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
<class name="org.lwjgl.MacOSXSysImplementation" />
<class name="org.lwjgl.opengl.MacOSXMouseEventQueue" />
@@ -263,13 +297,26 @@
<class name="org.lwjgl.input.Keyboard" />
<class name="org.lwjgl.input.Mouse" />
<class name="org.lwjgl.openal.AL" />
- <class name="org.lwjgl.opengl.GLContext" />
- <class name="org.lwjgl.opengl.Pbuffer" />
- <class name="org.lwjgl.opengl.CallbackUtil" />
- <class name="org.lwjgl.opencl.CL" />
+ <class name="org.lwjgl.opencl.CL" />
<class name="org.lwjgl.opencl.CallbackUtil" />
- <class name="org.lwjgl.BufferUtils" />
+ <class name="org.lwjgl.BufferUtils" />
</javah>
+
+ <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}/opengl" force="yes">
+ <class name="org.lwjgl.opengl.GLContext"/>
+ <class name="org.lwjgl.opengl.Pbuffer"/>
+ <class name="org.lwjgl.opengl.CallbackUtil"/>
+ <class name="org.lwjgl.opengl.NVPresentVideoUtil"/>
+ <class name="org.lwjgl.opengl.NVVideoCaptureUtil"/>
+ </javah>
+
+ <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}/opengles" force="yes">
+ <class name="org.lwjgl.opengles.EGL"/>
+ <class name="org.lwjgl.opengles.EGLKHRFenceSync"/>
+ <class name="org.lwjgl.opengles.EGLKHRReusableSync"/>
+ <class name="org.lwjgl.opengles.EGLNVSync"/>
+ <class name="org.lwjgl.opengles.GLContext"/>
+ </javah>
</target>
<target name="touch-version">
@@ -364,6 +411,7 @@
<include name="org/lwjgl/*.java"/>
<include name="org/lwjgl/input/**"/>
<include name="org/lwjgl/opengl/**"/>
+ <include name="org/lwjgl/opengles/**"/>
<include name="org/lwjgl/openal/**"/>
<include name="org/lwjgl/opencl/**"/>
<include name="org/lwjgl/util/**"/>
@@ -430,6 +478,34 @@
<version-check platform="macosx"/>
</target>
+ <target name="compile_native_es" depends="-initialize, headers, touch-version, version-mismatch" description="Compiles the native files">
+ <condition property="lwjgl.platform.windows">
+ <os family="windows"/>
+ </condition>
+ <antcall target="-compile_native_win32_es"/>
+
+ <condition property="lwjgl.platform.linux">
+ <os name="Linux"/>
+ </condition>
+ <antcall target="-compile_native_linux_es"/>
+ </target>
+
+ <!-- Compiles LWJGL ES on Win32 platforms -->
+ <target name="-compile_native_win32_es" if="lwjgl.platform.windows">
+ <ant antfile="platform_build/windows_ant/build_es.xml" inheritAll="false"/>
+ <copy todir="${lwjgl.lib}/windows">
+ <fileset dir="${lwjgl.bin}/lwjgles" includes="lwjgl*.dll"/>
+ </copy>
+ </target>
+
+ <!-- Compiles LWJGL ES on Linux platforms -->
+ <target name="-compile_native_linux_es" if="lwjgl.platform.linux">
+ <ant antfile="platform_build/linux_ant/build_es.xml" inheritAll="false"/>
+ <copy todir="${lwjgl.lib}/linux">
+ <fileset dir="${lwjgl.bin}/lwjgles" includes="liblwjgl*.so"/>
+ </copy>
+ </target>
+
<target name="repack200" description="Pack200-repack a jar file">
<pack200 src="${input}" destfile="${output}" repack="true"/>
</target>
Property changes on: trunk/LWJGL/libs
___________________________________________________________________
Added: svn:ignore
+ lwjgl-debug.jar
lwjgl.jar
lwjgl_test.jar
lwjgl_util.jar
lwjgl_util_applet.jar
Copied: trunk/LWJGL/libs/linux/libEGL.so (from rev 3560, branches/opengles/LWJGL/libs/linux/libEGL.so)
===================================================================
(Binary files differ)
Copied: trunk/LWJGL/libs/linux/libGLESv2.so (from rev 3560, branches/opengles/LWJGL/libs/linux/libGLESv2.so)
===================================================================
(Binary files differ)
Deleted: trunk/LWJGL/libs/linux/x64/libEGL.so
===================================================================
(Binary files differ)
Copied: trunk/LWJGL/libs/linux/x64/libEGL.so (from rev 3560, branches/opengles/LWJGL/libs/linux/x64/libEGL.so)
===================================================================
(Binary files differ)
Deleted: trunk/LWJGL/libs/linux/x64/libGLESv2.so
===================================================================
(Binary files differ)
Copied: trunk/LWJGL/libs/linux/x64/libGLESv2.so (from rev 3560, branches/opengles/LWJGL/libs/linux/x64/libGLESv2.so)
===================================================================
(Binary files differ)
Property changes on: trunk/LWJGL/libs/windows
___________________________________________________________________
Added: svn:ignore
+ lwjgl.dll
Copied: trunk/LWJGL/libs/windows/libEGL.dll (from rev 3560, branches/opengles/LWJGL/libs/windows/libEGL.dll)
===================================================================
(Binary files differ)
Copied: trunk/LWJGL/libs/windows/libEGL.lib (from rev 3560, branches/opengles/LWJGL/libs/windows/libEGL.lib)
===================================================================
(Binary files differ)
Copied: trunk/LWJGL/libs/windows/libGLESv2.dll (from rev 3560, branches/opengles/LWJGL/libs/windows/libGLESv2.dll)
===================================================================
(Binary files differ)
Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml 2011-07-10 10:26:36 UTC (rev 3560)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2011-07-10 16:58:16 UTC (rev 3561)
@@ -16,6 +16,7 @@
<property name="lwjgl.web" location="www" />
<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"/>
+ <property name="opengles-template-pattern" value="org/lwjgl/opengles/GLES*.java,org/lwjgl/opengles/ARB*.java,org/lwjgl/opengles/EXT*.java,org/lwjgl/opengles/AMD*.java,org/lwjgl/opengles/ANGLE*.java,org/lwjgl/opengles/APPLE*.java,org/lwjgl/opengles/ARM*.java,org/lwjgl/opengles/DMP*.java,org/lwjgl/opengles/IMG*.java,org/lwjgl/opengles/NV*.java,org/lwjgl/opengles/OES*.java,org/lwjgl/opengles/QCOM*.java,org/lwjgl/opengles/VIV*.java"/>
<property name="opencl-template-pattern-extensions" value="org/lwjgl/opencl/KHR*.java,org/lwjgl/opencl/EXT*.java,org/lwjgl/opencl/APPLE*.java,org/lwjgl/opencl/AMD*.java,org/lwjgl/opencl/NV*.java"/>
<property name="opencl-template-pattern" value="org/lwjgl/opencl/CL*.java,${opencl-template-pattern-extensions}"/>
@@ -27,13 +28,25 @@
<fileset id="lwjgl.fileset" dir="${lwjgl.bin}">
<patternset id="lwjgl.package.pattern">
<include name="org/**/*" />
+ <exclude name="org/lwjgl/opengles/**"/>
<exclude name="org/lwjgl/d3d/**" />
<exclude name="org/lwjgl/test/**" />
<exclude name="org/lwjgl/util/**" />
<exclude name="org/lwjgl/examples/**" />
</patternset>
</fileset>
-
+
+ <!-- Files to include in the lwjgl.jar file, for the ES build -->
+ <fileset id="lwjgl_es.fileset" dir="${lwjgl.bin}">
+ <patternset id="lwjgl_es.package.pattern">
+ <include name="org/**/*"/>
+ <exclude name="org/lwjgl/d3d/**"/>
+ <exclude name="org/lwjgl/test/**"/>
+ <exclude name="org/lwjgl/util/**"/>
+ <exclude name="org/lwjgl/examples/**"/>
+ </patternset>
+ </fileset>
+
<!-- Files to include in the lwjgl_util_applet.jar file -->
<fileset id="lwjgl_util_applet.fileset" dir="${lwjgl.bin}">
<patternset id="lwjgl_util_applet.package.pattern">
@@ -46,6 +59,7 @@
<fileset id="lwjgl_test.fileset" dir="${lwjgl.bin}">
<exclude name="**.*" />
<include name="org/lwjgl/test/**" />
+ <exclude name="org/lwjgl/test/opengles/**"/>
<include name="org/lwjgl/examples/**" />
</fileset>
@@ -59,6 +73,14 @@
<include name="org/lwjgl/test/opencl/gl/*.cl" />
</fileset>
+ <!-- Files to include in the lwjgl_test.jar file for the ES build -->
+ <fileset id="lwjgl_test_es.fileset" dir="${lwjgl.bin}">
+ <exclude name="**.*"/>
+ <include name="org/lwjgl/test/**"/>
+ <exclude name="org/lwjgl/test/opengl/**"/>
+ <exclude name="org/lwjgl/test/*.*"/>
+ </fileset>
+
<!-- Files to include in the lwjgl_util.jar file -->
<fileset id="lwjgl_util.fileset" dir="${lwjgl.bin}">
<patternset id="lwjgl_util.package.pattern">
@@ -68,8 +90,8 @@
<include name="org/lwjgl/util/**" />
</patternset>
</fileset>
-
+
<!-- Files to include in the lwjgl_applet.jar file -->
<fileset id="lwjgl_applet.fileset" dir="${lwjgl.bin}">
<exclude name="**.*"/>
@@ -116,7 +138,7 @@
<include name="liblwjgl*.so" />
<include name="libopenal*.so" />
</patternset>
- <patternset id="lwjgl-linux-jinput.fileset">
+ <patternset id="lwjgl-linux-jinput.fileset">
<include name="libjinput-linux.so" />
<include name="libjinput-linux64.so" />
</patternset>
Modified: trunk/LWJGL/platform_build/build-generator.xml
===================================================================
--- trunk/LWJGL/platform_build/build-generator.xml 2011-07-10 10:26:36 UTC (rev 3560)
+++ trunk/LWJGL/platform_build/build-generator.xml 2011-07-10 16:58:16 UTC (rev 3561)
@@ -18,6 +18,7 @@
<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/util/generator/**.java" source="1.5" target="1.5" taskname="generator">
<include name="org/lwjgl/util/generator/openal/**.java"/>
<include name="org/lwjgl/util/generator/opengl/**.java"/>
+ <include name="org/lwjgl/util/generator/opengles/**.java"/>
<include name="org/lwjgl/util/generator/opencl/**.java"/>
<compilerarg value="-Xlint:all"/>
</javac>
@@ -29,6 +30,8 @@
<include name="org/lwjgl/opengl/GLSync.java"/>
<include name="org/lwjgl/opengl/AMDDebugOutputCallback.java"/>
<include name="org/lwjgl/opengl/ARBDebugOutputCallback.java"/>
+ <!-- OpenGL ES -->
+ <include name="org/lwjgl/opengles/EGLImageOES.java"/>
<!-- OpenCL -->
<include name="org/lwjgl/opencl/CLPlatform.java"/>
<include name="org/lwjgl/opencl/CLDevice.java"/>
@@ -45,10 +48,16 @@
</target>
<!-- Proxy target to generate it all -->
- <target name="generate-all" depends="generate-openal, generate-opengl, generate-opengl-capabilities, generate-opengl-references, generate-opencl, generate-opencl-capabilities" description="Generates java and native source"/>
+ <target name="generate-all" depends="generate-openal, generate-opengl, generate-opengl-capabilities, generate-opengl-references, generate-opengles, generate-opengles-capabilities, generate-opencl, generate-opencl-capabilities" description="Generates java and native source"/>
<target name="generate-debug" depends="generate-openal-debug, generate-opengl-debug, generate-opengl-capabilities-debug, generate-opengl-references, generate-opencl-debug, generate-opencl-capabilities-debug" description="Generates java and native source with debug functionality"/>
+ <!-- ********************************************************************************
+ *********************************************************************************
+ OPENAL
+ *********************************************************************************
+ **************************************************************************** -->
+
<!-- Generate OpenAL -->
<target name="generate-openal" depends="generators" description="Generates java and native source for AL">
<apply executable="apt" parallel="true">
@@ -60,7 +69,7 @@
<arg value="-s"/>
<arg path="${lwjgl.src}/generated"/>
<arg value="-d"/>
- <arg path="${lwjgl.src.native}/generated"/>
+ <arg path="${lwjgl.src.native}/generated/openal"/>
<arg value="-Atypemap=org.lwjgl.util.generator.openal.ALTypeMap"/>
<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/openal/AL10.java, org/lwjgl/openal/AL11.java, org/lwjgl/openal/EFX10.java"/>
</apply>
@@ -77,13 +86,19 @@
<arg value="-s"/>
<arg path="${lwjgl.src}/generated"/>
<arg value="-d"/>
- <arg path="${lwjgl.src.native}/generated"/>
+ <arg path="${lwjgl.src.native}/generated/openal"/>
<arg value="-Atypemap=org.lwjgl.util.generator.openal.ALTypeMap"/>
<arg value="-Ageneratechecks"/>
<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/openal/AL10.java, org/lwjgl/openal/AL11.java, org/lwjgl/openal/EFX10.java"/>
</apply>
</target>
+ <!-- ********************************************************************************
+ *********************************************************************************
+ OPENGL
+ *********************************************************************************
+ **************************************************************************** -->
+
<!-- Generate OpenGL -->
<target name="generate-opengl" depends="generators" description="Generates java and native source for GL">
<apply executable="apt" parallel="true">
@@ -95,7 +110,7 @@
<arg value="-s"/>
<arg path="${lwjgl.src}/generated"/>
<arg value="-d"/>
- <arg path="${lwjgl.src.native}/generated"/>
+ <arg path="${lwjgl.src.native}/generated/opengl"/>
<arg value="-Acontextspecific"/>
<arg value="-Atypemap=org.lwjgl.util.generator.opengl.GLTypeMap"/>
<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>
@@ -103,7 +118,7 @@
</target>
<!-- Generate OpenGL [DEBUG] -->
- <target name="generate-opengl-debug" depends="generators" description="Generates java and native source for GL">
+ <target name="generate-opengl-debug" depends="generators" description="Generates debug java and native source for GL">
<apply executable="apt" parallel="true">
<arg value="-nocompile"/>
<arg value="-factory"/>
@@ -113,7 +128,7 @@
<arg value="-s"/>
<arg path="${lwjgl.src}/generated"/>
<arg value="-d"/>
- <arg path="${lwjgl.src.native}/generated"/>
+ <arg path="${lwjgl.src.native}/generated/opengl"/>
<arg value="-Ageneratechecks"/>
<arg value="-Acontextspecific"/>
<arg value="-Atypemap=org.lwjgl.util.generator.opengl.GLTypeMap"/>
@@ -151,7 +166,7 @@
</target>
<!-- Generate OpenGL context capabilities [DEBUG] -->
- <target name="generate-opengl-capabilities-debug" depends="generators" description="Generates java and native source for GL">
+ <target name="generate-opengl-capabilities-debug" depends="generators" description="Generates debug java and native source for GL">
<apply executable="apt" parallel="true">
<arg value="-nocompile"/>
<arg value="-factory"/>
@@ -166,7 +181,87 @@
</apply>
</target>
- <!-- Generate OpenCL -->
+ <!-- ********************************************************************************
+ *********************************************************************************
+ OPENGL ES
+ *********************************************************************************
+ **************************************************************************** -->
+
+ <!-- Generate OpenGL ES -->
+ <target name="generate-opengles" depends="generators" description="Generates java and native source for GL ES">
+ <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/opengles"/>
+ <!--<arg value="-Acontextspecific"/>-->
+ <arg value="-Atypemap=org.lwjgl.util.generator.opengl.GLESTypeMap"/>
+ <fileset dir="${lwjgl.src.templates}" includes="${opengles-template-pattern}"/>
+ </apply>
+ </target>
+
+ <!-- Generate OpenGL ES [DEBUG] -->
+ <target name="generate-opengles-debug" depends="generators" description="Generates debug java and native source for GL ES">
+ <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/opengles"/>
+ <arg value="-Ageneratechecks"/>
+ <!--<arg value="-Acontextspecific"/>-->
+ <arg value="-Atypemap=org.lwjgl.util.generator.opengl.GLESTypeMap"/>
+ <fileset dir="${lwjgl.src.templates}" includes="${opengles-template-pattern}"/>
+ </apply>
+ </target>
+
+ <!-- Generate OpenGL ES context capabilities -->
+ <target name="generate-opengles-capabilities" depends="generators" description="Generates java and native source for GL ES">
+ <apply executable="apt" parallel="true">
+ <arg value="-nocompile"/>
+ <arg value="-factory"/>
+ <arg value="org.lwjgl.util.generator.opengl.GLESGeneratorProcessorFactory"/>
+ <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="-Acontextspecific"/>-->
+ <fileset dir="${lwjgl.src.templates}" includes="${opengles-template-pattern}"/>
+ </apply>
+ </target>
+
+ <!-- Generate OpenGL ES context capabilities [DEBUG] -->
+ <target name="generate-opengles-capabilities-debug" depends="generators" description="Generates debug java and native source for GL ES">
+ <apply executable="apt" parallel="true">
+ <arg value="-nocompile"/>
+ <arg value="-factory"/>
+ <arg value="org.lwjgl.util.generator.opengl.GLESGeneratorProcessorFactory"/>
+ <arg value="-cp"/>
+ <arg path="${lwjgl.src}/java:${lwjgl.src.templates}:${lwjgl.bin}:${java.class.path}"/>
+ <arg value="-s"/>
+ <arg path="${lwjgl.src}/generated"/>
+ <arg value="-Ageneratechecks"/>
+ <!--<arg value="-Acontextspecific"/>-->
+ <fileset dir="${lwjgl.src.templates}" includes="${opengles-template-pattern}"/>
+ </apply>
+ </target>
+
+ <!-- ********************************************************************************
+ *********************************************************************************
+ OPENCL
+ *********************************************************************************
+ **************************************************************************** -->
+
+ <!-- Generate OpenCL -->
<target name="generate-opencl" depends="generators" description="Generates java and native source for CL">
<apply executable="apt" parallel="true">
<arg value="-nocompile"/>
@@ -177,7 +272,7 @@
<arg value="-s"/>
<arg path="${lwjgl.src}/generated"/>
<arg value="-d"/>
- <arg path="${lwjgl.src.native}/generated"/>
+ <arg path="${lwjgl.src.native}/generated/opencl"/>
<arg value="-Acontextspecific"/>
<arg value="-Atypemap=org.lwjgl.util.generator.opencl.CLTypeMap"/>
<fileset dir="${lwjgl.src.templates}" includes="${opencl-template-pattern}"/>
@@ -185,7 +280,7 @@
</target>
<!-- Generate OpenCL [DEBUG] -->
- <target name="generate-opencl-debug" depends="generators" description="Generates java and native source for CL">
+ <target name="generate-opencl-debug" depends="generators" description="Generates debug java and native source for CL">
<apply executable="apt" parallel="true">
<arg value="-nocompile"/>
<arg value="-factory"/>
@@ -195,7 +290,7 @@
<arg value="-s"/>
<arg path="${lwjgl.src}/generated"/>
<arg value="-d"/>
- <arg path="${lwjgl.src.native}/generated"/>
+ <arg path="${lwjgl.src.native}/generated/opencl"/>
<arg value="-Ageneratechecks"/>
<arg value="-Acontextspecific"/>
<arg value="-Atypemap=org.lwjgl.util.generator.opencl.CLTypeMap"/>
@@ -219,7 +314,7 @@
</target>
<!-- Generate OpenCL capabilities [DEBUG] -->
- <target name="generate-opencl-capabilities-debug" depends="generators" description="Generates capabilities for CL">
+ <target name="generate-opencl-capabilities-debug" depends="generators" description="Generates debug capabilities for CL">
<apply executable="apt" parallel="true">
<arg value="-nocompile"/>
<arg value="-factory"/>
Modified: trunk/LWJGL/platform_build/linux_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build.xml 2011-07-10 10:26:36 UTC (rev 3560)
+++ trunk/LWJGL/platform_build/linux_ant/build.xml 2011-07-10 16:58:16 UTC (rev 3561)
@@ -73,12 +73,18 @@
<arg value="-I${java.home}/../include/linux"/>
<arg value="-I${java.home}/../include/solaris"/>
<arg value="-I${native}/common"/>
+ <arg value="-I${native}/common/opengl"/>
<arg value="-I${native}/linux"/>
+ <arg value="-I${native}/linux/opengl"/>
<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>
+ <fileset dir="${native}/common" includes="*.c"/>
+ <fileset dir="${native}/common/opengl" includes="*.c"/>
+ <fileset dir="${native}/generated/openal" includes="*.c"/>
+ <fileset dir="${native}/generated/opencl" includes="*.c"/>
+ <fileset dir="${native}/generated/opengl" includes="*.c"/>
+ <fileset dir="${native}/linux" includes="*.c"/>
+ <fileset dir="${native}/linux/opengl" includes="*.c"/>
+ </apply>
<apply dir="." parallel="true" executable="gcc" failonerror="true">
<srcfile/>
<arg line="${linker_flags32}"/>
@@ -99,12 +105,16 @@
<arg value="-I${java.home}/../include/linux"/>
<arg value="-I${java.home}/../include/solaris"/>
<arg value="-I${native}/common"/>
+ <arg value="-I${native}/common/opengl"/>
<arg value="-I${native}/linux"/>
+ <arg value="-I${native}/linux/opengl"/>
<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>
+ <fileset dir="${native}/common" includes="*.c"/>
+ <fileset dir="${native}/common/opengl" includes="*.c"/>
+ <fileset dir="${native}/generated/opengl" includes="*.c"/>
+ <fileset dir="${native}/linux" includes="*.c"/>
+ <fileset dir="${native}/linux/opengl" includes="*.c"/>
+ </apply>
<apply dir="." parallel="true" executable="gcc" failonerror="true">
<srcfile/>
<arg line="${linker_flags64}"/>
Copied: trunk/LWJGL/platform_build/linux_ant/build_es.xml (from rev 3560, branches/opengles/LWJGL/platform_build/linux_ant/build_es.xml)
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build_es.xml (rev 0)
+++ trunk/LWJGL/platform_build/linux_ant/build_es.xml 2011-07-10 16:58:16 UTC (rev 3561)
@@ -0,0 +1,127 @@
+<?xml version="1.0"?>
+
+<project name="lwjgl native code, linux" basedir="../../bin/lwjgles" default="compile">
+ <property name="native" location="../../src/native"/>
+ <property name="libname32" value="liblwjgl.so"/>
+ <property name="libname64" value="liblwjgl64.so"/>
+ <property name="libs32" value="-L/home/spasi/lwjgl/libs/linux -lEGL -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${lib_folder}/x64 -lEGL -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>
+ </target>
+
+ <target name="compile">
+ <exec executable="uname" outputproperty="hwplatform">
+ <arg value="-m"/>
+ </exec>
+ <cond...
[truncated message content] |
|
From: <sp...@us...> - 2011-07-10 10:26:43
|
Revision: 3560
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3560&view=rev
Author: spasi
Date: 2011-07-10 10:26:36 +0000 (Sun, 10 Jul 2011)
Log Message:
-----------
Merge preparation.
Modified Paths:
--------------
branches/opengles/LWJGL/src/java/org/lwjgl/opencl/CallbackUtil.java
branches/opengles/LWJGL/src/native/common/extcl.h
branches/opengles/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.c
Modified: branches/opengles/LWJGL/src/java/org/lwjgl/opencl/CallbackUtil.java
===================================================================
--- branches/opengles/LWJGL/src/java/org/lwjgl/opencl/CallbackUtil.java 2011-07-10 00:31:16 UTC (rev 3559)
+++ branches/opengles/LWJGL/src/java/org/lwjgl/opencl/CallbackUtil.java 2011-07-10 10:26:36 UTC (rev 3560)
@@ -107,14 +107,13 @@
* @param user_data the global reference pointer
*/
static void registerCallback(final CLContext context, final long user_data) {
- if ( context.getPointerUnsafe() == 0 ) {
- if ( user_data != 0 )
- deleteGlobalRef(user_data);
+ if ( user_data == 0 )
return;
- }
- if ( user_data != 0 )
+ if ( context.isValid() )
contextUserData.put(context, user_data);
+ else
+ deleteGlobalRef(user_data);
}
/**
Modified: branches/opengles/LWJGL/src/native/common/extcl.h
===================================================================
--- branches/opengles/LWJGL/src/native/common/extcl.h 2011-07-10 00:31:16 UTC (rev 3559)
+++ branches/opengles/LWJGL/src/native/common/extcl.h 2011-07-10 10:26:36 UTC (rev 3560)
@@ -59,18 +59,11 @@
#define CL_CALLBACK
#endif
-// TODO: This is a bug in current CL implementations (AMD's only?), remove when fixed. (used for cl_native_kernel_func)
-#if defined(_WIN32)
- #define CL_USER_FUNC_CALLBACK __cdecl
-#else
- #define CL_USER_FUNC_CALLBACK CL_CALLBACK
-#endif
-
typedef void (CL_CALLBACK * cl_create_context_callback)(const char *errinfo, const void *private_info, size_t cb, void *user_data);
typedef void (CL_CALLBACK * cl_mem_object_destructor_callback)(cl_mem memobj, void *user_data);
typedef void (CL_CALLBACK * cl_build_program_callback)(cl_program program, void *user_data);
typedef void (CL_CALLBACK * cl_event_callback)(cl_event event, cl_int event_command_exec_status, void *user_data);
-typedef void (CL_USER_FUNC_CALLBACK * cl_native_kernel_func)(void *args);
+typedef void (CL_CALLBACK * cl_native_kernel_func)(void *args);
// -----------------[ Cross-platform functions ]-----------------
Modified: branches/opengles/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.c
===================================================================
--- branches/opengles/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.c 2011-07-10 00:31:16 UTC (rev 3559)
+++ branches/opengles/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.c 2011-07-10 10:26:36 UTC (rev 3560)
@@ -142,7 +142,7 @@
// ----------------- [ NATIVE KERNEL CALLBACK ] -----------------
-static void CL_USER_FUNC_CALLBACK nativeKernelCallback(void *args) {
+static void CL_CALLBACK nativeKernelCallback(void *args) {
JNIEnv *env = attachCurrentThread();
jobject user_func = (jobject)(intptr_t)*(jlong *)args;
jint num_mem_objects = *(jint *)((char *)args + 8);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-07-10 00:31:22
|
Revision: 3559
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3559&view=rev
Author: kappa1
Date: 2011-07-10 00:31:16 +0000 (Sun, 10 Jul 2011)
Log Message:
-----------
minor update to comments and add missing JavaDoc
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2011-07-09 21:56:22 UTC (rev 3558)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2011-07-10 00:31:16 UTC (rev 3559)
@@ -956,8 +956,8 @@
* in xembed mode. Every xembed embedder window has a focus proxy
* window that recieves all the input. This method will test whether
* the provided window handle is the focus proxy, if so it will get its
- * parent window and then test whether this is indeed the window that
- * belongs to our current_window. If so then parent window is active.
+ * parent window and then test whether this is an ancestor to our
+ * current_window. If so then parent window is active.
*
* @param window - the window handle to test
*/
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2011-07-09 21:56:22 UTC (rev 3558)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2011-07-10 00:31:16 UTC (rev 3559)
@@ -120,6 +120,9 @@
* <li>al_windows32 - [String] If specifed it will be used instead of al_windows on 32bit windows systems.</li>
* <li>al_linux64 - [String] If specifed it will be used instead of al_linux on 64bit linux systems.</li>
* <li>al_linux32 - [String] If specifed it will be used instead of al_linux on 32bit linux systems.</li>
+ * <li>al_mac32 - [String] If specifed it will be used instead of al_mac on 64bit mac systems.</li>
+ * <li>al_mac64 - [String] If specifed it will be used instead of al_mac on 32bit mac systems.</li>
+ * <li>al_macppc - [String] If specifed it will be used instead of al_mac on PPC mac systems.</li>
* <p>
* <li>boxbgcolor - [String] any String AWT color ("red", "blue", etc), RGB (0-255) or hex formated color (#RRGGBB) to use as background. <i>Default: #ffffff</i>.</li>
* <li>boxfgcolor - [String] any String AWT color ("red", "blue", etc), RGB (0-255) or hex formated color (#RRGGBB) to use as foreground. <i>Default: #000000</i>.</li>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2011-07-09 21:56:28
|
Revision: 3558
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3558&view=rev
Author: spasi
Date: 2011-07-09 21:56:22 +0000 (Sat, 09 Jul 2011)
Log Message:
-----------
Removed __cdecl workaround.
Modified Paths:
--------------
trunk/LWJGL/src/native/common/extcl.h
trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.c
Modified: trunk/LWJGL/src/native/common/extcl.h
===================================================================
--- trunk/LWJGL/src/native/common/extcl.h 2011-07-09 10:20:48 UTC (rev 3557)
+++ trunk/LWJGL/src/native/common/extcl.h 2011-07-09 21:56:22 UTC (rev 3558)
@@ -59,18 +59,11 @@
#define CL_CALLBACK
#endif
-// TODO: This is a bug in current CL implementations (AMD's only?), remove when fixed. (used for cl_native_kernel_func)
-#if defined(_WIN32)
- #define CL_USER_FUNC_CALLBACK __cdecl
-#else
- #define CL_USER_FUNC_CALLBACK CL_CALLBACK
-#endif
-
typedef void (CL_CALLBACK * cl_create_context_callback)(const char *errinfo, const void *private_info, size_t cb, void *user_data);
typedef void (CL_CALLBACK * cl_mem_object_destructor_callback)(cl_mem memobj, void *user_data);
typedef void (CL_CALLBACK * cl_build_program_callback)(cl_program program, void *user_data);
typedef void (CL_CALLBACK * cl_event_callback)(cl_event event, cl_int event_command_exec_status, void *user_data);
-typedef void (CL_USER_FUNC_CALLBACK * cl_native_kernel_func)(void *args);
+typedef void (CL_CALLBACK * cl_native_kernel_func)(void *args);
// -----------------[ Cross-platform functions ]-----------------
Modified: trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.c
===================================================================
--- trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.c 2011-07-09 10:20:48 UTC (rev 3557)
+++ trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.c 2011-07-09 21:56:22 UTC (rev 3558)
@@ -142,7 +142,7 @@
// ----------------- [ NATIVE KERNEL CALLBACK ] -----------------
-static void CL_USER_FUNC_CALLBACK nativeKernelCallback(void *args) {
+static void CL_CALLBACK nativeKernelCallback(void *args) {
JNIEnv *env = attachCurrentThread();
jobject user_func = (jobject)(intptr_t)*(jlong *)args;
jint num_mem_objects = *(jint *)((char *)args + 8);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2011-07-09 10:20:55
|
Revision: 3557
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3557&view=rev
Author: spasi
Date: 2011-07-09 10:20:48 +0000 (Sat, 09 Jul 2011)
Log Message:
-----------
Added support for EXT_framebuffer_multisample_blit_scaled.
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_multisample_blit_scaled.java
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_multisample_blit_scaled.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_multisample_blit_scaled.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_multisample_blit_scaled.java 2011-07-09 10:20:48 UTC (rev 3557)
@@ -0,0 +1,40 @@
+/*
+ * 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 EXT_framebuffer_multisample_blit_scaled {
+
+ /** Accepted by the <filter> parameter of BlitFramebuffer: */
+ int GL_SCALED_RESOLVE_FASTEST_EXT = 0x90BA,
+ GL_SCALED_RESOLVE_NICEST_EXT = 0x90BB;
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-07-08 17:47:22
|
Revision: 3556
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3556&view=rev
Author: kappa1
Date: 2011-07-08 17:47:16 +0000 (Fri, 08 Jul 2011)
Log Message:
-----------
Remove dead code from AWTGears example
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTGears.java
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTGears.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTGears.java 2011-07-02 20:50:27 UTC (rev 3555)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTGears.java 2011-07-08 17:47:16 UTC (rev 3556)
@@ -35,18 +35,9 @@
import java.awt.Color;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.nio.FloatBuffer;
-import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
-import org.lwjgl.LWJGLUtil;
-import org.lwjgl.Sys;
-import org.lwjgl.opengl.AWTGLCanvas;
-import org.lwjgl.opengl.GLContext;
-import static org.lwjgl.opengl.ARBTransposeMatrix.*;
-import static org.lwjgl.opengl.GL11.*;
-
/**
* <p>
* AWT version of the gears demo
@@ -57,23 +48,6 @@
*/
public class AWTGears extends Frame {
- /** AWT GL canvas */
- private AWTGLCanvas canvas0;
-
- private float view_rotx = 20.0f;
-
- private float view_roty = 30.0f;
-
- private float view_rotz;
-
- private int gear1;
-
- private int gear2;
-
- private int gear3;
-
- private float angle;
-
/**
* C'tor
*/
@@ -94,185 +68,6 @@
setVisible(true);
}
- private void setup() {
- // setup ogl
- FloatBuffer pos = BufferUtils.createFloatBuffer(4).put(new float[] { 5.0f, 5.0f, 10.0f, 0.0f});
- FloatBuffer red = BufferUtils.createFloatBuffer(4).put(new float[] { 0.8f, 0.1f, 0.0f, 1.0f});
- FloatBuffer green = BufferUtils.createFloatBuffer(4).put(new float[] { 0.0f, 0.8f, 0.2f, 1.0f});
- FloatBuffer blue = BufferUtils.createFloatBuffer(4).put(new float[] { 0.2f, 0.2f, 1.0f, 1.0f});
- pos.flip();
- red.flip();
- green.flip();
- blue.flip();
-
- glLight(GL_LIGHT0, GL_POSITION, pos);
- glEnable(GL_CULL_FACE);
- glEnable(GL_LIGHTING);
- glEnable(GL_LIGHT0);
- glEnable(GL_DEPTH_TEST);
-
- /* make the gears */
- gear1 = glGenLists(1);
- glNewList(gear1, GL_COMPILE);
- glMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, red);
- gear(1.0f, 4.0f, 1.0f, 20, 0.7f);
- glEndList();
-
- gear2 = glGenLists(1);
- glNewList(gear2, GL_COMPILE);
- glMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, green);
- gear(0.5f, 2.0f, 2.0f, 10, 0.7f);
- glEndList();
-
- gear3 = glGenLists(1);
- glNewList(gear3, GL_COMPILE);
- glMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, blue);
- gear(1.3f, 2.0f, 0.5f, 10, 0.7f);
- glEndList();
-
- glEnable(GL_NORMALIZE);
-
- glMatrixMode(GL_PROJECTION);
-
- System.err.println("LWJGL: " + Sys.getVersion() + " / " + LWJGLUtil.getPlatformName());
- System.err.println("GL_VENDOR: " + glGetString(GL_VENDOR));
- System.err.println("GL_RENDERER: " + glGetString(GL_RENDERER));
- System.err.println("GL_VERSION: " + glGetString(GL_VERSION));
- System.err.println();
- System.err.println("glLoadTransposeMatrixfARB() supported: " + GLContext.getCapabilities().GL_ARB_transpose_matrix);
- if (!GLContext.getCapabilities().GL_ARB_transpose_matrix) {
- // --- not using extensions
- glLoadIdentity();
- } else {
- // --- using extensions
- final FloatBuffer identityTranspose = BufferUtils.createFloatBuffer(16).put(
- new float[] { 1, 0, 0, 0, 0, 1, 0, 0,
- 0, 0, 1, 0, 0, 0, 0, 1});
- identityTranspose.flip();
- glLoadTransposeMatrixARB(identityTranspose);
- }
-
- float h = (float) 300 / (float) 300;
- glFrustum(-1.0f, 1.0f, -h, h, 5.0f, 60.0f);
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
- glTranslatef(0.0f, 0.0f, -40.0f);
- }
-
- /**
- * Draw a gear wheel. You'll probably want to call this function when
- * building a display list since we do a lot of trig here.
- *
- * @param inner_radius radius of hole at center
- * @param outer_radius radius at center of teeth
- * @param width width of gear
- * @param teeth number of teeth
- * @param tooth_depth depth of tooth
- */
- private void gear(float inner_radius, float outer_radius, float width, int teeth, float tooth_depth) {
- int i;
- float r0, r1, r2;
- float angle, da;
- float u, v, len;
-
- r0 = inner_radius;
- r1 = outer_radius - tooth_depth / 2.0f;
- r2 = outer_radius + tooth_depth / 2.0f;
-
- da = 2.0f * (float) Math.PI / teeth / 4.0f;
-
- glShadeModel(GL_FLAT);
-
- glNormal3f(0.0f, 0.0f, 1.0f);
-
- /* draw front face */
- glBegin(GL_QUAD_STRIP);
- for (i = 0; i <= teeth; i++) {
- angle = i * 2.0f * (float) Math.PI / teeth;
- glVertex3f(r0 * (float) Math.cos(angle), r0 * (float) Math.sin(angle), width * 0.5f);
- glVertex3f(r1 * (float) Math.cos(angle), r1 * (float) Math.sin(angle), width * 0.5f);
- if (i < teeth) {
- glVertex3f(r0 * (float) Math.cos(angle), r0 * (float) Math.sin(angle), width * 0.5f);
- glVertex3f(r1 * (float) Math.cos(angle + 3.0f * da), r1 * (float) Math.sin(angle + 3.0f * da),
- width * 0.5f);
- }
- }
- glEnd();
-
- /* draw front sides of teeth */
- glBegin(GL_QUADS);
- for (i = 0; i < teeth; i++) {
- angle = i * 2.0f * (float) Math.PI / teeth;
- glVertex3f(r1 * (float) Math.cos(angle), r1 * (float) Math.sin(angle), width * 0.5f);
- glVertex3f(r2 * (float) Math.cos(angle + da), r2 * (float) Math.sin(angle + da), width * 0.5f);
- glVertex3f(r2 * (float) Math.cos(angle + 2.0f * da), r2 * (float) Math.sin(angle + 2.0f * da), width * 0.5f);
- glVertex3f(r1 * (float) Math.cos(angle + 3.0f * da), r1 * (float) Math.sin(angle + 3.0f * da), width * 0.5f);
- }
- glEnd();
-
- /* draw back face */
- glBegin(GL_QUAD_STRIP);
- for (i = 0; i <= teeth; i++) {
- angle = i * 2.0f * (float) Math.PI / teeth;
- glVertex3f(r1 * (float) Math.cos(angle), r1 * (float) Math.sin(angle), -width * 0.5f);
- glVertex3f(r0 * (float) Math.cos(angle), r0 * (float) Math.sin(angle), -width * 0.5f);
- glVertex3f(r1 * (float) Math.cos(angle + 3 * da), r1 * (float) Math.sin(angle + 3 * da), -width * 0.5f);
- glVertex3f(r0 * (float) Math.cos(angle), r0 * (float) Math.sin(angle), -width * 0.5f);
- }
- glEnd();
-
- /* draw back sides of teeth */
- glBegin(GL_QUADS);
- for (i = 0; i < teeth; i++) {
- angle = i * 2.0f * (float) Math.PI / teeth;
- glVertex3f(r1 * (float) Math.cos(angle + 3 * da), r1 * (float) Math.sin(angle + 3 * da), -width * 0.5f);
- glVertex3f(r2 * (float) Math.cos(angle + 2 * da), r2 * (float) Math.sin(angle + 2 * da), -width * 0.5f);
- glVertex3f(r2 * (float) Math.cos(angle + da), r2 * (float) Math.sin(angle + da), -width * 0.5f);
- glVertex3f(r1 * (float) Math.cos(angle), r1 * (float) Math.sin(angle), -width * 0.5f);
- }
- glEnd();
-
- /* draw outward faces of teeth */
- glBegin(GL_QUAD_STRIP);
- for (i = 0; i < teeth; i++) {
- angle = i * 2.0f * (float) Math.PI / teeth;
- glVertex3f(r1 * (float) Math.cos(angle), r1 * (float) Math.sin(angle), width * 0.5f);
- glVertex3f(r1 * (float) Math.cos(angle), r1 * (float) Math.sin(angle), -width * 0.5f);
- u = r2 * (float) Math.cos(angle + da) - r1 * (float) Math.cos(angle);
- v = r2 * (float) Math.sin(angle + da) - r1 * (float) Math.sin(angle);
- len = (float) Math.sqrt(u * u + v * v);
- u /= len;
- v /= len;
- glNormal3f(v, -u, 0.0f);
- glVertex3f(r2 * (float) Math.cos(angle + da), r2 * (float) Math.sin(angle + da), width * 0.5f);
- glVertex3f(r2 * (float) Math.cos(angle + da), r2 * (float) Math.sin(angle + da), -width * 0.5f);
- glNormal3f((float) Math.cos(angle), (float) Math.sin(angle), 0.0f);
- glVertex3f(r2 * (float) Math.cos(angle + 2 * da), r2 * (float) Math.sin(angle + 2 * da), width * 0.5f);
- glVertex3f(r2 * (float) Math.cos(angle + 2 * da), r2 * (float) Math.sin(angle + 2 * da), -width * 0.5f);
- u = r1 * (float) Math.cos(angle + 3 * da) - r2 * (float) Math.cos(angle + 2 * da);
- v = r1 * (float) Math.sin(angle + 3 * da) - r2 * (float) Math.sin(angle + 2 * da);
- glNormal3f(v, -u, 0.0f);
- glVertex3f(r1 * (float) Math.cos(angle + 3 * da), r1 * (float) Math.sin(angle + 3 * da), width * 0.5f);
- glVertex3f(r1 * (float) Math.cos(angle + 3 * da), r1 * (float) Math.sin(angle + 3 * da), -width * 0.5f);
- glNormal3f((float) Math.cos(angle), (float) Math.sin(angle), 0.0f);
- }
- glVertex3f(r1 * (float) Math.cos(0), r1 * (float) Math.sin(0), width * 0.5f);
- glVertex3f(r1 * (float) Math.cos(0), r1 * (float) Math.sin(0), -width * 0.5f);
- glEnd();
-
- glShadeModel(GL_SMOOTH);
-
- /* draw inside radius cylinder */
- glBegin(GL_QUAD_STRIP);
- for (i = 0; i <= teeth; i++) {
- angle = i * 2.0f * (float) Math.PI / teeth;
- glNormal3f(-(float) Math.cos(angle), -(float) Math.sin(angle), 0.0f);
- glVertex3f(r0 * (float) Math.cos(angle), r0 * (float) Math.sin(angle), -width * 0.5f);
- glVertex3f(r0 * (float) Math.cos(angle), r0 * (float) Math.sin(angle), width * 0.5f);
- }
- glEnd();
- }
-
public static void main(String[] args) throws LWJGLException {
new AWTGears();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-07-02 20:50:33
|
Revision: 3555
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3555&view=rev
Author: kappa1
Date: 2011-07-02 20:50:27 +0000 (Sat, 02 Jul 2011)
Log Message:
-----------
LinuxDisplay - fix remaining issues with focus handling when running in xembed mode.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2011-06-26 11:50:23 UTC (rev 3554)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2011-07-02 20:50:27 UTC (rev 3555)
@@ -136,11 +136,14 @@
private boolean close_requested;
private long current_cursor;
private long blank_cursor;
+ private boolean mouseInside = true;
+
private Canvas parent;
private long parent_window;
private boolean xembedded;
- private boolean parent_focus;
- private boolean mouseInside = true;
+ private long parent_proxy_focus_window;
+ private boolean parent_focused;
+ private long last_window_focus = 0;
private LinuxKeyboard keyboard;
private LinuxMouse mouse;
@@ -148,12 +151,12 @@
private final FocusListener focus_listener = new FocusListener() {
public void focusGained(FocusEvent e) {
synchronized (GlobalLock.lock) {
- focused = true;
+ parent_focused = true;
}
}
public void focusLost(FocusEvent e) {
synchronized (GlobalLock.lock) {
- focused = false;
+ parent_focused = false;
}
}
};
@@ -460,9 +463,7 @@
if (parent != null) {
parent.addFocusListener(focus_listener);
if (parent.isFocusOwner()) {
- nGrabKeyboard(getDisplay(), current_window);
- focused = true;
- input_released = false;
+ parent_focused = true;
}
}
} finally {
@@ -480,9 +481,12 @@
private static native long getRootWindow(long display, int screen);
private static native boolean hasProperty(long display, long window, long property);
private static native long getParentWindow(long display, long window) throws LWJGLException;
+ private static native int getChildCount(long display, long window) throws LWJGLException;
private static native void mapRaised(long display, long window);
private static native void reparentWindow(long display, long window, long parent, int x, int y);
-
+ private static native long nGetInputFocus(long display) throws LWJGLException;
+ private static native void nSetInputFocus(long display, long window, long time);
+
private static boolean isAncestorXEmbedded(long window) throws LWJGLException {
long xembed_atom = internAtom("_XEMBED_INFO", true);
if (xembed_atom != None) {
@@ -743,8 +747,6 @@
return peer_info;
}
- static native void setInputFocus(long display, long window, long time);
-
private void relayEventToParent(LinuxEvent event_buffer, int event_mask) {
tmp_event_buffer.copyFrom(event_buffer);
tmp_event_buffer.setWindow(parent_window);
@@ -900,22 +902,97 @@
unlockAWT();
}
}
-
+
private void checkInput() {
if (parent == null) return;
- if (focused != keyboard_grabbed) {
- if (focused) {
- grabKeyboard();
- input_released = false;
+ if (xembedded) {
+ long current_focus_window = 0;
+
+ try {
+ current_focus_window = nGetInputFocus(getDisplay());
+ } catch (LWJGLException e) {
+ return; // fail silently as it can fail whilst splitting browser tabs
}
- else {
- ungrabKeyboard();
- input_released = true;
+
+ if (last_window_focus != current_focus_window || parent_focused != focused) {
+ if (isParentWindowActive(current_focus_window)) {
+ if (parent_focused) {
+ nSetInputFocus(getDisplay(), current_window, CurrentTime);
+ last_window_focus = current_window;
+ focused = true;
+ }
+ else {
+ // return focus to the parent proxy focus window
+ nSetInputFocus(getDisplay(), parent_proxy_focus_window, CurrentTime);
+ last_window_focus = parent_proxy_focus_window;
+ focused = false;
+ }
+ }
+ else {
+ last_window_focus = current_focus_window;
+ focused = false;
+ }
}
}
+ else {
+ if (parent_focused != keyboard_grabbed) {
+ if (parent_focused) {
+ grabKeyboard();
+ input_released = false;
+ focused = true;
+ }
+ else {
+ ungrabKeyboard();
+ input_released = true;
+ focused = false;
+ }
+ }
+ }
}
+ /**
+ * This method will check if the parent window is active when running
+ * in xembed mode. Every xembed embedder window has a focus proxy
+ * window that recieves all the input. This method will test whether
+ * the provided window handle is the focus proxy, if so it will get its
+ * parent window and then test whether this is indeed the window that
+ * belongs to our current_window. If so then parent window is active.
+ *
+ * @param window - the window handle to test
+ */
+ private boolean isParentWindowActive(long window) {
+ try {
+ // parent window already active as window is current_window
+ if (window == current_window) return true;
+
+ // xembed focus proxy will have no children
+ if (getChildCount(getDisplay(), window) != 0) return false;
+
+ // get parent, will be xembed embedder window and ancestor of current_window
+ long parent_window = getParentWindow(getDisplay(), window);
+
+ // parent must not be None
+ if (parent_window == None) return false;
+
+ // scroll current_window's ancestors to find parent_window
+ long w = current_window;
+
+ while (w != None) {
+ w = getParentWindow(getDisplay(), w);
+ if (w == parent_window) {
+ parent_proxy_focus_window = window; // save focus proxy window
+ return true;
+ }
+ }
+ } catch (LWJGLException e) {
+ LWJGLUtil.log("Failed to detect if parent window is active: " + e.getMessage());
+ return true; // on failure assume still active
+ }
+
+ return false; // failed to find an active parent window
+ }
+
private void setFocused(boolean got_focus, int focus_detail) {
if (focused == got_focus || focus_detail == NotifyDetailNone || focus_detail == NotifyPointer || focus_detail == NotifyPointerRoot || parent != null)
return;
@@ -928,8 +1005,6 @@
releaseInput();
}
}
-
- static native long nGetInputFocus(long display);
private void releaseInput() {
if (isLegacyFullscreen() || input_released)
Modified: trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c 2011-06-26 11:50:23 UTC (rev 3554)
+++ trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c 2011-07-02 20:50:27 UTC (rev 3555)
@@ -380,6 +380,22 @@
return parent;
}
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_LinuxDisplay_getChildCount(JNIEnv *env, jclass unused, jlong display, jlong window_ptr) {
+ Display *disp = (Display *)(intptr_t)display;
+ Window window = (Window)window_ptr;
+ Window root, parent;
+ Window *children;
+ unsigned int nchildren;
+ if (XQueryTree(disp, window, &root, &parent, &children, &nchildren) == 0) {
+ throwException(env, "XQueryTree failed");
+ return None;
+ }
+ if (children != NULL)
+ XFree(children);
+
+ return nchildren;
+}
+
JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_LinuxDisplay_hasProperty(JNIEnv *env, jclass unusued, jlong display, jlong window_ptr, jlong property_ptr) {
Display *disp = (Display *)(intptr_t)display;
Window window = (Window)window_ptr;
@@ -399,7 +415,15 @@
return result;
}
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_setInputFocus(JNIEnv *env, jclass clazz, jlong display, jlong window_ptr, jlong time) {
+JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nGetInputFocus(JNIEnv *env, jclass unused, jlong display_ptr) {
+ Display *disp = (Display *)(intptr_t)display_ptr;
+ int revert_mode;
+ Window win;
+ XGetInputFocus(disp, &win, &revert_mode);
+ return win;
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nSetInputFocus(JNIEnv *env, jclass clazz, jlong display, jlong window_ptr, jlong time) {
Display *disp = (Display *)(intptr_t)display;
Window window = (Window)window_ptr;
XSetInputFocus(disp, window, RevertToParent, time);
@@ -574,14 +598,6 @@
return cursor;
}
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nGetInputFocus(JNIEnv *env, jclass unused, jlong display_ptr) {
- Display *disp = (Display *)(intptr_t)display_ptr;
- int revert_mode;
- Window win;
- XGetInputFocus(disp, &win, &revert_mode);
- return win;
-}
-
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nIconifyWindow(JNIEnv *env, jclass unused, jlong display_ptr, jlong window_ptr, jint screen) {
Display *disp = (Display *)(intptr_t)display_ptr;
Window win = (Window)window_ptr;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-06-26 11:50:29
|
Revision: 3554
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3554&view=rev
Author: kappa1
Date: 2011-06-26 11:50:23 +0000 (Sun, 26 Jun 2011)
Log Message:
-----------
Fix small race condition in LinuxDisplay when focusing in and out really fast.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2011-06-26 02:18:53 UTC (rev 3553)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2011-06-26 11:50:23 UTC (rev 3554)
@@ -148,16 +148,12 @@
private final FocusListener focus_listener = new FocusListener() {
public void focusGained(FocusEvent e) {
synchronized (GlobalLock.lock) {
- nGrabKeyboard(getDisplay(), current_window);
focused = true;
- input_released = false;
}
}
public void focusLost(FocusEvent e) {
synchronized (GlobalLock.lock) {
- nUngrabKeyboard(getDisplay());
focused = false;
- input_released = true;
}
}
};
@@ -823,6 +819,7 @@
lockAWT();
try {
processEvents();
+ checkInput();
} finally {
unlockAWT();
}
@@ -904,6 +901,21 @@
}
}
+ private void checkInput() {
+ if (parent == null) return;
+
+ if (focused != keyboard_grabbed) {
+ if (focused) {
+ grabKeyboard();
+ input_released = false;
+ }
+ else {
+ ungrabKeyboard();
+ input_released = true;
+ }
+ }
+ }
+
private void setFocused(boolean got_focus, int focus_detail) {
if (focused == got_focus || focus_detail == NotifyDetailNone || focus_detail == NotifyPointer || focus_detail == NotifyPointerRoot || parent != null)
return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-06-26 02:19:00
|
Revision: 3553
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3553&view=rev
Author: kappa1
Date: 2011-06-26 02:18:53 +0000 (Sun, 26 Jun 2011)
Log Message:
-----------
AppletLoader: revert native file certificate validation to after extraction as it was failing if done before.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2011-06-26 01:42:34 UTC (rev 3552)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2011-06-26 02:18:53 UTC (rev 3553)
@@ -1662,9 +1662,6 @@
InputStream in = jarFile.getInputStream(jarFile.getEntry(entry.getName()));
OutputStream out = new FileOutputStream(path + "natives" + File.separator + entry.getName());
- // validate if the certificate for native file is correct before extracting
- validateCertificateChain(certificate, entry.getCertificates());
-
int bufferSize;
byte buffer[] = new byte[65536];
@@ -1680,6 +1677,9 @@
in.close();
out.close();
+
+ // validate if the certificate for native file
+ validateCertificateChain(certificate, entry.getCertificates());
}
subtaskMessage = "";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-06-26 01:42:40
|
Revision: 3552
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3552&view=rev
Author: kappa1
Date: 2011-06-26 01:42:34 +0000 (Sun, 26 Jun 2011)
Log Message:
-----------
Proper fix for Linux focus handling with setParent(Canvas), no more hacks or messing with EDT. Side effect being LWJGL applet focus handling should work perfectly now.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2011-06-24 18:34:10 UTC (rev 3551)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2011-06-26 01:42:34 UTC (rev 3552)
@@ -39,6 +39,9 @@
*/
import java.awt.Canvas;
+import java.awt.event.FocusListener;
+import java.awt.event.FocusEvent;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -141,6 +144,23 @@
private LinuxKeyboard keyboard;
private LinuxMouse mouse;
+
+ private final FocusListener focus_listener = new FocusListener() {
+ public void focusGained(FocusEvent e) {
+ synchronized (GlobalLock.lock) {
+ nGrabKeyboard(getDisplay(), current_window);
+ focused = true;
+ input_released = false;
+ }
+ }
+ public void focusLost(FocusEvent e) {
+ synchronized (GlobalLock.lock) {
+ nUngrabKeyboard(getDisplay());
+ focused = false;
+ input_released = true;
+ }
+ }
+ };
private static ByteBuffer getCurrentGammaRamp() throws LWJGLException {
lockAWT();
@@ -441,6 +461,14 @@
grab = false;
minimized = false;
dirty = true;
+ if (parent != null) {
+ parent.addFocusListener(focus_listener);
+ if (parent.isFocusOwner()) {
+ nGrabKeyboard(getDisplay(), current_window);
+ focused = true;
+ input_released = false;
+ }
+ }
} finally {
peer_info.unlock();
}
@@ -795,7 +823,6 @@
lockAWT();
try {
processEvents();
- checkInput();
} finally {
unlockAWT();
}
@@ -877,64 +904,21 @@
}
}
- private void checkInput() {
- if (parent == null) return;
-
- if (parent_focus != parent.hasFocus()) {
- parent_focus = parent.hasFocus();
-
- if (parent_focus) {
- setInputFocusUnsafe(current_window);
- }
- else if (xembedded) {
- setInputFocusUnsafe(1);
- }
- }
- //else if (parent_focus && !focused && !xembedded) {
- // setInputFocusUnsafe(current_window);
- //}
- }
-
private void setFocused(boolean got_focus, int focus_detail) {
- if (focused == got_focus || focus_detail == NotifyDetailNone || focus_detail == NotifyPointer || focus_detail == NotifyPointerRoot)
+ if (focused == got_focus || focus_detail == NotifyDetailNone || focus_detail == NotifyPointer || focus_detail == NotifyPointerRoot || parent != null)
return;
focused = got_focus;
if (focused) {
acquireInput();
- if (parent != null && !xembedded) edtSetCanvasFocus(false);
}
else {
releaseInput();
- if (parent != null && !xembedded) edtSetCanvasFocus(true);
}
}
- private void edtSetCanvasFocus(final boolean focus) {
- try {
- java.awt.EventQueue.invokeAndWait(new Runnable() {
- public void run() {
- parent.setFocusable(focus);
- }
- });
- } catch (InterruptedException e) {
- } catch (InvocationTargetException e) {
- }
- }
-
static native long nGetInputFocus(long display);
- private static void setInputFocusUnsafe(long window) {
- try {
- setInputFocus(getDisplay(), window, CurrentTime);
- sync(getDisplay(), false);
- } catch (LWJGLException e) {
- // Since we don't have any event timings for XSetInputFocus, a race condition might give a BadMatch, which we'll catch and ignore
- LWJGLUtil.log("Got exception while trying to focus: " + e);
- }
- }
- private static native void sync(long display, boolean throw_away_events) throws LWJGLException;
-
private void releaseInput() {
if (isLegacyFullscreen() || input_released)
return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-06-24 18:34:17
|
Revision: 3551
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3551&view=rev
Author: matzon
Date: 2011-06-24 18:34:10 +0000 (Fri, 24 Jun 2011)
Log Message:
-----------
Applying patch from Matthias that changes the LWJGL icon from byte array to string, shaving ~20k in class size.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
Modified: trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java 2011-06-24 18:31:26 UTC (rev 3550)
+++ trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java 2011-06-24 18:34:10 UTC (rev 3551)
@@ -59,209 +59,207 @@
public static final String PLATFORM_MACOSX_NAME = "macosx";
public static final String PLATFORM_WINDOWS_NAME = "windows";
+ private static final String LWJGL_ICON_DATA_16x16 =
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\376\377\377\377\302\327\350\377" +
+ "\164\244\313\377\120\213\275\377\124\216\277\377\206\257\322\377" +
+ "\347\357\366\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\365\365\365\377\215\217\221\377\166\202\215\377" +
+ "\175\215\233\377\204\231\252\377\224\267\325\377\072\175\265\377" +
+ "\110\206\272\377\332\347\361\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\364\370\373\377\234\236\240\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\344\344\344\377\204\255\320\377" +
+ "\072\175\265\377\133\222\301\377\374\375\376\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\221\266\325\377\137\137\137\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\042\042\042\377\377\377\377\377\350\360\366\377" +
+ "\071\174\265\377\072\175\265\377\304\330\351\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\306\331\351\377" +
+ "\201\253\316\377\035\035\035\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\146\146\146\377\377\377\377\377\320\340\355\377" +
+ "\072\175\265\377\072\175\265\377\215\264\324\377\377\377\377\377" +
+ "\362\362\362\377\245\245\245\377\337\337\337\377\242\301\334\377" +
+ "\260\305\326\377\012\012\012\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\250\250\250\377\377\377\377\377\227\272\330\377" +
+ "\072\175\265\377\072\175\265\377\161\241\312\377\377\377\377\377" +
+ "\241\241\241\377\000\000\000\377\001\001\001\377\043\043\043\377" +
+ "\314\314\314\377\320\320\320\377\245\245\245\377\204\204\204\377" +
+ "\134\134\134\377\357\357\357\377\377\377\377\377\140\226\303\377" +
+ "\072\175\265\377\072\175\265\377\155\236\310\377\377\377\377\377" +
+ "\136\136\136\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\317\317\317\377\037\037\037\377\003\003\003\377\053\053\053\377" +
+ "\154\154\154\377\306\306\306\377\372\374\375\377\236\277\332\377" +
+ "\167\245\314\377\114\211\274\377\174\250\316\377\377\377\377\377" +
+ "\033\033\033\377\000\000\000\377\000\000\000\377\027\027\027\377" +
+ "\326\326\326\377\001\001\001\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\122\122\122\377\345\345\345\377\075\075\075\377" +
+ "\150\150\150\377\246\246\247\377\332\336\341\377\377\377\377\377" +
+ "\164\164\164\377\016\016\016\377\000\000\000\377\131\131\131\377" +
+ "\225\225\225\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\221\221\221\377\233\233\233\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\002\002\002\377\103\103\103\377" +
+ "\377\377\377\377\356\356\356\377\214\214\214\377\277\277\277\377" +
+ "\126\126\126\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\323\323\323\377\130\130\130\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\063\063\063\377" +
+ "\377\377\377\377\377\377\377\377\374\375\376\377\377\377\377\377" +
+ "\300\300\300\377\100\100\100\377\002\002\002\377\000\000\000\377" +
+ "\033\033\033\377\373\373\373\377\027\027\027\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\170\170\170\377" +
+ "\377\377\377\377\377\377\377\377\322\341\356\377\176\251\316\377" +
+ "\340\352\363\377\377\377\377\377\324\324\324\377\155\155\155\377" +
+ "\204\204\204\377\323\323\323\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\275\275\275\377" +
+ "\377\377\377\377\377\377\377\377\376\376\376\377\146\232\305\377" +
+ "\075\177\266\377\202\254\320\377\344\355\365\377\377\377\377\377" +
+ "\377\377\377\377\345\345\345\377\055\055\055\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\014\014\014\377\366\366\366\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\342\354\364\377" +
+ "\115\211\274\377\072\175\265\377\076\200\266\377\207\260\322\377" +
+ "\347\357\366\377\377\377\377\377\376\376\376\377\274\274\274\377" +
+ "\117\117\117\377\003\003\003\377\112\112\112\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\353\362\370\377\214\263\324\377\126\220\300\377\120\214\275\377" +
+ "\167\245\314\377\355\363\370\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\337\337\337\377\346\346\346\377\377\377\377\377";
+
+ private static final String LWJGL_ICON_DATA_32x32 =
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\372\374\375\377" +
+ "\313\335\354\377\223\267\326\377\157\240\311\377\134\223\302\377\140\226\303\377\172\247\315\377\254\310\340\377\355\363\370\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\374\375\376\377\265\316\343\377\132\222\301\377" +
+ "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\105\205\271\377" +
+ "\241\301\334\377\374\375\376\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\374\374\374\377\342\352\361\377\270\317\343\377\256\311\340\377" +
+ "\243\302\334\377\230\272\330\377\214\263\323\377\201\254\317\377\156\237\310\377\075\177\266\377\072\175\265\377\072\175\265\377" +
+ "\072\175\265\377\162\242\312\377\365\370\373\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\330\330\330\377\061\061\061\377\044\044\044\377\061\061\061\377\100\100\100\377" +
+ "\122\122\122\377\145\145\145\377\164\164\164\377\217\217\217\377\367\370\370\377\254\310\337\377\073\175\265\377\072\175\265\377" +
+ "\072\175\265\377\072\175\265\377\171\247\315\377\374\375\376\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\376\376\376\377\150\150\150\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\266\266\266\377\376\376\376\377\206\256\321\377\072\175\265\377" +
+ "\072\175\265\377\072\175\265\377\072\175\265\377\256\312\341\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\323\342\356\377\341\352\362\377\050\050\050\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\002\002\002\377\336\336\336\377\377\377\377\377\365\370\373\377\133\222\301\377" +
+ "\072\175\265\377\072\175\265\377\072\175\265\377\110\206\272\377\364\370\373\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\354\363\370\377\144\231\305\377\327\331\333\377\005\005\005\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\044\044\044\377\376\376\376\377\377\377\377\377\377\377\377\377\300\325\347\377" +
+ "\071\174\265\377\072\175\265\377\072\175\265\377\072\175\265\377\253\310\340\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\376\377\377\377" +
+ "\170\246\314\377\173\247\315\377\236\236\236\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\145\145\145\377\377\377\377\377\377\377\377\377\377\377\377\377\342\354\364\377" +
+ "\067\173\264\377\072\175\265\377\072\175\265\377\072\175\265\377\146\232\305\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\303\327\350\377" +
+ "\071\175\265\377\262\314\341\377\130\130\130\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\251\251\251\377\377\377\377\377\377\377\377\377\377\377\377\377\274\322\345\377" +
+ "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\100\201\267\377\356\364\371\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\372\374\375\377\132\222\301\377" +
+ "\075\177\266\377\335\345\355\377\034\034\034\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\007\007\007\377\347\347\347\377\377\377\377\377\377\377\377\377\377\377\377\377\205\256\321\377" +
+ "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\071\175\265\377\314\336\354\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\376\376\376\377\377\377\377\377\377\377\377\377\377\377\377\377\272\322\345\377\072\175\265\377" +
+ "\127\220\277\377\320\321\321\377\003\003\003\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\063\063\063\377\375\375\375\377\377\377\377\377\377\377\377\377\373\374\375\377\120\213\275\377" +
+ "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\071\175\265\377\261\314\342\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\312\312\312\377\067\067\067\377\141\141\141\377\242\242\242\377\335\335\335\377\344\354\363\377\261\313\341\377" +
+ "\264\315\342\377\346\346\346\377\043\043\043\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\162\162\162\377\377\377\377\377\377\377\377\377\377\377\377\377\330\345\360\377\072\175\265\377" +
+ "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\240\300\333\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\146\146\146\377\000\000\000\377\000\000\000\377\000\000\000\377\006\006\006\377\047\047\047\377\146\146\146\377" +
+ "\324\324\324\377\377\377\377\377\366\366\366\377\320\320\320\377\227\227\227\377\136\136\136\377\047\047\047\377\004\004\004\377" +
+ "\000\000\000\377\003\003\003\377\300\300\300\377\377\377\377\377\377\377\377\377\377\377\377\377\242\301\333\377\072\175\265\377" +
+ "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\236\277\332\377\377\377\377\377\377\377\377\377" +
+ "\373\373\373\377\045\045\045\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\134\134\134\377\377\377\377\377\352\352\352\377\217\217\217\377\265\265\265\377\351\351\351\377\375\375\375\377\347\347\347\377" +
+ "\262\262\262\377\275\275\275\377\376\376\376\377\377\377\377\377\377\377\377\377\377\377\377\377\153\235\307\377\072\175\265\377" +
+ "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\241\301\334\377\377\377\377\377\377\377\377\377" +
+ "\333\333\333\377\003\003\003\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\203\203\203\377\377\377\377\377\137\137\137\377\000\000\000\377\000\000\000\377\013\013\013\377\067\067\067\377\166\166\166\377" +
+ "\267\267\267\377\360\360\360\377\377\377\377\377\377\377\377\377\377\377\377\377\360\365\371\377\113\210\273\377\075\177\266\377" +
+ "\071\174\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\262\314\342\377\377\377\377\377\377\377\377\377" +
+ "\232\232\232\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\305\305\305\377\367\367\367\377\035\035\035\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\007\007\007\377\074\074\074\377\337\337\337\377\377\377\377\377\373\374\375\377\374\375\376\377\363\367\372\377" +
+ "\314\335\353\377\236\276\332\377\162\241\311\377\114\211\273\377\072\175\265\377\311\334\353\377\377\377\377\377\377\377\377\377" +
+ "\126\126\126\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\017\017\017\377" +
+ "\371\371\371\377\321\321\321\377\003\003\003\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\216\216\216\377\377\377\377\377\371\371\371\377\204\204\204\377\160\160\160\377" +
+ "\260\260\260\377\352\352\352\377\377\377\377\377\371\373\374\377\334\350\362\377\366\371\374\377\377\377\377\377\377\377\377\377" +
+ "\025\025\025\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\116\116\116\377" +
+ "\377\377\377\377\221\221\221\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\273\273\273\377\377\377\377\377\236\236\236\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\004\004\004\377\057\057\057\377\160\160\160\377\260\260\260\377\346\346\346\377\376\376\376\377\377\377\377\377" +
+ "\071\071\071\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\220\220\220\377" +
+ "\377\377\377\377\115\115\115\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\020\020\020\377\360\360\360\377\377\377\377\377\132\132\132\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\011\011\011\377\062\062\062\377\261\261\261\377" +
+ "\366\366\366\377\241\241\241\377\065\065\065\377\002\002\002\377\000\000\000\377\000\000\000\377\002\002\002\377\321\321\321\377" +
+ "\365\365\365\377\023\023\023\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\105\105\105\377\376\376\376\377\370\370\370\377\035\035\035\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\053\053\053\377" +
+ "\377\377\377\377\377\377\377\377\374\374\374\377\276\276\276\377\120\120\120\377\005\005\005\377\045\045\045\377\371\371\371\377" +
+ "\302\302\302\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\206\206\206\377\377\377\377\377\322\322\322\377\001\001\001\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\103\103\103\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\376\376\376\377\334\334\334\377\340\340\340\377\377\377\377\377" +
+ "\225\225\225\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\001\001\001\377\310\310\310\377\377\377\377\377\216\216\216\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\210\210\210\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\337\337\337\377\051\051\051\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\030\030\030\377\365\365\365\377\377\377\377\377\112\112\112\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\317\317\317\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\361\366\372\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\371\371\371\377\265\265\265\377\113\113\113\377\006\006\006\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\122\122\122\377\377\377\377\377\370\370\370\377\020\020\020\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\034\034\034\377\370\370\370\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\206\257\321\377\220\265\325\377\352\361\367\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\333\333\333\377\170\170\170\377\033\033\033\377\000\000\000\377" +
+ "\000\000\000\377\226\226\226\377\377\377\377\377\306\306\306\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\132\132\132\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\303\330\351\377\072\175\265\377\103\203\270\377" +
+ "\224\270\326\377\355\363\370\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\364\364\364\377\247\247\247\377" +
+ "\205\205\205\377\364\364\364\377\377\377\377\377\206\206\206\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\235\235\235\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\372\373\375\377\135\224\302\377\072\175\265\377" +
+ "\072\175\265\377\106\205\271\377\230\273\330\377\357\364\371\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\233\233\233\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\005\005\005\377\335\335\335\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\305\331\351\377\073\176\266\377" +
+ "\072\175\265\377\072\175\265\377\072\175\265\377\110\206\272\377\236\276\332\377\362\366\372\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\373\373\373\377\216\216\216\377\045\045\045\377\001\001\001\377\000\000\000\377" +
+ "\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\054\054\054\377\374\374\374\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\217\265\325\377" +
+ "\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\112\207\273\377\243\302\334\377\363\367\372\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\372\372\372\377\260\260\260\377\105\105\105\377" +
+ "\004\004\004\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\156\156\156\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\374\375\376\377" +
+ "\205\257\321\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\115\211\274\377" +
+ "\250\305\336\377\366\371\374\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\376\376\376\377" +
+ "\322\322\322\377\150\150\150\377\016\016\016\377\000\000\000\377\001\001\001\377\270\270\270\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\376\376\377\377\261\313\342\377\114\211\274\377\071\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377\072\175\265\377" +
+ "\072\175\265\377\115\211\274\377\277\324\347\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\354\354\354\377\223\223\223\377\233\233\233\377\375\375\375\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\363\367\372\377\265\316\343\377\201\254\320\377\145\231\305\377\141\227\304\377\154\236\310\377" +
+ "\217\265\325\377\305\331\351\377\367\372\374\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" +
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377";
+
/** LWJGL Logo - 16 by 16 pixels */
- public static final ByteBuffer LWJGLIcon16x16 = BufferUtils.createByteBuffer(16 * 16 * 4).put(new byte[] {
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -2, -1, -1, -1, -62, -41, -24, -1, 116, -92, -53, -1, 80, -117,
- -67, -1, 84, -114, -65, -1, -122, -81, -46, -1, -25, -17, -10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -11, -11, -11, -1,
- -115, -113, -111, -1, 118, -126, -115, -1, 125, -115, -101, -1, -124, -103, -86, -1, -108, -73, -43, -1,
- 58, 125, -75, -1, 72, -122, -70, -1, -38, -25, -15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -12, -8, -5, -1, -100, -98, -96, -1, 0, 0, 0, -1, 0, 0, 0, -1,
- 0, 0, 0, -1, 0, 0, 0, -1, -28, -28, -28, -1, -124, -83, -48, -1, 58, 125, -75, -1, 91, -110, -63, -1, -4,
- -3, -2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -111, -74, -43,
- -1, 95, 95, 95, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 34, 34, 34, -1, -1, -1, -1, -1, -24, -16, -10,
- -1, 57, 124, -75, -1, 58, 125, -75, -1, -60, -40, -23, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -58, -39, -23, -1, -127, -85, -50, -1, 29, 29, 29, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0,
- -1, 102, 102, 102, -1, -1, -1, -1, -1, -48, -32, -19, -1, 58, 125, -75, -1, 58, 125, -75, -1, -115, -76,
- -44, -1, -1, -1, -1, -1, -14, -14, -14, -1, -91, -91, -91, -1, -33, -33, -33, -1, -94, -63, -36, -1, -80,
- -59, -42, -1, 10, 10, 10, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, -88, -88, -88, -1, -1, -1, -1, -1,
- -105, -70, -40, -1, 58, 125, -75, -1, 58, 125, -75, -1, 113, -95, -54, -1, -1, -1, -1, -1, -95, -95, -95,
- -1, 0, 0, 0, -1, 1, 1, 1, -1, 35, 35, 35, -1, -52, -52, -52, -1, -48, -48, -48, -1, -91, -91, -91, -1,
- -124, -124, -124, -1, 92, 92, 92, -1, -17, -17, -17, -1, -1, -1, -1, -1, 96, -106, -61, -1, 58, 125, -75,
- -1, 58, 125, -75, -1, 109, -98, -56, -1, -1, -1, -1, -1, 94, 94, 94, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0,
- -1, -49, -49, -49, -1, 31, 31, 31, -1, 3, 3, 3, -1, 43, 43, 43, -1, 108, 108, 108, -1, -58, -58, -58, -1,
- -6, -4, -3, -1, -98, -65, -38, -1, 119, -91, -52, -1, 76, -119, -68, -1, 124, -88, -50, -1, -1, -1, -1, -1,
- 27, 27, 27, -1, 0, 0, 0, -1, 0, 0, 0, -1, 23, 23, 23, -1, -42, -42, -42, -1, 1, 1, 1, -1, 0, 0, 0, -1, 0,
- 0, 0, -1, 0, 0, 0, -1, 82, 82, 82, -1, -27, -27, -27, -1, 61, 61, 61, -1, 104, 104, 104, -1, -90, -90, -89,
- -1, -38, -34, -31, -1, -1, -1, -1, -1, 116, 116, 116, -1, 14, 14, 14, -1, 0, 0, 0, -1, 89, 89, 89, -1,
- -107, -107, -107, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, -111, -111, -111, -1, -101, -101,
- -101, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 2, 2, 2, -1, 67, 67, 67, -1, -1, -1, -1, -1, -18, -18,
- -18, -1, -116, -116, -116, -1, -65, -65, -65, -1, 86, 86, 86, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0,
- 0, 0, -1, -45, -45, -45, -1, 88, 88, 88, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 51, 51,
- 51, -1, -1, -1, -1, -1, -1, -1, -1, -1, -4, -3, -2, -1, -1, -1, -1, -1, -64, -64, -64, -1, 64, 64, 64, -1,
- 2, 2, 2, -1, 0, 0, 0, -1, 27, 27, 27, -1, -5, -5, -5, -1, 23, 23, 23, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0,
- 0, -1, 0, 0, 0, -1, 120, 120, 120, -1, -1, -1, -1, -1, -1, -1, -1, -1, -46, -31, -18, -1, 126, -87, -50,
- -1, -32, -22, -13, -1, -1, -1, -1, -1, -44, -44, -44, -1, 109, 109, 109, -1, -124, -124, -124, -1, -45,
- -45, -45, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, -67, -67, -67, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -2, -2, -2, -1, 102, -102, -59, -1, 61, 127, -74, -1, -126, -84, -48, -1, -28, -19,
- -11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -27, -27, -27, -1, 45, 45, 45, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0,
- 0, -1, 12, 12, 12, -1, -10, -10, -10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -30, -20, -12,
- -1, 77, -119, -68, -1, 58, 125, -75, -1, 62, -128, -74, -1, -121, -80, -46, -1, -25, -17, -10, -1, -1, -1,
- -1, -1, -2, -2, -2, -1, -68, -68, -68, -1, 79, 79, 79, -1, 3, 3, 3, -1, 74, 74, 74, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -21, -14, -8, -1, -116, -77, -44, -1, 86, -112,
- -64, -1, 80, -116, -67, -1, 119, -91, -52, -1, -19, -13, -8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -33, -33, -33, -1, -26, -26, -26, -1, -1, -1, -1, -1
- });
+ public static final ByteBuffer LWJGLIcon16x16 = loadIcon(LWJGL_ICON_DATA_16x16);
/** LWJGL Logo - 32 by 32 pixels */
- public static final ByteBuffer LWJGLIcon32x32 = BufferUtils.createByteBuffer(32 * 32 * 4).put(new byte[] {
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -6, -4, -3, -1, -53, -35,
- -20, -1, -109, -73, -42, -1, 111, -96, -55, -1, 92, -109, -62, -1, 96, -106, -61, -1, 122, -89, -51, -1,
- -84, -56, -32, -1, -19, -13, -8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -4, -3, -2, -1, -75, -50, -29, -1, 90, -110, -63, -1,
- 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1,
- 58, 125, -75, -1, 69, -123, -71, -1, -95, -63, -36, -1, -4, -3, -2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -4, -4, -4, -1, -30, -22, -15, -1, -72, -49, -29, -1, -82, -55, -32,
- -1, -93, -62, -36, -1, -104, -70, -40, -1, -116, -77, -45, -1, -127, -84, -49, -1, 110, -97, -56, -1, 61,
- 127, -74, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 114, -94, -54, -1, -11, -8, -5, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -40, -40, -40, -1, 49, 49, 49, -1, 36, 36, 36, -1, 49, 49, 49, -1, 64,
- 64, 64, -1, 82, 82, 82, -1, 101, 101, 101, -1, 116, 116, 116, -1, -113, -113, -113, -1, -9, -8, -8, -1,
- -84, -56, -33, -1, 59, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 121, -89, -51,
- -1, -4, -3, -2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -2, -2, -2, -1, 104, 104, 104, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0,
- 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, -74, -74, -74, -1, -2, -2, -2, -1, -122, -82,
- -47, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, -82, -54, -31, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -45, -30, -18,
- -1, -31, -22, -14, -1, 40, 40, 40, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0,
- 0, 0, -1, 0, 0, 0, -1, 2, 2, 2, -1, -34, -34, -34, -1, -1, -1, -1, -1, -11, -8, -5, -1, 91, -110, -63, -1,
- 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 72, -122, -70, -1, -12, -8, -5, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -20, -13, -8, -1, 100, -103, -59, -1, -41, -39, -37,
- -1, 5, 5, 5, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1,
- 36, 36, 36, -1, -2, -2, -2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -64, -43, -25, -1, 57, 124, -75, -1, 58,
- 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, -85, -56, -32, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -2, -1, -1, -1, 120, -90, -52, -1, 123, -89, -51, -1, -98, -98, -98, -1, 0, 0, 0, -1, 0, 0,
- 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 101, 101, 101, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -30, -20, -12, -1, 55, 123, -76, -1, 58, 125, -75, -1, 58, 125,
- -75, -1, 58, 125, -75, -1, 102, -102, -59, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -61,
- -41, -24, -1, 57, 125, -75, -1, -78, -52, -31, -1, 88, 88, 88, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1,
- 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, -87, -87, -87, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -68, -46, -27, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125,
- -75, -1, 64, -127, -73, -1, -18, -12, -7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -6, -4, -3, -1, 90, -110, -63, -1, 61,
- 127, -74, -1, -35, -27, -19, -1, 28, 28, 28, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0,
- 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 7, 7, 7, -1, -25, -25, -25, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -123, -82, -47, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 57,
- 125, -75, -1, -52, -34, -20, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -2, -2,
- -2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -70, -46, -27, -1, 58, 125, -75, -1, 87, -112, -65,
- -1, -48, -47, -47, -1, 3, 3, 3, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0,
- 0, -1, 0, 0, 0, -1, 51, 51, 51, -1, -3, -3, -3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -5, -4, -3, -1, 80,
- -117, -67, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 57, 125, -75, -1,
- -79, -52, -30, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -54, -54, -54, -1, 55, 55, 55, -1, 97,
- 97, 97, -1, -94, -94, -94, -1, -35, -35, -35, -1, -28, -20, -13, -1, -79, -53, -31, -1, -76, -51, -30, -1,
- -26, -26, -26, -1, 35, 35, 35, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0,
- 0, -1, 0, 0, 0, -1, 114, 114, 114, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -40, -27, -16, -1,
- 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1,
- -96, -64, -37, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 102, 102, 102, -1, 0, 0, 0, -1, 0, 0, 0,
- -1, 0, 0, 0, -1, 6, 6, 6, -1, 39, 39, 39, -1, 102, 102, 102, -1, -44, -44, -44, -1, -1, -1, -1, -1, -10,
- -10, -10, -1, -48, -48, -48, -1, -105, -105, -105, -1, 94, 94, 94, -1, 39, 39, 39, -1, 4, 4, 4, -1, 0, 0,
- 0, -1, 3, 3, 3, -1, -64, -64, -64, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -94, -63, -37, -1,
- 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1,
- -98, -65, -38, -1, -1, -1, -1, -1, -1, -1, -1, -1, -5, -5, -5, -1, 37, 37, 37, -1, 0, 0, 0, -1, 0, 0, 0,
- -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 92, 92, 92, -1, -1, -1, -1, -1, -22, -22, -22, -1,
- -113, -113, -113, -1, -75, -75, -75, -1, -23, -23, -23, -1, -3, -3, -3, -1, -25, -25, -25, -1, -78, -78,
- -78, -1, -67, -67, -67, -1, -2, -2, -2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 107, -99, -57,
- -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75,
- -1, -95, -63, -36, -1, -1, -1, -1, -1, -1, -1, -1, -1, -37, -37, -37, -1, 3, 3, 3, -1, 0, 0, 0, -1, 0, 0,
- 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, -125, -125, -125, -1, -1, -1, -1, -1, 95, 95,
- 95, -1, 0, 0, 0, -1, 0, 0, 0, -1, 11, 11, 11, -1, 55, 55, 55, -1, 118, 118, 118, -1, -73, -73, -73, -1,
- -16, -16, -16, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -16, -11, -7, -1, 75, -120, -69, -1, 61,
- 127, -74, -1, 57, 124, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1,
- -78, -52, -30, -1, -1, -1, -1, -1, -1, -1, -1, -1, -102, -102, -102, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0,
- -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, -59, -59, -59, -1, -9, -9, -9, -1, 29, 29, 29, -1,
- 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 7, 7, 7, -1, 60, 60, 60, -1,
- -33, -33, -33, -1, -1, -1, -1, -1, -5, -4, -3, -1, -4, -3, -2, -1, -13, -9, -6, -1, -52, -35, -21, -1, -98,
- -66, -38, -1, 114, -95, -55, -1, 76, -119, -69, -1, 58, 125, -75, -1, -55, -36, -21, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 86, 86, 86, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0,
- -1, 15, 15, 15, -1, -7, -7, -7, -1, -47, -47, -47, -1, 3, 3, 3, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1,
- 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, -114, -114, -114, -1, -1, -1, -1, -1, -7,
- -7, -7, -1, -124, -124, -124, -1, 112, 112, 112, -1, -80, -80, -80, -1, -22, -22, -22, -1, -1, -1, -1, -1,
- -7, -5, -4, -1, -36, -24, -14, -1, -10, -7, -4, -1, -1, -1, -1, -1, -1, -1, -1, -1, 21, 21, 21, -1, 0, 0,
- 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 78, 78, 78, -1, -1, -1, -1, -1,
- -111, -111, -111, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0,
- 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, -69, -69, -69, -1, -1, -1, -1, -1, -98, -98, -98, -1, 0, 0, 0, -1, 0, 0,
- 0, -1, 0, 0, 0, -1, 4, 4, 4, -1, 47, 47, 47, -1, 112, 112, 112, -1, -80, -80, -80, -1, -26, -26, -26, -1,
- -2, -2, -2, -1, -1, -1, -1, -1, 57, 57, 57, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0,
- 0, -1, 0, 0, 0, -1, -112, -112, -112, -1, -1, -1, -1, -1, 77, 77, 77, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0,
- 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 16, 16, 16, -1, -16, -16, -16, -1,
- -1, -1, -1, -1, 90, 90, 90, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0,
- -1, 0, 0, 0, -1, 9, 9, 9, -1, 50, 50, 50, -1, -79, -79, -79, -1, -10, -10, -10, -1, -95, -95, -95, -1, 53,
- 53, 53, -1, 2, 2, 2, -1, 0, 0, 0, -1, 0, 0, 0, -1, 2, 2, 2, -1, -47, -47, -47, -1, -11, -11, -11, -1, 19,
- 19, 19, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0,
- 0, 0, -1, 69, 69, 69, -1, -2, -2, -2, -1, -8, -8, -8, -1, 29, 29, 29, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0,
- 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 43, 43, 43, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -4, -4, -4, -1, -66, -66, -66, -1, 80, 80, 80, -1, 5, 5, 5, -1, 37, 37, 37, -1,
- -7, -7, -7, -1, -62, -62, -62, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0,
- 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, -122, -122, -122, -1, -1, -1, -1, -1, -46, -46, -46, -1, 1,
- 1, 1, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0,
- 0, -1, 0, 0, 0, -1, 67, 67, 67, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -2, -2,
- -2, -1, -36, -36, -36, -1, -32, -32, -32, -1, -1, -1, -1, -1, -107, -107, -107, -1, 0, 0, 0, -1, 0, 0, 0,
- -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 1, 1, 1, -1, -56, -56,
- -56, -1, -1, -1, -1, -1, -114, -114, -114, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0,
- -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, -120, -120, -120, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -33, -33, -33, -1, 41, 41, 41, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0,
- 0, 0, -1, 0, 0, 0, -1, 24, 24, 24, -1, -11, -11, -11, -1, -1, -1, -1, -1, 74, 74, 74, -1, 0, 0, 0, -1, 0,
- 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0,
- 0, -1, -49, -49, -49, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -15, -10, -6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -7, -7, -7, -1, -75, -75, -75, -1, 75,
- 75, 75, -1, 6, 6, 6, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 82, 82, 82, -1, -1, -1, -1,
- -1, -8, -8, -8, -1, 16, 16, 16, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0,
- 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 28, 28, 28, -1, -8, -8, -8, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -122, -81, -47, -1, -112, -75, -43, -1, -22, -15, -9,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -37, -37, -37, -1, 120, 120, 120, -1,
- 27, 27, 27, -1, 0, 0, 0, -1, 0, 0, 0, -1, -106, -106, -106, -1, -1, -1, -1, -1, -58, -58, -58, -1, 0, 0, 0,
- -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1,
- 0, 0, 0, -1, 90, 90, 90, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -61, -40, -23, -1, 58, 125, -75, -1, 67, -125, -72, -1, -108, -72, -42, -1, -19, -13,
- -8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -12, -12, -12, -1, -89, -89, -89,
- -1, -123, -123, -123, -1, -12, -12, -12, -1, -1, -1, -1, -1, -122, -122, -122, -1, 0, 0, 0, -1, 0, 0, 0,
- -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1,
- -99, -99, -99, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -6, -5, -3, -1, 93, -108, -62, -1, 58, 125, -75, -1, 58, 125, -75, -1, 70, -123, -71, -1, -104,
- -69, -40, -1, -17, -12, -7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -101, -101, -101, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0,
- -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 5, 5, 5, -1, -35, -35, -35, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -59, -39, -23, -1, 59, 126, -74, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 72, -122, -70,
- -1, -98, -66, -38, -1, -14, -10, -6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -5, -5, -5, -1, -114, -114, -114, -1, 37, 37, 37, -1, 1, 1, 1, -1, 0, 0, 0, -1, 0, 0, 0,
- -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 44, 44, 44, -1, -4, -4, -4, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -113, -75, -43, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75,
- -1, 74, -121, -69, -1, -93, -62, -36, -1, -13, -9, -6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -6, -6, -6, -1, -80, -80, -80, -1, 69, 69, 69, -1, 4, 4, 4, -1, 0, 0, 0,
- -1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, 110, 110, 110, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -4, -3,
- -2, -1, -123, -81, -47, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58,
- 125, -75, -1, 58, 125, -75, -1, 77, -119, -68, -1, -88, -59, -34, -1, -10, -7, -4, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -2, -2, -2, -1, -46, -46, -46, -1, 104, 104,
- 104, -1, 14, 14, 14, -1, 0, 0, 0, -1, 1, 1, 1, -1, -72, -72, -72, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -2, -2, -1, -1, -79, -53, -30, -1, 76, -119, -68, -1, 57, 125, -75, -1, 58, 125, -75, -1,
- 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 58, 125, -75, -1, 77, -119, -68, -1, -65, -44, -25,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -20, -20, -20, -1, -109, -109, -109, -1, -101, -101, -101, -1, -3, -3, -3, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -13, -9, -6, -1, -75, -50, -29, -1, -127,
- -84, -48, -1, 101, -103, -59, -1, 97, -105, -60, -1, 108, -98, -56, -1, -113, -75, -43, -1, -59, -39, -23,
- -1, -9, -6, -4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1
- });
+ public static final ByteBuffer LWJGLIcon32x32 = loadIcon(LWJGL_ICON_DATA_32x32);
/** Debug flag. */
public static final boolean DEBUG = getPrivilegedBoolean("org.lwjgl.util.Debug");
@@ -271,9 +269,6 @@
private static final int PLATFORM;
static {
- LWJGLIcon16x16.flip();
- LWJGLIcon32x32.flip();
-
final String osName = getPrivilegedProperty("os.name");
if ( osName.startsWith("Windows") )
PLATFORM = PLATFORM_WINDOWS;
@@ -285,6 +280,15 @@
throw new LinkageError("Unknown platform: " + osName);
}
+ private static ByteBuffer loadIcon(String data) {
+ int len = data.length();
+ ByteBuffer bb = BufferUtils.createByteBuffer(len);
+ for(int i=0 ; i<len ; i++) {
+ bb.put(i, (byte)data.charAt(i));
+ }
+ return bb.asReadOnlyBuffer();
+ }
+
/**
* @see #PLATFORM_WINDOWS
* @see #PLATFORM_LINUX
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-06-24 18:31:32
|
Revision: 3550
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3550&view=rev
Author: matzon
Date: 2011-06-24 18:31:26 +0000 (Fri, 24 Jun 2011)
Log Message:
-----------
Applying patch from Matthias that adds the "negative mouse coordinates" to Mouse.next() too
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java 2011-06-23 11:26:42 UTC (rev 3549)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java 2011-06-24 18:31:26 UTC (rev 3550)
@@ -128,6 +128,9 @@
/** The position of the mouse it was grabbed at */
private static int grab_x;
private static int grab_y;
+ /** The last absolute mouse event position (before clipping) for delta computation */
+ private static int last_event_raw_x;
+ private static int last_event_raw_y;
/** Buffer size in events */
private static final int BUFFER_SIZE = 50;
@@ -140,7 +143,7 @@
private static final boolean emulateCursorAnimation = LWJGLUtil.getPlatform() == LWJGLUtil.PLATFORM_WINDOWS ||
LWJGLUtil.getPlatform() == LWJGLUtil.PLATFORM_MACOSX;
- private static final boolean allowNegativeMouseCoords = getPrivilegedBoolean("org.lwjgl.input.Mouse.allowNegativeMouseCoords");
+ private static boolean clipMouseCoordinatesToWindow = !getPrivilegedBoolean("org.lwjgl.input.Mouse.allowNegativeMouseCoords");
/**
* Mouse cannot be constructed.
@@ -189,6 +192,14 @@
}
}
+ public static boolean isClipMouseCoordinatesToWindow() {
+ return clipMouseCoordinatesToWindow;
+ }
+
+ public static void setClipMouseCoordinatesToWindow(boolean clip) {
+ clipMouseCoordinatesToWindow = clip;
+ }
+
/**
* Set the position of the cursor. If the cursor is not grabbed,
* the native cursor is moved to the new position.
@@ -350,7 +361,7 @@
x = poll_coord1;
y = poll_coord2;
}
- if(!allowNegativeMouseCoords) {
+ if(clipMouseCoordinatesToWindow) {
x = Math.min(implementation.getWidth() - 1, Math.max(0, x));
y = Math.min(implementation.getHeight() - 1, Math.max(0, y));
}
@@ -429,16 +440,22 @@
event_dy = readBuffer.getInt();
event_x += event_dx;
event_y += event_dy;
+ last_event_raw_x = event_x;
+ last_event_raw_y = event_y;
} else {
int new_event_x = readBuffer.getInt();
int new_event_y = readBuffer.getInt();
- event_dx = new_event_x - event_x;
- event_dy = new_event_y - event_y;
+ event_dx = new_event_x - last_event_raw_x;
+ event_dy = new_event_y - last_event_raw_y;
event_x = new_event_x;
event_y = new_event_y;
+ last_event_raw_x = new_event_x;
+ last_event_raw_y = new_event_y;
}
- event_x = Math.min(implementation.getWidth() - 1, Math.max(0, event_x));
- event_y = Math.min(implementation.getHeight() - 1, Math.max(0, event_y));
+ if(clipMouseCoordinatesToWindow) {
+ event_x = Math.min(implementation.getWidth() - 1, Math.max(0, event_x));
+ event_y = Math.min(implementation.getHeight() - 1, Math.max(0, event_y));
+ }
event_dwheel = readBuffer.getInt();
event_nanos = readBuffer.getLong();
return true;
@@ -638,6 +655,8 @@
poll();
event_x = x;
event_y = y;
+ last_event_raw_x = x;
+ last_event_raw_y = y;
resetMouse();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-06-23 11:26:49
|
Revision: 3549
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3549&view=rev
Author: kappa1
Date: 2011-06-23 11:26:42 +0000 (Thu, 23 Jun 2011)
Log Message:
-----------
Add "Unix" as a linux platform to allow LWJGL to work on Slackware Linux, thx to kruno73 for pointing this out.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
Modified: trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java 2011-06-19 20:18:02 UTC (rev 3548)
+++ trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java 2011-06-23 11:26:42 UTC (rev 3549)
@@ -277,7 +277,7 @@
final String osName = getPrivilegedProperty("os.name");
if ( osName.startsWith("Windows") )
PLATFORM = PLATFORM_WINDOWS;
- else if ( osName.startsWith("Linux") || osName.startsWith("FreeBSD") || osName.startsWith("SunOS") )
+ else if ( osName.startsWith("Linux") || osName.startsWith("FreeBSD") || osName.startsWith("SunOS") || osName.startsWith("Unix") )
PLATFORM = PLATFORM_LINUX;
else if ( osName.startsWith("Mac OS X") || osName.startsWith("Darwin") )
PLATFORM = PLATFORM_MACOSX;
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2011-06-19 20:18:02 UTC (rev 3548)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2011-06-23 11:26:42 UTC (rev 3549)
@@ -702,7 +702,7 @@
nativeJarList = getParameter("al_windows");
}
- } else if (osName.startsWith("Linux")) {
+ } else if (osName.startsWith("Linux") || osName.startsWith("Unix")) {
// check if arch specific natives have been specified
if (System.getProperty("os.arch").endsWith("64")) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-06-19 20:18:08
|
Revision: 3548
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3548&view=rev
Author: matzon
Date: 2011-06-19 20:18:02 +0000 (Sun, 19 Jun 2011)
Log Message:
-----------
Applying 64bit loading patch by Matthias
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/Sys.java
Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java 2011-06-15 21:15:58 UTC (rev 3547)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2011-06-19 20:18:02 UTC (rev 3548)
@@ -78,6 +78,19 @@
}
private static void loadLibrary(final String lib_name) {
+ // actively try to load 64bit libs on 64bit architectures first
+ String osArch = System.getProperty("os.arch");
+ boolean is64bit = "amd64".equals(osArch) || "x86_64".equals(osArch);
+ if(is64bit) {
+ try {
+ doLoadLibrary(lib_name + POSTFIX64BIT);
+ return;
+ } catch (UnsatisfiedLinkError e) {
+ LWJGLUtil.log("Failed to load 64 bit library: " + e.getMessage());
+ }
+ }
+
+ // fallback to loading the "old way"
try {
doLoadLibrary(lib_name);
} catch (UnsatisfiedLinkError e) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-06-15 21:16:05
|
Revision: 3547
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3547&view=rev
Author: kappa1
Date: 2011-06-15 21:15:58 +0000 (Wed, 15 Jun 2011)
Log Message:
-----------
AppletLoader: validate certificate for native files before attempting to extract them.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2011-06-12 23:51:44 UTC (rev 3546)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2011-06-15 21:15:58 UTC (rev 3547)
@@ -1662,6 +1662,9 @@
InputStream in = jarFile.getInputStream(jarFile.getEntry(entry.getName()));
OutputStream out = new FileOutputStream(path + "natives" + File.separator + entry.getName());
+ // validate if the certificate for native file is correct before extracting
+ validateCertificateChain(certificate, entry.getCertificates());
+
int bufferSize;
byte buffer[] = new byte[65536];
@@ -1675,9 +1678,6 @@
subtaskMessage = "Extracting: " + entry.getName() + " " + ((currentSizeExtract * 100) / totalSizeExtract) + "%";
}
- // validate if the certificate for native file is correct
- validateCertificateChain(certificate, entry.getCertificates());
-
in.close();
out.close();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-06-12 23:51:50
|
Revision: 3546
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3546&view=rev
Author: kappa1
Date: 2011-06-12 23:51:44 +0000 (Sun, 12 Jun 2011)
Log Message:
-----------
AppletLoader: fix problem with file extension trimming code, added warning when lzma support is missing 'lzma.jar' and lzma files are being loaded.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2011-06-12 21:22:50 UTC (rev 3545)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2011-06-12 23:51:44 UTC (rev 3546)
@@ -664,11 +664,13 @@
*/
protected String trimExtensionByCapabilities(String file) {
if (!pack200Supported) {
- file = replaceLast(file, ".pack", "");
+ file = file.replace(".pack", "");
}
if (!lzmaSupported) {
- file = replaceLast(file, ".lzma", "");
+ System.out.println("'lzma.jar' required for LZMA support!");
+ System.out.println("trying files without the lzma extension...");
+ file = file.replace(".lzma", "");
}
return file;
}
@@ -766,7 +768,7 @@
}
/**
- * 7 steps
+ * 8 steps
*
* 1) check applet cache and decide whether to download jars
* 2) download the jars
@@ -774,7 +776,8 @@
* 4) validate jars for any corruption
* 5) save applet cache information
* 6) add jars to class path
- * 7) switch to loaded applet
+ * 7) set any lwjgl properties
+ * 8) switch to loaded applet
*/
public void run() {
setState(STATE_CHECKING_CACHE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-06-12 21:22:57
|
Revision: 3545
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3545&view=rev
Author: kappa1
Date: 2011-06-12 21:22:50 +0000 (Sun, 12 Jun 2011)
Log Message:
-----------
AppletLoader: fix some comments, code clean up and refactoring
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2011-06-09 22:27:53 UTC (rev 3544)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2011-06-12 21:22:50 UTC (rev 3545)
@@ -766,13 +766,15 @@
}
/**
- * 4 steps
+ * 7 steps
*
- * 1) check version of applet and decide whether to download jars
+ * 1) check applet cache and decide whether to download jars
* 2) download the jars
- * 3) extract natives
- * 4) add to jars to class path
- * 5) switch applets
+ * 3) extract native files
+ * 4) validate jars for any corruption
+ * 5) save applet cache information
+ * 6) add jars to class path
+ * 7) switch to loaded applet
*/
public void run() {
setState(STATE_CHECKING_CACHE);
@@ -785,23 +787,9 @@
// parse the urls for the jars into the url list
loadJarURLs();
- // get path where applet will be stored
- String path = AccessController.doPrivileged(new PrivilegedExceptionAction<String>() {
- public String run() throws Exception {
+ // get path where applet files will be stored
+ String path = getCacheDirectory();
- // we append the code base to avoid naming collisions with al_title
- String codebase = "";
- if(prependHost) {
- codebase = getCodeBase().getHost();
- if(codebase == null || codebase.length() == 0) {
- codebase = "localhost";
- }
- codebase += File.separator;
- }
- return getCacheDir() + File.separator + codebase + getParameter("al_title") + File.separator;
- }
- });
-
File dir = new File(path);
// create directory
@@ -818,24 +806,10 @@
String version = getParameter("al_version");
float latestVersion = 0;
- // if applet version specifed, check if you have latest version of applet
+ // if applet version specifed, compare with version in the cache
if (version != null) {
-
latestVersion = Float.parseFloat(version);
-
- // if version file exists
- if (versionFile.exists()) {
- // compare to new version
- if (latestVersion == readFloatFile(versionFile)) {
- versionAvailable = true;
- percentage = 90;
-
- if(debugMode) {
- System.out.println("Loading Cached Applet Version " + latestVersion);
- }
- debug_sleep(2000);
- }
- }
+ versionAvailable = compareVersion(versionFile, latestVersion);
}
// if jars not available or need updating download them
@@ -902,6 +876,33 @@
}
/**
+ * This method will return true if the version stored in the file
+ * matches the supplied float version.
+ *
+ * @param versionFile - location to file containing version information
+ * @param version - float version that needs to be compared
+ * @return returns true if the version in file matches specified version
+ */
+ protected boolean compareVersion(File versionFile, float version) {
+ // if version file exists
+ if (versionFile.exists()) {
+ // compare to version with file
+ if (version == readFloatFile(versionFile)) {
+ percentage = 90; // not need to download cache files again
+
+ if(debugMode) {
+ System.out.println("Loading Cached Applet Version " + version);
+ }
+ debug_sleep(2000);
+
+ return true; // version matches file
+ }
+ }
+
+ return false;
+ }
+
+ /**
* Parses the java_arguments list and sets lwjgl specific
* properties accordingly, before the launch.
*/
@@ -926,11 +927,43 @@
}
/**
- * get path to the lwjgl cache directory
+ * This method will return the location of the cache directory. All the
+ * applet files will be downloaded and stored here. A folder will be
+ * created inside the LWJGL cache directory from the al_title parameter.
+ * This folder will also be prepended by the host name of the codebase
+ * to avoid conflict with same named applets on other hosts.
*
+ * @return path to applets cache directory
+ * @throws Exception if access is denied
+ */
+ protected String getCacheDirectory() throws Exception {
+
+ String path = AccessController.doPrivileged(new PrivilegedExceptionAction<String>() {
+ public String run() throws Exception {
+
+ // we append the code base to avoid naming collisions with al_title
+ String codebase = "";
+ if(prependHost) {
+ codebase = getCodeBase().getHost();
+ if(codebase == null || codebase.length() == 0) {
+ codebase = "localhost";
+ }
+ codebase += File.separator;
+ }
+ return getLWJGLCacheDir() + File.separator + codebase + getParameter("al_title") + File.separator;
+ }
+ });
+
+ return path;
+ }
+
+ /**
+ * Get path to the lwjgl cache directory. This location will be where
+ * the OS keeps temporary files.
+ *
* @return path to the lwjgl cache directory
*/
- protected String getCacheDir() {
+ protected String getLWJGLCacheDir() {
String cacheDir = System.getProperty("deployment.user.cachedir");
if (cacheDir == null || System.getProperty("os.name").startsWith("Win")) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2011-06-09 22:27:59
|
Revision: 3544
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3544&view=rev
Author: kappa1
Date: 2011-06-09 22:27:53 +0000 (Thu, 09 Jun 2011)
Log Message:
-----------
LinuxDisplay: run setFocusable(boolean) on the EDT
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2011-06-09 07:48:25 UTC (rev 3543)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2011-06-09 22:27:53 UTC (rev 3544)
@@ -45,6 +45,7 @@
import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
+import java.lang.reflect.InvocationTargetException;
import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
@@ -901,13 +902,26 @@
if (focused) {
acquireInput();
- if (parent != null && !xembedded) parent.setFocusable(false);
+ if (parent != null && !xembedded) edtSetCanvasFocus(false);
}
else {
releaseInput();
- if (parent != null && !xembedded) parent.setFocusable(true);
+ if (parent != null && !xembedded) edtSetCanvasFocus(true);
}
}
+
+ private void edtSetCanvasFocus(final boolean focus) {
+ try {
+ java.awt.EventQueue.invokeAndWait(new Runnable() {
+ public void run() {
+ parent.setFocusable(focus);
+ }
+ });
+ } catch (InterruptedException e) {
+ } catch (InvocationTargetException e) {
+ }
+ }
+
static native long nGetInputFocus(long display);
private static void setInputFocusUnsafe(long window) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2011-06-09 07:48:31
|
Revision: 3543
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3543&view=rev
Author: spasi
Date: 2011-06-09 07:48:25 +0000 (Thu, 09 Jun 2011)
Log Message:
-----------
Fixed getWorkGroupInfoSizeArray parameter check.
Modified Paths:
--------------
branches/opengles/LWJGL/src/java/org/lwjgl/opencl/InfoUtilFactory.java
Modified: branches/opengles/LWJGL/src/java/org/lwjgl/opencl/InfoUtilFactory.java
===================================================================
--- branches/opengles/LWJGL/src/java/org/lwjgl/opencl/InfoUtilFactory.java 2011-06-07 17:58:17 UTC (rev 3542)
+++ branches/opengles/LWJGL/src/java/org/lwjgl/opencl/InfoUtilFactory.java 2011-06-09 07:48:25 UTC (rev 3543)
@@ -256,7 +256,7 @@
final int size;
switch ( param_name ) {
- case CL_KERNEL_WORK_GROUP_SIZE:
+ case CL_KERNEL_COMPILE_WORK_GROUP_SIZE:
size = 3;
break;
default:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2011-06-07 17:58:23
|
Revision: 3542
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3542&view=rev
Author: spasi
Date: 2011-06-07 17:58:17 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
Added support for AMD_multi_draw_indirect.
Added Paths:
-----------
branches/opengles/LWJGL/src/templates/org/lwjgl/opengl/AMD_multi_draw_indirect.java
Added: branches/opengles/LWJGL/src/templates/org/lwjgl/opengl/AMD_multi_draw_indirect.java
===================================================================
--- branches/opengles/LWJGL/src/templates/org/lwjgl/opengl/AMD_multi_draw_indirect.java (rev 0)
+++ branches/opengles/LWJGL/src/templates/org/lwjgl/opengl/AMD_multi_draw_indirect.java 2011-06-07 17:58:17 UTC (rev 3542)
@@ -0,0 +1,56 @@
+/*
+ * 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 org.lwjgl.util.generator.opengl.GLenum;
+import org.lwjgl.util.generator.opengl.GLsizei;
+import org.lwjgl.util.generator.opengl.GLvoid;
+
+import java.nio.IntBuffer;
+
+import com.sun.mirror.type.PrimitiveType;
+
+public interface AMD_multi_draw_indirect {
+
+ void glMultiDrawArraysIndirectAMD(@GLenum int mode,
+ @BufferObject(BufferKind.IndirectBO) @Check("4 * primcount") @NullTerminated @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect,
+ @GLsizei int primcount,
+ @GLsizei int stride);
+
+ void glMultiDrawElementsIndirectAMD(@GLenum int mode,
+ @GLenum int type,
+ @BufferObject(BufferKind.IndirectBO) @Check("5 * primcount") @NullTerminated @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect,
+ @GLsizei int primcount,
+ @GLsizei int stride);
+
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1095 messages has been excluded from this view by a project administrator.
