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...> - 2010-09-27 12:10:00
|
Revision: 3417
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3417&view=rev
Author: spasi
Date: 2010-09-27 12:09:52 +0000 (Mon, 27 Sep 2010)
Log Message:
-----------
LWJGL 2.5 - JDK1.4 compatible branch
Added Paths:
-----------
branches/lwjgl2.5/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2010-09-27 00:26:11
|
Revision: 3416
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3416&view=rev
Author: spasi
Date: 2010-09-27 00:25:59 +0000 (Mon, 27 Sep 2010)
Log Message:
-----------
Added AL/CL NativeGetFunctionPointer prefixes.
Modified Paths:
--------------
trunk/LWJGL/src/native/macosx/macosx_al.c
trunk/LWJGL/src/native/macosx/macosx_cl.c
Modified: trunk/LWJGL/src/native/macosx/macosx_al.c
===================================================================
--- trunk/LWJGL/src/native/macosx/macosx_al.c 2010-09-27 00:13:31 UTC (rev 3415)
+++ trunk/LWJGL/src/native/macosx/macosx_al.c 2010-09-27 00:25:59 UTC (rev 3416)
@@ -52,7 +52,7 @@
static const struct mach_header* handleOAL = NULL;
static CFBundleRef openal_bundle = NULL;
-void *NativeGetFunctionPointer(const char *function) {
+void *extal_NativeGetFunctionPointer(const char *function) {
void *address = NULL;
if (handleOAL != NULL) {
char *mac_symbol_name = (char *)malloc((strlen(function) + 2)*sizeof(char));
Modified: trunk/LWJGL/src/native/macosx/macosx_cl.c
===================================================================
--- trunk/LWJGL/src/native/macosx/macosx_cl.c 2010-09-27 00:13:31 UTC (rev 3415)
+++ trunk/LWJGL/src/native/macosx/macosx_cl.c 2010-09-27 00:25:59 UTC (rev 3416)
@@ -46,7 +46,7 @@
static const struct mach_header* handleOCL = NULL;
static CFBundleRef opencl_bundle = NULL;
-void *NativeGetFunctionPointer(const char *function) {
+void *extcl_NativeGetFunctionPointer(const char *function) {
void *address = NULL;
if (handleOCL != NULL) {
char *mac_symbol_name = (char *)malloc((strlen(function) + 2)*sizeof(char));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2010-09-27 00:13:37
|
Revision: 3415
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3415&view=rev
Author: spasi
Date: 2010-09-27 00:13:31 +0000 (Mon, 27 Sep 2010)
Log Message:
-----------
Apple's cl_platform.h is missing CL_CALLBACK.
Modified Paths:
--------------
trunk/LWJGL/src/native/common/extcl.h
Modified: trunk/LWJGL/src/native/common/extcl.h
===================================================================
--- trunk/LWJGL/src/native/common/extcl.h 2010-09-26 23:49:09 UTC (rev 3414)
+++ trunk/LWJGL/src/native/common/extcl.h 2010-09-27 00:13:31 UTC (rev 3415)
@@ -55,8 +55,12 @@
// -----------------[ Callback function typedefs ]-----------------
+#ifndef CL_CALLBACK
+ #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)
+#if defined(_WIN32) || defined(_WIN64)
#define CL_USER_FUNC_CALLBACK __cdecl
#else
#define CL_USER_FUNC_CALLBACK CL_CALLBACK
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2010-09-26 23:49:15
|
Revision: 3414
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3414&view=rev
Author: spasi
Date: 2010-09-26 23:49:09 +0000 (Sun, 26 Sep 2010)
Log Message:
-----------
Typo fix.
Modified Paths:
--------------
trunk/LWJGL/platform_build/build-definitions.xml
Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml 2010-09-26 23:44:19 UTC (rev 3413)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2010-09-26 23:49:09 UTC (rev 3414)
@@ -50,7 +50,7 @@
<include name="org/lwjgl/test/opengl/shaders/*.vp" />
<include name="org/lwjgl/test/opengl/shaders/*.vsh" />
<include name="org/lwjgl/test/opengl/shaders/*.fsh" />
- <include name="org/lwjgl/test/opencl/gl/*.cl />
+ <include name="org/lwjgl/test/opencl/gl/*.cl" />
</fileset>
<!-- Files to include in the lwjgl_util.jar file -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2010-09-26 23:44:28
|
Revision: 3413
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3413&view=rev
Author: spasi
Date: 2010-09-26 23:44:19 +0000 (Sun, 26 Sep 2010)
Log Message:
-----------
Added APPLE's cl_platform.h
Added Paths:
-----------
trunk/LWJGL/src/native/common/OpenCL/
trunk/LWJGL/src/native/common/OpenCL/cl_platform.h
Added: trunk/LWJGL/src/native/common/OpenCL/cl_platform.h
===================================================================
--- trunk/LWJGL/src/native/common/OpenCL/cl_platform.h (rev 0)
+++ trunk/LWJGL/src/native/common/OpenCL/cl_platform.h 2010-09-26 23:44:19 UTC (rev 3413)
@@ -0,0 +1,296 @@
+/**********************************************************************************
+ * Copyright (c) 2008-2009 The Khronos Group Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and/or associated documentation files (the
+ * "Materials"), to deal in the Materials without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Materials, and to
+ * permit persons to whom the Materials are furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Materials.
+ *
+ * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+ **********************************************************************************/
+
+#ifndef __CL_PLATFORM_H
+#define __CL_PLATFORM_H
+
+#ifdef __APPLE__
+ /* Contains #defines for AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER below */
+ #include <AvailabilityMacros.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define CL_API_ENTRY
+#define CL_API_CALL
+#ifdef __APPLE__
+#define CL_API_SUFFIX__VERSION_1_0 AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+#define CL_EXTENSION_WEAK_LINK __attribute__((weak_import))
+#else
+#define CL_API_SUFFIX__VERSION_1_0
+#define CL_EXTENSION_WEAK_LINK
+#endif
+
+#if (defined (WIN32) && (_MSC_VER))
+
+/* scalar types */
+typedef signed __int8 cl_char;
+typedef unsigned __int8 cl_uchar;
+typedef signed __int16 cl_short;
+typedef unsigned __int16 cl_ushort;
+typedef signed __int32 cl_int;
+typedef unsigned __int32 cl_uint;
+typedef signed __int64 cl_long;
+typedef unsigned __int64 cl_ulong;
+
+typedef unsigned __int16 cl_half;
+typedef float cl_float;
+typedef double cl_double;
+
+
+/*
+ * Vector types
+ *
+ * Note: OpenCL requires that all types be naturally aligned.
+ * This means that vector types must be naturally aligned.
+ * For example, a vector of four floats must be aligned to
+ * a 16 byte boundary (calculated as 4 * the natural 4-byte
+ * alignment of the float). The alignment qualifiers here
+ * will only function properly if your compiler supports them
+ * and if you don't actively work to defeat them. For example,
+ * in order for a cl_float4 to be 16 byte aligned in a struct,
+ * the start of the struct must itself be 16-byte aligned.
+ *
+ * Maintaining proper alignment is the user's responsibility.
+ */
+typedef signed __int8 cl_char2[2];
+typedef signed __int8 cl_char4[4];
+typedef signed __int8 cl_char8[8];
+typedef signed __int8 cl_char16[16];
+typedef unsigned __int8 cl_uchar2[2];
+typedef unsigned __int8 cl_uchar4[4];
+typedef unsigned __int8 cl_uchar8[8];
+typedef unsigned __int8 cl_uchar16[16];
+
+typedef signed __int16 cl_short2[2];
+typedef signed __int16 cl_short4[4];
+typedef signed __int16 cl_short8[8];
+typedef signed __int16 cl_short16[16];
+typedef unsigned __int16 cl_ushort2[2];
+typedef unsigned __int16 cl_ushort4[4];
+typedef unsigned __int16 cl_ushort8[8];
+typedef unsigned __int16 cl_ushort16[16];
+
+typedef signed __int32 cl_int2[2];
+typedef signed __int32 cl_int4[4];
+typedef signed __int32 cl_int8[8];
+typedef signed __int32 cl_int16[16];
+typedef unsigned __int32 cl_uint2[2];
+typedef unsigned __int32 cl_uint4[4];
+typedef unsigned __int32 cl_uint8[8];
+typedef unsigned __int32 cl_uint16[16];
+
+typedef signed __int64 cl_long2[2];
+typedef signed __int64 cl_long4[4];
+typedef signed __int64 cl_long8[8];
+typedef signed __int64 cl_long16[16];
+typedef unsigned __int64 cl_ulong2[2];
+typedef unsigned __int64 cl_ulong4[4];
+typedef unsigned __int64 cl_ulong8[8];
+typedef unsigned __int64 cl_ulong16[16];
+
+typedef float cl_float2[2];
+typedef float cl_float4[4];
+typedef float cl_float8[8];
+typedef float cl_float16[16];
+
+typedef double cl_double2[2];
+typedef double cl_double4[4];
+typedef double cl_double8[8];
+typedef double cl_double16[16];
+/* There are no vector types for half */
+
+#define CL_CHAR_BIT 8
+#define CL_SCHAR_MAX 127
+#define CL_SCHAR_MIN (-127-1)
+#define CL_CHAR_MAX CL_SCHAR_MAX
+#define CL_CHAR_MIN CL_SCHAR_MIN
+#define CL_UCHAR_MAX 255
+#define CL_SHRT_MAX 32767
+#define CL_SHRT_MIN (-32767-1)
+#define CL_USHRT_MAX 65535
+#define CL_INT_MAX 2147483647
+#define CL_INT_MIN (-2147483647-1)
+#define CL_UINT_MAX 0xffffffffU
+#define CL_LONG_MAX ((cl_long) 0x7FFFFFFFFFFFFFFFLL)
+#define CL_LONG_MIN ((cl_long) -0x7FFFFFFFFFFFFFFFLL - 1LL)
+#define CL_ULONG_MAX ((cl_ulong) 0xFFFFFFFFFFFFFFFFULL)
+
+#define CL_FLT_DIG 6
+#define CL_FLT_MANT_DIG 24
+#define CL_FLT_MAX_10_EXP +38
+#define CL_FLT_MAX_EXP +128
+#define CL_FLT_MIN_10_EXP -37
+#define CL_FLT_MIN_EXP -125
+#define CL_FLT_RADIX 2
+#define CL_FLT_MAX 340282346638528859811704183484516925440.0f
+#define CL_FLT_MIN 1.175494350822287507969e-38f
+#define CL_FLT_EPSILON 0x1.0p-23f
+
+#define CL_DBL_DIG 15
+#define CL_DBL_MANT_DIG 53
+#define CL_DBL_MAX_10_EXP +308
+#define CL_DBL_MAX_EXP +1024
+#define CL_DBL_MIN_10_EXP -307
+#define CL_DBL_MIN_EXP -1021
+#define CL_DBL_RADIX 2
+#define CL_DBL_MAX 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0
+#define CL_DBL_MIN 2.225073858507201383090e-308
+#define CL_DBL_EPSILON 2.220446049250313080847e-16
+
+
+#else
+
+#include <stdint.h>
+
+/* scalar types */
+typedef int8_t cl_char;
+typedef uint8_t cl_uchar;
+typedef int16_t cl_short __attribute__((aligned(2)));
+typedef uint16_t cl_ushort __attribute__((aligned(2)));
+typedef int32_t cl_int __attribute__((aligned(4)));
+typedef uint32_t cl_uint __attribute__((aligned(4)));
+typedef int64_t cl_long __attribute__((aligned(8)));
+typedef uint64_t cl_ulong __attribute__((aligned(8)));
+
+typedef uint16_t cl_half __attribute__((aligned(2)));
+typedef float cl_float __attribute__((aligned(4)));
+typedef double cl_double __attribute__((aligned(8)));
+
+/*
+ * Vector types
+ *
+ * Note: OpenCL requires that all types be naturally aligned.
+ * This means that vector types must be naturally aligned.
+ * For example, a vector of four floats must be aligned to
+ * a 16 byte boundary (calculated as 4 * the natural 4-byte
+ * alignment of the float). The alignment qualifiers here
+ * will only function properly if your compiler supports them
+ * and if you don't actively work to defeat them. For example,
+ * in order for a cl_float4 to be 16 byte aligned in a struct,
+ * the start of the struct must itself be 16-byte aligned.
+ *
+ * Maintaining proper alignment is the user's responsibility.
+ */
+typedef int8_t cl_char2[2] __attribute__((aligned(2)));
+typedef int8_t cl_char4[4] __attribute__((aligned(4)));
+typedef int8_t cl_char8[8] __attribute__((aligned(8)));
+typedef int8_t cl_char16[16] __attribute__((aligned(16)));
+typedef uint8_t cl_uchar2[2] __attribute__((aligned(2)));
+typedef uint8_t cl_uchar4[4] __attribute__((aligned(4)));
+typedef uint8_t cl_uchar8[8] __attribute__((aligned(8)));
+typedef uint8_t cl_uchar16[16] __attribute__((aligned(16)));
+
+typedef int16_t cl_short2[2] __attribute__((aligned(4)));
+typedef int16_t cl_short4[4] __attribute__((aligned(8)));
+typedef int16_t cl_short8[8] __attribute__((aligned(16)));
+typedef int16_t cl_short16[16] __attribute__((aligned(32)));
+typedef uint16_t cl_ushort2[2] __attribute__((aligned(4)));
+typedef uint16_t cl_ushort4[4] __attribute__((aligned(8)));
+typedef uint16_t cl_ushort8[8] __attribute__((aligned(16)));
+typedef uint16_t cl_ushort16[16] __attribute__((aligned(32)));
+
+typedef int32_t cl_int2[2] __attribute__((aligned(8)));
+typedef int32_t cl_int4[4] __attribute__((aligned(16)));
+typedef int32_t cl_int8[8] __attribute__((aligned(32)));
+typedef int32_t cl_int16[16] __attribute__((aligned(64)));
+typedef uint32_t cl_uint2[2] __attribute__((aligned(8)));
+typedef uint32_t cl_uint4[4] __attribute__((aligned(16)));
+typedef uint32_t cl_uint8[8] __attribute__((aligned(32)));
+typedef uint32_t cl_uint16[16] __attribute__((aligned(64)));
+
+typedef int64_t cl_long2[2] __attribute__((aligned(16)));
+typedef int64_t cl_long4[4] __attribute__((aligned(32)));
+typedef int64_t cl_long8[8] __attribute__((aligned(64)));
+typedef int64_t cl_long16[16] __attribute__((aligned(128)));
+typedef uint64_t cl_ulong2[2] __attribute__((aligned(16)));
+typedef uint64_t cl_ulong4[4] __attribute__((aligned(32)));
+typedef uint64_t cl_ulong8[8] __attribute__((aligned(64)));
+typedef uint64_t cl_ulong16[16] __attribute__((aligned(128)));
+
+typedef float cl_float2[2] __attribute__((aligned(8)));
+typedef float cl_float4[4] __attribute__((aligned(16)));
+typedef float cl_float8[8] __attribute__((aligned(32)));
+typedef float cl_float16[16] __attribute__((aligned(64)));
+
+typedef double cl_double2[2] __attribute__((aligned(16)));
+typedef double cl_double4[4] __attribute__((aligned(32)));
+typedef double cl_double8[8] __attribute__((aligned(64)));
+typedef double cl_double16[16] __attribute__((aligned(128)));
+
+/* There are no vector types for half */
+
+/******************************************************************************/
+
+// Macro names and corresponding values defined by OpenCL
+
+#define CL_CHAR_BIT 8
+#define CL_SCHAR_MAX 127
+#define CL_SCHAR_MIN (-127-1)
+#define CL_CHAR_MAX CL_SCHAR_MAX
+#define CL_CHAR_MIN CL_SCHAR_MIN
+#define CL_UCHAR_MAX 255
+#define CL_SHRT_MAX 32767
+#define CL_SHRT_MIN (-32767-1)
+#define CL_USHRT_MAX 65535
+#define CL_INT_MAX 2147483647
+#define CL_INT_MIN (-2147483647-1)
+#define CL_UINT_MAX 0xffffffffU
+#define CL_LONG_MAX ((cl_long) 0x7FFFFFFFFFFFFFFFLL)
+#define CL_LONG_MIN ((cl_long) -0x7FFFFFFFFFFFFFFFLL - 1LL)
+#define CL_ULONG_MAX ((cl_ulong) 0xFFFFFFFFFFFFFFFFULL)
+
+#define CL_FLT_DIG 6
+#define CL_FLT_MANT_DIG 24
+#define CL_FLT_MAX_10_EXP +38
+#define CL_FLT_MAX_EXP +128
+#define CL_FLT_MIN_10_EXP -37
+#define CL_FLT_MIN_EXP -125
+#define CL_FLT_RADIX 2
+#define CL_FLT_MAX 0x1.fffffep127f
+#define CL_FLT_MIN 0x1.0p-126f
+#define CL_FLT_EPSILON 0x1.0p-23f
+
+#define CL_DBL_DIG 15
+#define CL_DBL_MANT_DIG 53
+#define CL_DBL_MAX_10_EXP +308
+#define CL_DBL_MAX_EXP +1024
+#define CL_DBL_MIN_10_EXP -307
+#define CL_DBL_MIN_EXP -1021
+#define CL_DBL_RADIX 2
+#define CL_DBL_MAX 0x1.fffffffffffffp1023
+#define CL_DBL_MIN 0x1.0p-1022
+#define CL_DBL_EPSILON 0x1.0p-52
+
+#endif
+
+#include <stddef.h>
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __CL_PLATFORM_H
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2010-09-26 23:43:37
|
Revision: 3412
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3412&view=rev
Author: spasi
Date: 2010-09-26 23:43:24 +0000 (Sun, 26 Sep 2010)
Log Message:
-----------
Added support for OpenCL & CL/GL interop + minor improvements. [WIP]
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/src/java/org/lwjgl/BufferChecks.java
trunk/LWJGL/src/java/org/lwjgl/BufferUtils.java
trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
trunk/LWJGL/src/java/org/lwjgl/Sys.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AMDDebugOutputCallback.java
trunk/LWJGL/src/java/org/lwjgl/opengl/ARBDebugOutputCallback.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractDrawable.java
trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java
trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java
trunk/LWJGL/src/java/org/lwjgl/opengl/Drawable.java
trunk/LWJGL/src/java/org/lwjgl/opengl/GLSync.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextImplementation.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/VersionTest.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Alternate.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/AutoSize.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Check.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Code.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Constant.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GenerateAutos.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorProcessorFactory.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorVisitor.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/JNITypeTranslator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaTypeTranslator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeType.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/PostfixTranslator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/RegisterStubsGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/SignatureTranslator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/TypeInfo.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/TypeMap.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/TypedefsGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java
trunk/LWJGL/src/native/common/common_tools.c
trunk/LWJGL/src/native/common/common_tools.h
trunk/LWJGL/src/native/common/extal.c
trunk/LWJGL/src/native/common/extal.h
trunk/LWJGL/src/native/common/extgl.h
trunk/LWJGL/src/native/common/org_lwjgl_openal_AL.c
trunk/LWJGL/src/native/linux/linux_al.c
trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxContextImplementation.c
trunk/LWJGL/src/native/macosx/macosx_al.c
trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsContextImplementation.c
trunk/LWJGL/src/native/windows/windows_al.c
trunk/LWJGL/src/templates/org/lwjgl/openal/AL10.java
trunk/LWJGL/src/templates/org/lwjgl/openal/AL11.java
trunk/LWJGL/src/templates/org/lwjgl/openal/EFX10.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_debug_output.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_draw_buffers_blend.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_name_gen_delete.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_tessellator.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_element_array.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_fence.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_flush_buffer_range.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_texture_range.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_vertex_array_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_vertex_array_range.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_vertex_program_evaluators.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_ES2_compatibility.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_blend_func_extended.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_copy_buffer.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_output.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_buffers.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_buffers_blend.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_elements_base_vertex.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_indirect.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_instanced.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_geometry_shader4.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_get_program_binary.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_gpu_shader_fp64.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_imaging.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_instanced_arrays.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_map_buffer_range.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_matrix_palette.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_multisample.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_multitexture.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_point_parameters.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_provoking_vertex.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_robustness.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sample_shading.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sampler_objects.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shading_language_include.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_tessellation_shader.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_buffer_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_multisample.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_timer_query.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_transform_feedback2.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_transform_feedback3.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_array_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_attrib_64bit.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_blend.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_program.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_type_2_10_10_10_rev.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_viewport_array.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_draw_buffers.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_element_array.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_envmap_bumpmap.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_fragment_shader.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_pn_triangles.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_separate_stencil.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_vertex_attrib_array_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_vertex_streams.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_bindable_uniform.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_blend_color.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_blend_equation_separate.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_blend_func_separate.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_blend_minmax.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_compiled_vertex_array.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_depth_bounds_test.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_draw_buffers2.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_draw_instanced.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_draw_range_elements.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_fog_coord.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_blit.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_multisample.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_geometry_shader4.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_program_parameters.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_multi_draw_arrays.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_paletted_texture.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_point_parameters.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_provoking_vertex.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_secondary_color.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_separate_shader_objects.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_shader_image_load_store.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_stencil_clear_tag.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_stencil_two_side.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_texture_array.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_texture_buffer_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_texture_integer.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_timer_query.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_transform_feedback.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_attrib_64bit.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_shader.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_weighting.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL12.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL14.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL21.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL41.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GREMEDY_string_marker.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_conditional_render.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_copy_image.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_evaluators.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_explicit_multisample.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_fence.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_fragment_program.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_framebuffer_multisample_coverage.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_geometry_program4.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_gpu_program4.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_gpu_shader5.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_half_float.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_occlusion_query.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_parameter_buffer_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_pixel_data_range.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_point_sprite.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_primitive_restart.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_program.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_register_combiners.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_register_combiners2.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback2.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_attrib_integer_64bit.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_program.java
Added Paths:
-----------
trunk/LWJGL/src/java/org/lwjgl/PointerBuffer.java
trunk/LWJGL/src/java/org/lwjgl/PointerWrapper.java
trunk/LWJGL/src/java/org/lwjgl/PointerWrapperAbstract.java
trunk/LWJGL/src/java/org/lwjgl/opencl/
trunk/LWJGL/src/java/org/lwjgl/opencl/APIUtil.java
trunk/LWJGL/src/java/org/lwjgl/opencl/APPLEContextLoggingUtil.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CL.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLBuildProgramCallback.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLCallback.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLChecks.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLCommandQueue.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLContext.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLContextCallback.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLDevice.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLDeviceImpl.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLEvent.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLEventCallback.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLFunctionAddress.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLKernel.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLKernelImpl.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLMem.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLMemObjectDestructorCallback.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLNativeKernel.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLObject.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLObjectChild.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLObjectRegistry.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLObjectRegistryGlobal.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLPlatform.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLPlatformImpl.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLProgram.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CLSampler.java
trunk/LWJGL/src/java/org/lwjgl/opencl/CallbackUtil.java
trunk/LWJGL/src/java/org/lwjgl/opencl/OpenCLException.java
trunk/LWJGL/src/java/org/lwjgl/opencl/Util.java
trunk/LWJGL/src/java/org/lwjgl/opencl/api/
trunk/LWJGL/src/java/org/lwjgl/opencl/api/Filter.java
trunk/LWJGL/src/java/org/lwjgl/opengl/APIUtil.java
trunk/LWJGL/src/java/org/lwjgl/opengl/CallbackUtil.java
trunk/LWJGL/src/java/org/lwjgl/test/opencl/
trunk/LWJGL/src/java/org/lwjgl/test/opencl/HelloOpenCL.java
trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/
trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/DemoFractal.java
trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/Mandelbrot.cl
trunk/LWJGL/src/java/org/lwjgl/util/generator/Extern.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Helper.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Imports.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/PointerArray.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/PointerWrapper.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Private.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Reuse.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/openal/
trunk/LWJGL/src/java/org/lwjgl/util/generator/openal/ALTypeMap.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/openal/ALboolean.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/openal/ALbyte.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/openal/ALdouble.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/openal/ALenum.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/openal/ALfloat.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/openal/ALint.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/openal/ALshort.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/openal/ALsizei.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/openal/ALubyte.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/openal/ALuint.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/openal/ALvoid.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/CLCapabilitiesGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/CLDeviceExtension.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/CLGeneratorProcessorFactory.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/CLPDCapabilitiesGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/CLPlatformExtension.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/CLTypeMap.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/cl_bitfield.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/cl_bool.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/cl_byte.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/cl_char.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/cl_double.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/cl_float.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/cl_int.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/cl_long.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/cl_short.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/cl_uchar.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/cl_uint.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/cl_void.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opencl/size_t.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLCapabilitiesGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLGeneratorProcessorFactory.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLReferencesGeneratorProcessorFactory.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLTypeMap.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLbitfield.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLboolean.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLbyte.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLchar.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLcharARB.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLclampd.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLclampf.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLdouble.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLenum.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLfloat.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLhalf.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLhandleARB.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLint.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLint64.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLint64EXT.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLintptr.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLintptrARB.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLreturn.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLshort.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLsizei.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLsizeiptr.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLsizeiptrARB.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLtime.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLubyte.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLuint.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLuint64.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLuint64EXT.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLushort.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLvoid.java
trunk/LWJGL/src/native/common/CL/
trunk/LWJGL/src/native/common/CL/cl.h
trunk/LWJGL/src/native/common/CL/cl_d3d10.h
trunk/LWJGL/src/native/common/CL/cl_ext.h
trunk/LWJGL/src/native/common/CL/cl_gl.h
trunk/LWJGL/src/native/common/CL/cl_gl_ext.h
trunk/LWJGL/src/native/common/CL/cl_platform.h
trunk/LWJGL/src/native/common/extcl.c
trunk/LWJGL/src/native/common/extcl.h
trunk/LWJGL/src/native/common/extcl_types.h
trunk/LWJGL/src/native/common/extgl_types.h
trunk/LWJGL/src/native/common/opencl.h
trunk/LWJGL/src/native/common/org_lwjgl_opencl_CL.c
trunk/LWJGL/src/native/common/org_lwjgl_opencl_CL.h
trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.c
trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.h
trunk/LWJGL/src/native/common/org_lwjgl_opengl_CallbackUtil.c
trunk/LWJGL/src/native/common/org_lwjgl_opengl_CallbackUtil.h
trunk/LWJGL/src/native/linux/linux_cl.c
trunk/LWJGL/src/native/macosx/macosx_cl.c
trunk/LWJGL/src/native/windows/windows_cl.c
trunk/LWJGL/src/templates/org/lwjgl/opencl/
trunk/LWJGL/src/templates/org/lwjgl/opencl/AMD_device_attribute_query.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/AMD_fp64.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/AMD_media_ops.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/AMD_printf.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/APPLE_ContextLoggingFunctions.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/APPLE_SetMemObjectDestructor.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/APPLE_gl_sharing.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/CL10.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/CL10GL.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/CL11.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/EXT_device_fission.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/EXT_migrate_memobject.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_3d_image_writes.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_byte_addressable_store.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_fp16.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_fp64.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_gl_event.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_gl_sharing.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_global_int32_base_atomics.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_global_int32_extended_atomics.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_icd.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_int64_base_atomics.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_int64_extended_atomics.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_local_int32_base_atomics.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_local_int32_extended_atomics.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_cl_event.java
Removed Paths:
-------------
trunk/LWJGL/src/java/org/lwjgl/opengl/AMDDebugOutputUtil.java
trunk/LWJGL/src/java/org/lwjgl/opengl/APIUtils.java
trunk/LWJGL/src/java/org/lwjgl/opengl/ARBDebugOutputUtil.java
trunk/LWJGL/src/java/org/lwjgl/opengl/PointerWrapper.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALTypeMap.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALboolean.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALbyte.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALdouble.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALenum.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALfloat.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALint.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALshort.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALsizei.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALubyte.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALuint.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ALvoid.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/AutoResultSize.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLbitfield.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLboolean.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLbyte.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLchar.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLcharARB.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLclampd.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLclampf.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLdouble.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLenum.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLfloat.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLhalf.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLhandleARB.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLint.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLint64.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLint64EXT.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLintptr.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLintptrARB.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLpointer.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLreturn.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLshort.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLsizei.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLsizeiptr.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLsizeiptrARB.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLtime.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLubyte.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLuint.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLuint64.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLuint64EXT.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLushort.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLvoid.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ReferencesGeneratorProcessorFactory.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/StringList.java
trunk/LWJGL/src/native/common/org_lwjgl_opengl_AMDDebugOutputCallback.c
trunk/LWJGL/src/native/common/org_lwjgl_opengl_ARBDebugOutputCallback.c
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2010-09-21 09:51:05 UTC (rev 3411)
+++ trunk/LWJGL/build.xml 2010-09-26 23:43:24 UTC (rev 3412)
@@ -32,19 +32,19 @@
<mkdir dir="${lwjgl.temp}/native/macosx" taskname="initialiazing temp/macosx folder" />
<mkdir dir="${lwjgl.temp}/native/solaris" taskname="initialiazing temp/solaris folder" />
</target>
-
+
<!-- Cleans up any files created during the execution of this script -->
- <target name="clean" description="Cleans the diectories controlled by this ant script" depends="clean-generated">
+ <target name="clean" description="Cleans the directories controlled by this ant script" depends="clean-generated">
<delete dir="${lwjgl.temp}" quiet="true" failonerror="false" taskname="cleaning temp folder" />
<delete dir="${lwjgl.docs}/javadoc" quiet="true" failonerror="false" taskname="cleaning javadoc folder" />
<delete dir="${lwjgl.bin}" quiet="true" failonerror="false" taskname="cleaning bin folder" />
</target>
-
+
<!-- Creates a distribution of LWJGL -->
<target name="release" description="Creates a distribution of LWJGL using supplied native binaries">
<!-- Warn user -->
<echo message="Before running the release target, please manually compile all platforms and place required files in ${lwjgl.lib}/windows, ${lwjgl.lib}/linux and ${lwjgl.lib}/macosx${line.separator}Missing files will result in a successfull built, but with incomplete release zips"/>
- <input
+ <input
message="All data in the ${lwjgl.dist} folder will be deleted. Continue? "
validargs="yes,no"
addproperty="do.delete"
@@ -53,7 +53,7 @@
<equals arg1="no" arg2="${do.delete}"/>
</condition>
<fail if="do.abort">Build aborted by user.</fail>
-
+
<!-- prepare -->
<delete dir="${lwjgl.dist}" quiet="true" failonerror="false" />
<antcall target="clean" />
@@ -72,19 +72,19 @@
<antcall target="-jars_NoDEP" />
<antcall target="javadoc" />
<antcall target="applet-release" />
-
+
<!-- copy resources to res folder -->
<copy todir="${lwjgl.temp}/res">
<fileset dir="res"/>
</copy>
-
+
<!-- copy docs -->
<copy todir="${lwjgl.temp}/doc">
<fileset dir="${lwjgl.docs}">
<patternset refid="lwjgl-docs.fileset" />
</fileset>
</copy>
-
+
<!-- create distribution from files in libs/ and temp/ -->
<antcall target="-distribution_javadoc" />
<antcall target="-distribution_source" />
@@ -105,7 +105,7 @@
</fileset>
</move>
</target>
-
+
<!-- Packages the java files -->
<target name="-createdebugjars">
<!-- Create lwjgl.jar -->
@@ -116,7 +116,7 @@
</manifest>
</jar>
</target>
-
+
<!-- Packages the java files -->
<target name="-createjars">
<!-- Create lwjgl.jar -->
@@ -126,7 +126,7 @@
<attribute name="Sealed" value="true"/>
</manifest>
</jar>
-
+
<!-- Create lwjgl_util_applet.jar -->
<jar destfile="${lwjgl.temp}/jar/lwjgl_util_applet.jar" taskname="lwjgl_util_applet.jar">
<fileset refid="lwjgl_util_applet.fileset" />
@@ -151,7 +151,7 @@
<target name="-distribute">
<delete>
<fileset dir="${lwjgl.temp}/native/" includes="**/*"/>
- </delete>
+ </delete>
<copy todir="${lwjgl.temp}/jar">
<fileset dir="${lwjgl.lib}/" includes="*.jar"/>
@@ -175,20 +175,20 @@
<fileset dir="${lwjgl.lib}/solaris">
<patternset refid="lwjgl-solaris.fileset" />
</fileset>
- </copy>
-
+ </copy>
+
<!-- create base package -->
<zip destfile="${lwjgl.dist}/lwjgl-${lwjgl.version}.zip">
<zipfileset dir="${lwjgl.temp}" prefix="lwjgl-${lwjgl.version}/">
<patternset refid="lwjgl_base"/>
- </zipfileset>
+ </zipfileset>
</zip>
-
+
<!-- create applet package -->
<zip destfile="${lwjgl.dist}/lwjgl_applet-${lwjgl.version}.zip">
<zipfileset dir="." prefix="lwjgl_applet-${lwjgl.version}/">
<patternset refid="lwjgl_applet"/>
- </zipfileset>
+ </zipfileset>
</zip>
</target>
@@ -196,14 +196,14 @@
<target name="-distribution_javadoc">
<zip destfile="${lwjgl.dist}/lwjgl-docs-${lwjgl.version}.zip" basedir="${lwjgl.docs}" includes="javadoc/**" />
</target>
-
+
<!-- Creates a versioned distribution of the source code -->
<target name="-distribution_source">
<zip destfile="${lwjgl.dist}/lwjgl-source-${lwjgl.version}.zip">
<fileset refid="lwjgl.source.fileset" />
</zip>
- </target>
-
+ </target>
+
<!-- Generates the native headers from source files -->
<target name="headers" description="invokes javah on java classes" depends="compile">
<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/linux" force="yes">
@@ -251,17 +251,18 @@
<class name="org.lwjgl.openal.AL" />
<class name="org.lwjgl.opengl.GLContext" />
<class name="org.lwjgl.opengl.Pbuffer" />
- <class name="org.lwjgl.opengl.AMDDebugOutputCallback" />
- <class name="org.lwjgl.opengl.ARBDebugOutputCallback" />
+ <class name="org.lwjgl.opengl.CallbackUtil" />
+ <class name="org.lwjgl.opencl.CL" />
+ <class name="org.lwjgl.opencl.CallbackUtil" />
</javah>
</target>
-
+
<target name="touch-version">
<touch file="${lwjgl.src.native}/windows/org_lwjgl_opengl_Display.c"/>
<touch file="${lwjgl.src.native}/linux/org_lwjgl_opengl_Display.c"/>
<touch file="${lwjgl.src.native}/macosx/org_lwjgl_opengl_Display.m"/>
</target>
-
+
<target name="version-mismatch">
<loadfile srcfile="${lwjgl.src}/java/org/lwjgl/WindowsSysImplementation.java" property="lwjgl.java.windows.version">
<filterchain>
@@ -276,7 +277,7 @@
<containsstring contains="JNI_VERSION ="/>
</tokenfilter>
</filterchain>
- </loadfile>
+ </loadfile>
<loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version">
<filterchain>
<tokenfilter>
@@ -297,7 +298,7 @@
<containsstring contains="#define org_lwjgl_LinuxSysImplementation_JNI_VERSION"/>
</tokenfilter>
</filterchain>
- </loadfile>
+ </loadfile>
<loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
<filterchain>
<tokenfilter>
@@ -307,14 +308,14 @@
</loadfile>
<echo>
lwjgl.java.windows.version = ${lwjgl.java.windows.version}
- lwjgl.native.windows.version = ${lwjgl.native.windows.version}
+ lwjgl.native.windows.version = ${lwjgl.native.windows.version}
lwjgl.java.linux.version = ${lwjgl.java.linux.version}
- lwjgl.native.linux.version = ${lwjgl.native.linux.version}
+ lwjgl.native.linux.version = ${lwjgl.native.linux.version}
lwjgl.java.macosx.version = ${lwjgl.java.macosx.version}
- lwjgl.native.macosx.version = ${lwjgl.native.macosx.version}
+ lwjgl.native.macosx.version = ${lwjgl.native.macosx.version}
</echo>
</target>
-
+
<macrodef name="version-check">
<attribute name="platform"/>
<sequential>
@@ -325,7 +326,7 @@
<pathelement path="${java.class.path}"/>
</classpath>
</java>
-
+
<fail message="Unable to load native library: ${nativetest.err}">
<condition>
<not>
@@ -333,27 +334,28 @@
</not>
</condition>
</fail>
-
+
<echo message="Successfully executed NativeTest"/>
</sequential>
</macrodef>
-
+
<!-- Compiles the Java source code -->
<target name="compile" description="Compiles the java source code" depends="-initialize">
- <javac debug="yes" destdir="${lwjgl.bin}" source="1.4" target="1.4" classpath="${lwjgl.lib}/jinput.jar:${lwjgl.lib}/AppleJavaExtensions.jar" taskname="core">
+ <javac debug="yes" destdir="${lwjgl.bin}" source="1.5" target="1.5" classpath="${lwjgl.lib}/jinput.jar:${lwjgl.lib}/AppleJavaExtensions.jar" taskname="core">
<src path="${lwjgl.src}/java/"/>
<src path="${lwjgl.src}/generated/"/>
<include name="org/lwjgl/*.java"/>
<include name="org/lwjgl/input/**"/>
<include name="org/lwjgl/opengl/**"/>
<include name="org/lwjgl/openal/**"/>
+ <include name="org/lwjgl/opencl/**"/>
<include name="org/lwjgl/util/**"/>
<exclude name="org/lwjgl/util/generator/**"/>
</javac>
- <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/test/**" source="1.4" target="1.4" taskname="test" />
- <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/examples/**" source="1.4" target="1.4" taskname="examples" />
- </target>
-
+ <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/test/**" source="1.5" target="1.5" taskname="test" />
+ <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/examples/**" source="1.5" target="1.5" taskname="examples" />
+ </target>
+
<target name="compile_native" depends="headers, touch-version, version-mismatch" description="Compiles the native files">
<condition property="lwjgl.platform.windows">
<os family="windows" />
@@ -374,7 +376,7 @@
<os name="Mac OS X" />
</condition>
<antcall target="-compile_native_macosx" />
- </target>
+ </target>
<!-- Compiles LWJGL on Win32 platforms -->
<target name="-compile_native_win32" if="lwjgl.platform.windows">
@@ -410,7 +412,7 @@
<copy file="${lwjgl.bin}/lwjgl/liblwjgl.jnilib" todir="${lwjgl.lib}/macosx"/>
<version-check platform="macosx"/>
</target>
-
+
<target name="repack200" description="Pack200-repack a jar file">
<pack200 src="${input}" destfile="${output}" repack="true"/>
</target>
@@ -430,7 +432,7 @@
<arg value="${output}"/>
</java>
</target>
-
+
<target name="compress-sign-class">
<antcall target="repack200">
<param name="input" value="${dir}${jarfile}.jar"/>
@@ -450,14 +452,14 @@
<!--delete file="${dir}${jarfile}.jar"/-->
<rename src="${dir}${jarfile}-repack.jar" dest="${dir}${jarfile}.jar" replace="yes"/>
</target>
-
+
<target name="compress-resource">
<antcall target="lzma">
<param name="input" value="${input}"/>
<param name="output" value="${output}"/>
</antcall>
</target>
-
+
<target name="applettest" depends="applet">
<exec executable="appletviewer">
<arg value="-J-Djava.security.policy=applet/appletviewer.policy"/>
@@ -487,8 +489,8 @@
<sysproperty key="java.library.path" value="${native_path_expanded}"/>
<arg line="${args}"/>
</java>
- </target>
-
+ </target>
+
<!-- Creates the Javadoc -->
<target name="javadoc" description="Creates javadoc from java source code">
<javadoc destdir="${lwjgl.docs}/javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API" useexternalfile="true">
Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml 2010-09-21 09:51:05 UTC (rev 3411)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2010-09-26 23:43:24 UTC (rev 3412)
@@ -2,19 +2,22 @@
<!-- ================================================================== -->
<!-- Global properties for build -->
<!-- ================================================================== -->
- <property name="lwjgl.src" location="src" />
- <property name="lwjgl.src.native" location="${lwjgl.src}/native" />
- <property name="lwjgl.src.headers" location="${lwjgl.src.native}/common" />
- <property name="lwjgl.src.templates" location="${lwjgl.src}/templates" />
- <property name="lwjgl.bin" location="bin" />
- <property name="lwjgl.lib" location="libs" />
- <property name="lwjgl.dist" location="dist" />
- <property name="lwjgl.docs" location="doc" />
- <property name="lwjgl.temp" location="temp" />
- <property name="lwjgl.res" location="res" />
+ <property name="lwjgl.src" location="src" />
+ <property name="lwjgl.src.native" location="${lwjgl.src}/native" />
+ <property name="lwjgl.src.headers" location="${lwjgl.src.native}/common" />
+ <property name="lwjgl.src.templates" location="${lwjgl.src}/templates" />
+ <property name="lwjgl.bin" location="bin" />
+ <property name="lwjgl.lib" location="libs" />
+ <property name="lwjgl.dist" location="dist" />
+ <property name="lwjgl.docs" location="doc" />
+ <property name="lwjgl.temp" location="temp" />
+ <property name="lwjgl.res" location="res" />
<property name="lwjgl.version" value="2.6" />
<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="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}"/>
+
<!-- ================================================================== -->
<!-- Filesets used for targets -->
<!-- ================================================================== -->
@@ -39,18 +42,16 @@
<include name="org/lwjgl/test/**" />
<include name="org/lwjgl/examples/**" />
</fileset>
-
+
<!-- More files to include in the lwjgl_test.jar file -->
<fileset id="lwjgl_test_extra.fileset" dir="${lwjgl.src}/java">
<exclude name="**.*" />
- <include name="org/lwjgl/test/opengl/shaders/shaderFP.fp" />
- <include name="org/lwjgl/test/opengl/shaders/shaderFP.vp" />
- <include name="org/lwjgl/test/opengl/shaders/shaderFSH.fsh" />
- <include name="org/lwjgl/test/opengl/shaders/shaderFSH.vsh" />
- <include name="org/lwjgl/test/opengl/shaders/shaderVP.vp" />
- <include name="org/lwjgl/test/opengl/shaders/shaderVSH.vsh" />
- <include name="org/lwjgl/test/opengl/shaders/shaderUNI.vsh" />
- </fileset>
+ <include name="org/lwjgl/test/opengl/shaders/*.fp" />
+ <include name="org/lwjgl/test/opengl/shaders/*.vp" />
+ <include name="org/lwjgl/test/opengl/shaders/*.vsh" />
+ <include name="org/lwjgl/test/opengl/shaders/*.fsh" />
+ <include name="org/lwjgl/test/opencl/gl/*.cl />
+ </fileset>
<!-- Files to include in the lwjgl_util.jar file -->
<fileset id="lwjgl_util.fileset" dir="${lwjgl.bin}">
@@ -66,7 +67,7 @@
<include name="org/lwjgl/test/applet/**"/>
<include name="org/lwjgl/test/opengl/awt/AWTGearsCanvas.class"/>
</fileset>
-
+
<!-- Files to make Javadoc from -->
<fileset id="lwjgl.javadoc.fileset" dir="${lwjgl.src}">
<include name="**/*.java" />
@@ -95,15 +96,15 @@
<include name="jinput-dx8*.dll" />
<include name="jinput-raw*.dll" />
</patternset>
-
+
<!-- Files to include in linux, glibc2.3 package -->
<patternset id="lwjgl-linux.fileset">
<include name="liblwjgl*.so" />
- <include name="libopenal*.so" />
+ <include name="libopenal*.so" />
<include name="libjinput-linux.so" />
<include name="libjinput-linux64.so" />
</patternset>
-
+
<!-- Files to include in mac os x package -->
<patternset id="lwjgl-macosx.fileset">
<include name="liblwjgl.jnilib" />
@@ -111,13 +112,13 @@
<include name="libjinput-osx.jnilib" />
<include name="libjinput-osx-legacy.jnilib" />
</patternset>
-
+
<!-- Files to include in solaris package -->
<patternset id="lwjgl-solaris.fileset">
<include name="liblwjgl*.so" />
- <include name="libopenal.so" />
+ <include name="libopenal.so" />
</patternset>
-
+
<!-- Files to include in source distribution -->
<fileset id="lwjgl.source.fileset" dir=".">
<include name="build.xml" />
@@ -132,7 +133,7 @@
<exclude name="res/Missing_you.mod" />
<exclude name="res/phero*.*" />
</patternset>
-
+
<!-- files in the optional package -->
<patternset id="lwjgl_optional">
<include name="res/**" />
@@ -143,15 +144,15 @@
<include name="doc/CREDITS" />
<include name="doc/LICENSE" />
<include name="doc/README" />
- </patternset>
-
+ </patternset>
+
<!-- files in the lwjgl_applet package -->
<patternset id="lwjgl_applet">
<include name="applet/**" />
<exclude name="applet/appletviewer.policy" />
<exclude name="applet/lwjglkeystore" />
- </patternset>
-
+ </patternset>
+
<uptodate property="lwjgl.main.built" targetfile="${lwjgl.lib}/windows/lwjgl.dll" >
<srcfiles dir= "${lwjgl.src.native}/common" includes="*.c*"/>
<srcfiles dir= "${lwjgl.src.native}/windows" includes="*.c"/>
Modified: trunk/LWJGL/platform_build/build-generator.xml
===================================================================
--- trunk/LWJGL/platform_build/build-generator.xml 2010-09-21 09:51:05 UTC (rev 3411)
+++ trunk/LWJGL/platform_build/build-generator.xml 2010-09-26 23:43:24 UTC (rev 3412)
@@ -11,21 +11,38 @@
<!-- Compiles the Java generator source code -->
<target name="generators" description="Compiles the native method generators">
<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/opencl/**.java"/>
<compilerarg value="-Xlint:all"/>
</javac>
<!-- Compile helper classes used by the templates -->
- <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" source="1.4" target="1.4" taskname="generator">
+ <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" source="1.5" target="1.5" taskname="generator">
+ <include name="org/lwjgl/PointerWrapper.java"/>
+ <include name="org/lwjgl/PointerBuffer.java"/>
+ <!-- OpenGL -->
<include name="org/lwjgl/opengl/GLSync.java"/>
<include name="org/lwjgl/opengl/AMDDebugOutputCallback.java"/>
<include name="org/lwjgl/opengl/ARBDebugOutputCallback.java"/>
- <include name="org/lwjgl/opengl/PointerWrapper.java"/>
+ <!-- OpenCL -->
+ <include name="org/lwjgl/opencl/CLPlatform.java"/>
+ <include name="org/lwjgl/opencl/CLDevice.java"/>
+ <include name="org/lwjgl/opencl/CLContext.java"/>
+ <include name="org/lwjgl/opencl/CLContextCallback.java"/>
+ <include name="org/lwjgl/opencl/CLCommandQueue.java"/>
+ <include name="org/lwjgl/opencl/CLMem.java"/>
+ <include name="org/lwjgl/opencl/CLMemObjectDestructorCallback.java"/>
+ <include name="org/lwjgl/opencl/CLBuildProgramCallback.java"/>
+ <include name="org/lwjgl/opencl/CLNativeKernel.java"/>
+ <include name="org/lwjgl/opencl/CLEventCallback.java"/>
+ <include name="org/lwjgl/opencl/CLFunctionAddress.java"/>
</javac>
</target>
<!-- Proxy target to generate it all -->
- <target name="generate-all" depends="generate-openal, generate-opengl, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
+ <target name="generate-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-debug" depends="generate-openal-debug, generate-opengl-debug, generate-opengl-capabilities-debug, generate-opengl-references" description="Generates java and native source"/>
+ <target name="generate-debug" depends="generate-openal-debug, generate-opengl-debug, generate-opengl-capabilities-debug, generate-opengl-references, generate-opencl-debug, generate-opencl-capabilities-debug" description="Generates java and native source with debug functionality"/>
<!-- Generate OpenAL -->
<target name="generate-openal" depends="generators" description="Generates java and native source for AL">
@@ -39,7 +56,7 @@
<arg path="${lwjgl.src}/generated"/>
<arg value="-d"/>
<arg path="${lwjgl.src.native}/generated"/>
- <arg value="-Atypemap=org.lwjgl.util.generator.ALTypeMap"/>
+ <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>
</target>
@@ -56,7 +73,7 @@
<arg path="${lwjgl.src}/generated"/>
<arg value="-d"/>
<arg path="${lwjgl.src.native}/generated"/>
- <arg value="-Atypemap=org.lwjgl.util.generator.ALTypeMap"/>
+ <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>
@@ -75,7 +92,7 @@
<arg value="-d"/>
<arg path="${lwjgl.src.native}/generated"/>
<arg value="-Acontextspecific"/>
- <arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/>
+ <arg value="-Atypemap=org.lwjgl.util.generator.opengl.GLTypeMap"/>
<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>
</apply>
</target>
@@ -94,17 +111,17 @@
<arg path="${lwjgl.src.native}/generated"/>
<arg value="-Ageneratechecks"/>
<arg value="-Acontextspecific"/>
- <arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/>
+ <arg value="-Atypemap=org.lwjgl.util.generator.opengl.GLTypeMap"/>
<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>
</apply>
</target>
- <!-- Generate references -->
+ <!-- Generate OpenGL references -->
<target name="generate-opengl-references" depends="generators" description="Generates java and native source for GL">
<apply executable="apt" parallel="true">
<arg value="-nocompile"/>
<arg value="-factory"/>
- <arg value="org.lwjgl.util.generator.ReferencesGeneratorProcessorFactory"/>
+ <arg value="org.lwjgl.util.generator.opengl.GLReferencesGeneratorProcessorFactory"/>
<arg value="-cp"/>
<arg path="${lwjgl.src}/java:${lwjgl.src.templates}:${lwjgl.bin}:${java.class.path}"/>
<arg value="-s"/>
@@ -113,12 +130,12 @@
</apply>
</target>
- <!-- Generate context capabilities -->
+ <!-- Generate OpenGL context capabilities -->
<target name="generate-opengl-capabilities" depends="generators" description="Generates java and native source for GL">
<apply executable="apt" parallel="true">
<arg value="-nocompile"/>
<arg value="-factory"/>
- <arg value="org.lwjgl.util.generator.ContextGeneratorProcessorFactory"/>
+ <arg value="org.lwjgl.util.generator.opengl.GLGeneratorProcessorFactory"/>
<arg value="-cp"/>
<arg path="${lwjgl.src}/java:${lwjgl.src.templates}:${lwjgl.bin}:${java.class.path}"/>
<arg value="-s"/>
@@ -128,12 +145,12 @@
</apply>
</target>
- <!-- Generate context capabilities [DEBUG] -->
+ <!-- Generate OpenGL context capabilities [DEBUG] -->
<target name="generate-opengl-capabilities-debug" depends="generators" description="Generates java and native source for GL">
<apply executable="apt" parallel="true">
<arg value="-nocompile"/>
<arg value="-factory"/>
- <arg value="org.lwjgl.util.generator.ContextGeneratorProcessorFactory"/>
+ <arg value="org.lwjgl.util.generator.opengl.GLGeneratorProcessorFactory"/>
<arg value="-cp"/>
<arg path="${lwjgl.src}/java:${lwjgl.src.templates}:${lwjgl.bin}:${java.class.path}"/>
<arg value="-s"/>
@@ -143,4 +160,72 @@
<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>
</apply>
</target>
+
+ <!-- Generate OpenCL -->
+ <target name="generate-opencl" depends="generators" description="Generates java and native source for CL">
+ <apply executable="apt" parallel="true">
+ <arg value="-nocompile"/>
+ <arg value="-factory"/>
+ <arg value="org.lwjgl.util.generator.GeneratorProcessorFactory"/>
+ <arg value="-cp"/>
+ <arg path="${lwjgl.src}/java:${lwjgl.src.templates}:${lwjgl.bin}:${java.class.path}"/>
+ <arg value="-s"/>
+ <arg path="${lwjgl.src}/generated"/>
+ <arg value="-d"/>
+ <arg path="${lwjgl.src.native}/generated"/>
+ <arg value="-Acontextspecific"/>
+ <arg value="-Atypemap=org.lwjgl.util.generator.opencl.CLTypeMap"/>
+ <fileset dir="${lwjgl.src.templates}" includes="${opencl-template-pattern}"/>
+ </apply>
+ </target>
+
+ <!-- Generate OpenCL [DEBUG] -->
+ <target name="generate-opencl-debug" depends="generators" description="Generates java and native source for CL">
+ <apply executable="apt" parallel="true">
+ <arg value="-nocompile"/>
+ <arg value="-factory"/>
+ <arg value="org.lwjgl.util.generator.GeneratorProcessorFactory"/>
+ <arg value="-cp"/>
+ <arg path="${lwjgl.src}/java:${lwjgl.src.templates}:${lwjgl.bin}:${java.class.path}"/>
+ <arg value="-s"/>
+ <arg path="${lwjgl.src}/generated"/>
+ <arg value="-d"/>
+ <arg path="${lwjgl.src.native}/generated"/>
+ <arg value="-Ageneratechecks"/>
+ <arg value="-Acontextspecific"/>
+ <arg value="-Atypemap=org.lwjgl.util.generator.opencl.CLTypeMap"/>
+ <fileset dir="${lwjgl.src.templates}" includes="${opencl-template-pattern}"/>
+ </apply>
+ </target>
+
+ <!-- Generate OpenCL capabilities -->
+ <target name="generate-opencl-capabilities" depends="generators" description="Generates capabilities for CL">
+ <apply executable="apt" parallel="true">
+ <arg value="-nocompile"/>
+ <arg value="-factory"/>
+ <arg value="org.lwjgl.util.generator.opencl.CLGeneratorProcessorFactory"/>
+ <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="${opencl-template-pattern}"/>
+ </apply>
+ </target>
+
+ <!-- Generate OpenCL capabilities [DEBUG] -->
+ <target name="generate-opencl-capabilities-debug" depends="generators" description="Generates capabilities for CL">
+ <apply executable="apt" parallel="true">
+ <arg value="-nocompile"/>
+ <arg value="-factory"/>
+ <arg value="org.lwjgl.util.generator.opencl.CLGeneratorProcessorFactory"/>
+ <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="${opencl-template-pattern}"/>
+ </apply>
+ </target>
</project>
Modified: trunk/LWJGL/platform_build/linux_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build.xml 2010-09-21 09:51:05 UTC (rev 3411)
+++ trunk/LWJGL/platform_build/linux_ant/build.xml 2010-09-26 23:43:24 UTC (rev 3412)
@@ -16,7 +16,7 @@
<fileset dir="." includes="*.so"/>
</delete>
</target>
-
+
<target name="compile">
<exec executable="uname" outputproperty="hwplatform">
<arg value="-m"/>
@@ -27,10 +27,10 @@
<condition property="cflags_pthread" value="-pthreads" else="-pthread">
<os name="SunOS" />
</condition>
- <condition property="version_script_flags32" value="" else="-Wl,--version-script=${native}/linux/lwjgl.map">
+ <condition property="version_script_flags32" value="" else="-Wl,--version-script='${native}/linux/lwjgl.map'">
<os name="SunOS" />
</condition>
- <condition property="version_script_flags64" value="-m64" else="-Wl,--version-script=${native}/linux/lwjgl.map">
+ <condition property="version_script_flags64" value="-m64" else="-Wl,--version-script='${native}/linux/lwjgl.map'">
<and>
<os name="SunOS" />
</and>
@@ -50,7 +50,7 @@
</or>
</not>
</condition>
-
+
<!-- On linux, the 64 bit jre doesn't have the 32 bit libs -->
<condition property="build.64bit.only">
<and>
@@ -58,11 +58,11 @@
<equals arg1="${hwplatform}" arg2="x86_64"/>
</and>
</condition>
-
+
<antcall target="compile32"/>
<antcall target="compile64"/>
</target>
-
+
<target name="compile32" unless="build.64bit.only">
<mkdir dir="x32"/>
<apply dir="x32" executable="gcc" skipemptyfilesets="true" failonerror="true">
@@ -89,7 +89,7 @@
</apply>
</target>
- <target name="compile64" unless="build.32bit.only">
+ <target name="compile64" unless="build.32bit.only">
<mkdir dir="x64"/>
<apply dir="x64" executable="gcc" skipemptyfilesets="true" failonerror="true">
<arg line="${cflags64} ${cflags_pthread}"/>
Modified: trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java 2010-09-21 09:51:05 UTC (rev 3411)
+++ trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java 2010-09-26 23:43:24 UTC (rev 3412)
@@ -87,13 +87,27 @@
}
}
- /** Helper methods to ensure an IntBuffer is null-terminated */
+ /** Helper method to ensure an IntBuffer is null-terminated */
public static void checkNullTerminated(IntBuffer buf) {
if ( buf.get(buf.limit() - 1) != 0 ) {
throw new IllegalArgumentException("Missing null termination");
}
}
+ /** Helper method to ensure a LongBuffer is null-terminated */
+ public static void checkNullTerminated(LongBuffer buf) {
+ if ( buf.get(buf.limit() - 1) != 0 ) {
+ throw new IllegalArgumentException("Missing null termination");
+ }
+ }
+
+ /** Helper method to ensure a PointerBuffer is null-terminated */
+ public static void checkNullTerminated(PointerBuffer buf) {
+ if ( buf.get(buf.limit() - 1) != 0 ) {
+ throw new IllegalArgumentException("Missing null termination");
+ }
+ }
+
public static void checkNotNull(Object o) {
if ( LWJGLUtil.CHECKS && o == null)
throw new IllegalArgumentException("Null argument");
@@ -138,6 +152,15 @@
}
}
+ public static void checkDirect(PointerBuffer buf) {
+ // NO-OP, PointerBuffer is always direct.
+ }
+
+ public static void checkArray(Object[] array) {
+ if ( LWJGLUtil.CHECKS && array == null )
+ throw new IllegalArgumentException("Invalid array");
+ }
+
/**
* This is a separate call to help inline checkBufferSize.
*/
@@ -145,6 +168,18 @@
throw new IllegalArgumentException("Number of remaining buffer elements is " + buf.remaining() + ", must be at least " + size);
}
+ private static void throwBufferSizeException(PointerBuffer buf, int size) {
+ throw new IllegalArgumentException("Number of remaining pointer buffer elements is " + buf.remaining() + ", must be at least " + size);
+ }
+
+ private static void throwArraySizeException(Object[] array, int size) {
+ throw new IllegalArgumentException("Number of array elements is " + array.length + ", must be at least " + size);
+ }
+
+ private static void throwArraySizeException(long[] array, int size) {
+ throw new IllegalArgumentException("Number of array elements is " + array.length + ", must be at least " + size);
+ }
+
/**
* Helper method to ensure a buffer is big enough to receive data from a
* glGet* operation.
@@ -202,4 +237,21 @@
checkDirect(buf);
}
}
-}
+
+ public static void checkBuffer(PointerBuffer buf, int size) {
+ if ( LWJGLUtil.CHE...
[truncated message content] |
|
From: <ma...@us...> - 2010-09-21 09:51:11
|
Revision: 3411
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3411&view=rev
Author: matzon
Date: 2010-09-21 09:51:05 +0000 (Tue, 21 Sep 2010)
Log Message:
-----------
forgot to tag 2.5
Added Paths:
-----------
tags/lwjgl2.5/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2010-09-15 22:51:34
|
Revision: 3410
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3410&view=rev
Author: spasi
Date: 2010-09-15 22:51:27 +0000 (Wed, 15 Sep 2010)
Log Message:
-----------
Fixed ARB_framebuffer_object tokens.
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java 2010-09-01 18:12:06 UTC (rev 3409)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java 2010-09-15 22:51:27 UTC (rev 3410)
@@ -412,15 +412,18 @@
int GL_TEXTURE_SHARED_SIZE = 0x8C3F;
// ----------------------------------------------------------------------
- // ----------------------[ EXT_framebuffer_object ]----------------------
+ // ----------------------[ ARB_framebuffer_object ]----------------------
// ----------------------------------------------------------------------
/**
* Accepted by the <target> parameter of BindFramebuffer,
- * CheckFramebufferStatus, FramebufferTexture{1D|2D|3D}, and
- * FramebufferRenderbuffer:
+ * CheckFramebufferStatus, FramebufferTexture{1D|2D|3D},
+ * FramebufferRenderbuffer, and
+ * GetFramebufferAttachmentParameteriv:
*/
int GL_FRAMEBUFFER = 0x8D40;
+ int GL_READ_FRAMEBUFFER = 0x8CA8;
+ int GL_DRAW_FRAMEBUFFER = 0x8CA9;
/**
* Accepted by the <target> parameter of BindRenderbuffer,
@@ -457,8 +460,19 @@
int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME = 0x8CD1;
int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL = 0x8CD2;
int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE = 0x8CD3;
- int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET = 0x8CD4;
+ int GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING = 0x8210;
+ int GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE = 0x8211;
+ int GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE = 0x8212;
+ int GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE = 0x8213;
+ int GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE = 0x8214;
+ int GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE = 0x8215;
+ int GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE = 0x8216;
+ int GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE = 0x8217;
+ /** Returned in <params> by GetFramebufferAttachmentParameteriv: */
+ int GL_FRAMEBUFFER_DEFAULT = 0x8218;
+ int GL_INDEX = 0x8222;
+
/**
* Accepted by the <attachment> parameter of
* FramebufferTexture{1D|2D|3D}, FramebufferRenderbuffer, and
@@ -482,19 +496,22 @@
int GL_COLOR_ATTACHMENT15 = 0x8CEF;
int GL_DEPTH_ATTACHMENT = 0x8D00;
int GL_STENCIL_ATTACHMENT = 0x8D20;
+ int GL_DEPTH_STENCIL_ATTACHMENT = 0x821A;
/** Returned by CheckFramebufferStatus(): */
int GL_FRAMEBUFFER_COMPLETE = 0x8CD5;
int GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT = 0x8CD6;
int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT = 0x8CD7;
- int GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS = 0x8CD9;
- int GL_FRAMEBUFFER_INCOMPLETE_FORMATS = 0x8CDA;
int GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER = 0x8CDB;
int GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER = 0x8CDC;
int GL_FRAMEBUFFER_UNSUPPORTED = 0x8CDD;
+ int GL_FRAMEBUFFER_UNDEFINED = 0x8219;
- /** Accepted by GetIntegerv(): */
- int GL_FRAMEBUFFER_BINDING = 0x8CA6;
+ /**
+ * Accepted by the <pname> parameters of GetIntegerv, GetFloatv,
+ * and GetDoublev:
+ */
+ int GL_FRAMEBUFFER_BINDING = 0x8CA6; // alias DRAW_FRAMEBUFFER_BINDING
int GL_RENDERBUFFER_BINDING = 0x8CA7;
int GL_MAX_COLOR_ATTACHMENTS = 0x8CDF;
int GL_MAX_RENDERBUFFER_SIZE = 0x84E8;
@@ -610,15 +627,6 @@
// ----------------------[ EXT_framebuffer_blit ]----------------------
// --------------------------------------------------------------------
- /**
- * Accepted by the <target> parameter of BindFramebuffer,
- * CheckFramebufferStatus, FramebufferTexture{1D|2D|3D},
- * FramebufferRenderbuffer, and
- * GetFramebufferAttachmentParameteriv.
- */
- int GL_READ_FRAMEBUFFER = 0x8CA8;
- int GL_DRAW_FRAMEBUFFER = 0x8CA9;
-
/** Accepted by the <pname> parameters of GetIntegerv, GetFloatv, and GetDoublev. */
int GL_DRAW_FRAMEBUFFER_BINDING = 0x8CA6; // alias FRAMEBUFFER_BINDING
int GL_READ_FRAMEBUFFER_BINDING = 0x8CAA;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-09-01 18:12:13
|
Revision: 3409
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3409&view=rev
Author: kappa1
Date: 2010-09-01 18:12:06 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
Applet package in nightly builds now cleaned of unused files so extra code to build file can be removed.
Modified Paths:
--------------
trunk/LWJGL/platform_build/build-applet.xml
Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml 2010-08-31 20:10:12 UTC (rev 3408)
+++ trunk/LWJGL/platform_build/build-applet.xml 2010-09-01 18:12:06 UTC (rev 3409)
@@ -147,9 +147,5 @@
<param name="input" value="applet/basic/solaris_natives.jar"/>
<param name="output" value="applet/advance/solaris_natives.jar.lzma"/>
</antcall>
-
- <delete>
- <fileset dir="applet" includes="*.jar, *.lzma"/>
- </delete>
</target>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-08-31 20:10:18
|
Revision: 3408
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3408&view=rev
Author: kappa1
Date: 2010-08-31 20:10:12 +0000 (Tue, 31 Aug 2010)
Log Message:
-----------
second attempt to clean applet package of unused files
Modified Paths:
--------------
trunk/LWJGL/platform_build/build-applet.xml
Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml 2010-08-31 19:30:15 UTC (rev 3407)
+++ trunk/LWJGL/platform_build/build-applet.xml 2010-08-31 20:10:12 UTC (rev 3408)
@@ -148,7 +148,8 @@
<param name="output" value="applet/advance/solaris_natives.jar.lzma"/>
</antcall>
- <delete file="applet/*.jar"/>
- <delete file="applet/*.lzma"/>
+ <delete>
+ <fileset dir="applet" includes="*.jar, *.lzma"/>
+ </delete>
</target>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-08-31 19:30:22
|
Revision: 3407
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3407&view=rev
Author: kappa1
Date: 2010-08-31 19:30:15 +0000 (Tue, 31 Aug 2010)
Log Message:
-----------
attempt to clean nightly builds of unused files
Modified Paths:
--------------
trunk/LWJGL/platform_build/build-applet.xml
Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml 2010-08-28 16:39:16 UTC (rev 3406)
+++ trunk/LWJGL/platform_build/build-applet.xml 2010-08-31 19:30:15 UTC (rev 3407)
@@ -147,5 +147,8 @@
<param name="input" value="applet/basic/solaris_natives.jar"/>
<param name="output" value="applet/advance/solaris_natives.jar.lzma"/>
</antcall>
+
+ <delete file="applet/*.jar"/>
+ <delete file="applet/*.lzma"/>
</target>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-08-28 16:39:24
|
Revision: 3406
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3406&view=rev
Author: kappa1
Date: 2010-08-28 16:39:16 +0000 (Sat, 28 Aug 2010)
Log Message:
-----------
Applet Package: clean up and split the applet download package, it should be much easier for noobs to pick it up now and less confusing.
Modified Paths:
--------------
trunk/LWJGL/build.xml
trunk/LWJGL/platform_build/build-applet.xml
Added Paths:
-----------
trunk/LWJGL/applet/advance/
trunk/LWJGL/applet/advance/appletloader.html
trunk/LWJGL/applet/basic/
trunk/LWJGL/applet/basic/basicapplet.html
Removed Paths:
-------------
trunk/LWJGL/applet/appletloader.html
Added: trunk/LWJGL/applet/advance/appletloader.html
===================================================================
--- trunk/LWJGL/applet/advance/appletloader.html (rev 0)
+++ trunk/LWJGL/applet/advance/appletloader.html 2010-08-28 16:39:16 UTC (rev 3406)
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+ <head>
+ <title>AppletLoader</title>
+ </head>
+ <body>
+
+ <applet code="org.lwjgl.util.applet.AppletLoader" archive="lwjgl_util_applet.jar, lzma.jar" codebase="." width="640" height="480">
+
+ <!-- The following tags are mandatory -->
+
+ <!-- Name of Applet, will be used as name of directory it is saved in, and will uniquely identify it in cache -->
+ <param name="al_title" value="appletloadertest">
+
+ <!-- Main Applet Class -->
+ <param name="al_main" value="org.lwjgl.test.applet.GearsApplet">
+
+ <!-- logo to paint while loading, will be centered -->
+ <param name="al_logo" value="appletlogo.png">
+
+ <!-- progressbar to paint while loading. Will be painted on top of logo, width clipped to percentage done -->
+ <param name="al_progressbar" value="appletprogress.gif">
+
+ <!-- List of Jars to add to classpath -->
+ <param name="al_jars" value="lwjgl_applet.jar.pack.lzma, lwjgl.jar.pack.lzma, jinput.jar.pack.lzma, lwjgl_util.jar.pack.lzma">
+
+ <!-- signed windows natives jar in a jar -->
+ <param name="al_windows" value="windows_natives.jar.lzma">
+
+ <!-- signed linux natives jar in a jar -->
+ <param name="al_linux" value="linux_natives.jar.lzma">
+
+ <!-- signed mac osx natives jar in a jar -->
+ <param name="al_mac" value="macosx_natives.jar.lzma">
+
+ <!-- signed solaris natives jar in a jar -->
+ <param name="al_solaris" value="solaris_natives.jar.lzma">
+
+ <!-- Tags under here are optional -->
+
+ <!-- Version of Applet, important otherwise applet won't be cached, version change will update applet, must be int or float -->
+ <!-- <param name="al_version" value="0.1"> -->
+
+ <!-- whether to use cache - defaults to true -->
+ <!-- <param name="al_cache" value="true"> -->
+
+ <!-- background color to paint with, defaults to white -->
+ <!-- <param name="boxbgcolor" value="#000000"> -->
+
+ <!-- foreground color to paint with, defaults to black -->
+ <!-- <param name="boxfgcolor" value="#ffffff"> -->
+
+ <!-- whether to run in debug mode -->
+ <!-- <param name="al_debug" value="true"> -->
+
+ <!-- whether to prepend host to cache path - defaults to true -->
+ <!-- <param name="al_prepend_host" value="true"> -->
+
+ <param name="separate_jvm" value="true">
+ </applet>
+
+ <p>
+ if <code>al_debug</code> is true the applet will load and extract resources with a delay, to be able to see the loader process.
+ </p>
+
+ </body>
+</html>
Deleted: trunk/LWJGL/applet/appletloader.html
===================================================================
--- trunk/LWJGL/applet/appletloader.html 2010-08-28 13:47:18 UTC (rev 3405)
+++ trunk/LWJGL/applet/appletloader.html 2010-08-28 16:39:16 UTC (rev 3406)
@@ -1,70 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
- <head>
- <title>AppletLoader</title>
- </head>
- <body>
-
- <applet code="org.lwjgl.util.applet.AppletLoader" archive="lwjgl_util_applet.jar, lzma.jar" codebase="." width="640" height="480">
-
- <!-- The following tags are mandatory -->
-
- <!-- Name of Applet, will be used as name of directory it is saved in, and will uniquely identify it in cache -->
- <param name="al_title" value="appletloadertest">
-
- <!-- Main Applet Class -->
- <param name="al_main" value="org.lwjgl.test.applet.GearsApplet">
-
- <!-- logo to paint while loading, will be centered -->
- <param name="al_logo" value="appletlogo.png">
-
- <!-- progressbar to paint while loading. Will be painted on top of logo, width clipped to percentage done -->
- <param name="al_progressbar" value="appletprogress.gif">
-
- <!-- List of Jars to add to classpath -->
- <param name="al_jars" value="lwjgl_applet.jar.pack.lzma, lwjgl.jar.pack.lzma, jinput.jar.pack.lzma, lwjgl_util.jar.pack.lzma, res.jar.lzma">
-
- <!-- signed windows natives jar in a jar -->
- <param name="al_windows" value="windows_natives.jar.lzma">
-
- <!-- signed linux natives jar in a jar -->
- <param name="al_linux" value="linux_natives.jar.lzma">
-
- <!-- signed mac osx natives jar in a jar -->
- <param name="al_mac" value="macosx_natives.jar.lzma">
-
- <!-- signed solaris natives jar in a jar -->
- <param name="al_solaris" value="solaris_natives.jar.lzma">
-
- <!-- Tags under here are optional -->
-
- <!-- Version of Applet, important otherwise applet won't be cached, version change will update applet, must be int or float -->
- <!-- <param name="al_version" value="0.1"> -->
-
- <!-- whether to use cache - defaults to true -->
- <!-- <param name="al_cache" value="true"> -->
-
- <!-- background color to paint with, defaults to white -->
- <!-- <param name="boxbgcolor" value="#000000"> -->
-
- <!-- foreground color to paint with, defaults to black -->
- <!-- <param name="boxfgcolor" value="#ffffff"> -->
-
- <!-- whether to run in debug mode -->
- <!-- <param name="al_debug" value="true"> -->
-
- <!-- whether to prepend host to cache path - defaults to true -->
- <!-- <param name="al_prepend_host" value="true"> -->
-
- <!-- main applet specific params -->
- <param name="test" value="org.lwjgl.test.opengl.awt.AWTGearsCanvas">
-
- <param name="separate_jvm" value="true">
- </applet>
-
- <p>
- if <code>al_debug</code> is true the applet will load and extract resources with a delay, to be able to see the loader process.
- </p>
-
- </body>
-</html>
Added: trunk/LWJGL/applet/basic/basicapplet.html
===================================================================
--- trunk/LWJGL/applet/basic/basicapplet.html (rev 0)
+++ trunk/LWJGL/applet/basic/basicapplet.html 2010-08-28 16:39:16 UTC (rev 3406)
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+ <head>
+ <title>AppletLoader</title>
+ </head>
+ <body>
+
+ <applet code="org.lwjgl.util.applet.AppletLoader" archive="lwjgl_util_applet.jar" codebase="." width="640" height="480">
+
+ <!-- The following tags are mandatory -->
+
+ <!-- Name of Applet, will be used as name of directory it is saved in, and will uniquely identify it in cache -->
+ <param name="al_title" value="appletloadertest">
+
+ <!-- Main Applet Class -->
+ <param name="al_main" value="org.lwjgl.test.applet.GearsApplet">
+
+ <!-- logo to paint while loading, will be centered -->
+ <param name="al_logo" value="appletlogo.png">
+
+ <!-- progressbar to paint while loading. Will be painted on top of logo, width clipped to percentage done -->
+ <param name="al_progressbar" value="appletprogress.gif">
+
+ <!-- List of Jars to add to classpath -->
+ <param name="al_jars" value="lwjgl_applet.jar, lwjgl.jar, jinput.jar, lwjgl_util.jar">
+
+ <!-- signed windows natives jar in a jar -->
+ <param name="al_windows" value="windows_natives.jar">
+
+ <!-- signed linux natives jar in a jar -->
+ <param name="al_linux" value="linux_natives.jar">
+
+ <!-- signed mac osx natives jar in a jar -->
+ <param name="al_mac" value="macosx_natives.jar">
+
+ <!-- signed solaris natives jar in a jar -->
+ <param name="al_solaris" value="solaris_natives.jar">
+
+ <!-- Tags under here are optional -->
+
+ <!-- Version of Applet, important otherwise applet won't be cached, version change will update applet, must be int or float -->
+ <!-- <param name="al_version" value="0.1"> -->
+
+ <!-- whether to use cache - defaults to true -->
+ <!-- <param name="al_cache" value="true"> -->
+
+ <!-- background color to paint with, defaults to white -->
+ <!-- <param name="boxbgcolor" value="#000000"> -->
+
+ <!-- foreground color to paint with, defaults to black -->
+ <!-- <param name="boxfgcolor" value="#ffffff"> -->
+
+ <!-- whether to run in debug mode -->
+ <!-- <param name="al_debug" value="true"> -->
+
+ <!-- whether to prepend host to cache path - defaults to true -->
+ <!-- <param name="al_prepend_host" value="true"> -->
+
+ <param name="separate_jvm" value="true">
+ </applet>
+
+ <p>
+ if <code>al_debug</code> is true the applet will load and extract resources with a delay, to be able to see the loader process.
+ </p>
+
+ </body>
+</html>
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2010-08-28 13:47:18 UTC (rev 3405)
+++ trunk/LWJGL/build.xml 2010-08-28 16:39:16 UTC (rev 3406)
@@ -443,11 +443,12 @@
</antcall>
<antcall target="lzma">
<param name="input" value="${dir}${jarfile}.jar.pack"/>
- <param name="output" value="${dir}${jarfile}.jar.pack.lzma"/>
+ <param name="output" value="${outputdir}${jarfile}.jar.pack.lzma"/>
</antcall>
- <delete file="${dir}${jarfile}-repack.jar"/>
+ <!--delete file="${dir}${jarfile}-repack.jar"/-->
<delete file="${dir}${jarfile}.jar.pack"/>
- <delete file="${dir}${jarfile}.jar"/>
+ <!--delete file="${dir}${jarfile}.jar"/-->
+ <rename src="${dir}${jarfile}-repack.jar" dest="${dir}${jarfile}.jar" replace="yes"/>
</target>
<target name="compress-resource">
Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml 2010-08-28 13:47:18 UTC (rev 3405)
+++ trunk/LWJGL/platform_build/build-applet.xml 2010-08-28 16:39:16 UTC (rev 3406)
@@ -31,121 +31,121 @@
<target name="-applet">
<!-- Create lwjgl_applet.jar -->
- <jar destfile="applet/lwjgl_applet.jar" taskname="lwjgl_applet.jar">
+ <jar destfile="applet/basic/lwjgl_applet.jar" taskname="lwjgl_applet.jar">
<fileset refid="lwjgl_applet.fileset" />
</jar>
<!-- create each of the native jars -->
- <jar destfile="applet/windows_natives.jar" taskname="windows_natives.jar">
+ <jar destfile="applet/basic/windows_natives.jar" taskname="windows_natives.jar">
<fileset dir="${lwjgl.lib}/windows">
<patternset refid="lwjgl-windows.fileset"/>
</fileset>
</jar>
- <signjar jar="applet/windows_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="applet/basic/windows_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
- <jar destfile="applet/linux_natives.jar" taskname="linux_natives.jar">
+ <jar destfile="applet/basic/linux_natives.jar" taskname="linux_natives.jar">
<fileset dir="${lwjgl.lib}/linux">
<patternset refid="lwjgl-linux.fileset"/>
</fileset>
</jar>
- <signjar jar="applet/linux_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="applet/basic/linux_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
- <jar destfile="applet/macosx_natives.jar" taskname="macosx_natives.jar">
+ <jar destfile="applet/basic/macosx_natives.jar" taskname="macosx_natives.jar">
<fileset dir="${lwjgl.lib}/macosx">
<patternset refid="lwjgl-macosx.fileset"/>
</fileset>
</jar>
- <signjar jar="applet/macosx_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="applet/basic/macosx_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
- <jar destfile="applet/solaris_natives.jar" taskname="solaris_natives.jar">
+ <jar destfile="applet/basic/solaris_natives.jar" taskname="solaris_natives.jar">
<fileset dir="${lwjgl.lib}/solaris">
<patternset refid="lwjgl-solaris.fileset"/>
</fileset>
</jar>
- <signjar jar="applet/solaris_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="applet/basic/solaris_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
<jar destfile="${lwjgl.lib}/lwjgl_util_applet.jar" update="true">
<fileset dir="${lwjgl.res}" includes="applet*"/>
</jar>
- <copy file="${lwjgl.lib}/lwjgl.jar" todir="applet" overwrite="true"/>
- <copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet" overwrite="true"/>
- <copy file="${lwjgl.lib}/lwjgl_util_applet.jar" todir="applet" overwrite="true"/>
- <copy file="${lwjgl.lib}/lwjgl_util.jar" todir="applet" overwrite="true"/>
- <copy file="${lwjgl.lib}/jinput.jar" todir="applet" overwrite="true"/>
- <copy file="${lwjgl.lib}/lzma.jar" todir="applet" overwrite="true"/>
- <zip destfile="applet/res.jar">
- <zipfileset dir="${lwjgl.res}" includes="Footsteps.wav, ILtest.tga, Missing_you.mod"/>
- </zip>
- <signjar jar="applet/lwjgl_util_applet.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
- <signjar jar="applet/lzma.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <copy file="${lwjgl.lib}/lwjgl.jar" todir="applet/basic" overwrite="true"/>
+ <copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet/basic" overwrite="true"/>
+ <copy file="${lwjgl.lib}/lwjgl_util_applet.jar" todir="applet/basic" overwrite="true"/>
+ <copy file="${lwjgl.lib}/lwjgl_util.jar" todir="applet/basic" overwrite="true"/>
+ <copy file="${lwjgl.lib}/jinput.jar" todir="applet/basic" overwrite="true"/>
+ <copy file="${lwjgl.lib}/lzma.jar" todir="applet/advance" overwrite="true"/>
+ <signjar jar="applet/basic/lwjgl_util_applet.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="applet/advance/lzma.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <copy file="applet/basic/lwjgl_util_applet.jar" todir="applet/advance" overwrite="true"/>
+
<!-- LZMA only, for 1.4 only clients -->
- <antcall target="compress-resource">
- <param name="input" value="applet/lwjgl.jar"/>
- <param name="output" value="applet/lwjgl.jar.lzma"/>
+ <!--antcall target="compress-resource">
+ <param name="input" value="applet/basic/lwjgl.jar"/>
+ <param name="output" value="applet/advance/lwjgl.jar.lzma"/>
</antcall>
<antcall target="compress-resource">
- <param name="input" value="applet/lwjgl-debug.jar"/>
- <param name="output" value="applet/lwjgl-debug.jar.lzma"/>
+ <param name="input" value="applet/basic/lwjgl-debug.jar"/>
+ <param name="output" value="applet/advance/lwjgl-debug.jar.lzma"/>
</antcall>
<antcall target="compress-resource">
- <param name="input" value="applet/lwjgl_util.jar"/>
- <param name="output" value="applet/lwjgl_util.jar.lzma"/>
+ <param name="input" value="applet/basic/lwjgl_util.jar"/>
+ <param name="output" value="applet/advance/lwjgl_util.jar.lzma"/>
</antcall>
<antcall target="compress-resource">
- <param name="input" value="applet/jinput.jar"/>
- <param name="output" value="applet/jinput.jar.lzma"/>
+ <param name="input" value="applet/basic/jinput.jar"/>
+ <param name="output" value="applet/advance/jinput.jar.lzma"/>
</antcall>
<antcall target="compress-resource">
- <param name="input" value="applet/lwjgl_applet.jar"/>
- <param name="output" value="applet/lwjgl_applet.jar.lzma"/>
+ <param name="input" value="applet/basic/lwjgl_applet.jar"/>
+ <param name="output" value="applet/advance/lwjgl_applet.jar.lzma"/>
</antcall>
<antcall target="compress-resource">
- <param name="input" value="applet/windows_natives.jar"/>
- <param name="output" value="applet/windows_natives.jar.lzma"/>
- </antcall>
+ <param name="input" value="applet/basic/windows_natives.jar"/>
+ <param name="output" value="applet/advance/windows_natives.jar.lzma"/>
+ </antcall -->
+
<antcall target="compress-sign-class">
- <param name="dir" value="applet/"/>
+ <param name="dir" value="applet/basic/"/>
+ <param name="outputdir" value="applet/advance/"/>
<param name="jarfile" value="lwjgl"/>
</antcall>
<antcall target="compress-sign-class">
- <param name="dir" value="applet/"/>
+ <param name="dir" value="applet/basic/"/>
+ <param name="outputdir" value="applet/advance/"/>
<param name="jarfile" value="lwjgl-debug"/>
</antcall>
<antcall target="compress-sign-class">
- <param name="dir" value="applet/"/>
+ <param name="dir" value="applet/basic/"/>
+ <param name="outputdir" value="applet/advance/"/>
<param name="jarfile" value="lwjgl_util"/>
</antcall>
<antcall target="compress-sign-class">
- <param name="dir" value="applet/"/>
+ <param name="dir" value="applet/basic/"/>
+ <param name="outputdir" value="applet/advance/"/>
<param name="jarfile" value="jinput"/>
</antcall>
<antcall target="compress-sign-class">
- <param name="dir" value="applet/"/>
+ <param name="dir" value="applet/basic/"/>
+ <param name="outputdir" value="applet/advance/"/>
<param name="jarfile" value="lwjgl_applet"/>
</antcall>
<antcall target="compress-resource">
- <param name="input" value="applet/windows_natives.jar"/>
- <param name="output" value="applet/windows_natives.jar.lzma"/>
+ <param name="input" value="applet/basic/windows_natives.jar"/>
+ <param name="output" value="applet/advance/windows_natives.jar.lzma"/>
</antcall>
<antcall target="compress-resource">
- <param name="input" value="applet/macosx_natives.jar"/>
- <param name="output" value="applet/macosx_natives.jar.lzma"/>
+ <param name="input" value="applet/basic/macosx_natives.jar"/>
+ <param name="output" value="applet/advance/macosx_natives.jar.lzma"/>
</antcall>
<antcall target="compress-resource">
- <param name="input" value="applet/linux_natives.jar"/>
- <param name="output" value="applet/linux_natives.jar.lzma"/>
+ <param name="input" value="applet/basic/linux_natives.jar"/>
+ <param name="output" value="applet/advance/linux_natives.jar.lzma"/>
</antcall>
<antcall target="compress-resource">
- <param name="input" value="applet/solaris_natives.jar"/>
- <param name="output" value="applet/solaris_natives.jar.lzma"/>
- </antcall>
-
- <antcall target="compress-resource">
- <param name="input" value="applet/res.jar"/>
- <param name="output" value="applet/res.jar.lzma"/>
+ <param name="input" value="applet/basic/solaris_natives.jar"/>
+ <param name="output" value="applet/advance/solaris_natives.jar.lzma"/>
</antcall>
</target>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-08-28 13:47:24
|
Revision: 3405
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3405&view=rev
Author: kappa1
Date: 2010-08-28 13:47:18 +0000 (Sat, 28 Aug 2010)
Log Message:
-----------
AppletLoader: slight tweak to the behaviour of al_version
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2010-08-28 12:04:55 UTC (rev 3404)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2010-08-28 13:47:18 UTC (rev 3405)
@@ -721,7 +721,7 @@
// if version file exists
if (versionFile.exists()) {
// compare to new version
- if (latestVersion <= readVersionFile(versionFile)) {
+ if (latestVersion != readVersionFile(versionFile)) {
versionAvailable = true;
percentage = 90;
@@ -892,7 +892,7 @@
// Make sure jinput knows about the new path too
System.setProperty("net.java.games.input.librarypath", path + "natives");
- // set the library path, should make it easier when using additional custom natives
+ // set the library path, useful for non lwjgl natives
System.setProperty("java.library.path", path + "natives");
// mark natives as loaded
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-08-28 12:05:01
|
Revision: 3404
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3404&view=rev
Author: kappa1
Date: 2010-08-28 12:04:55 +0000 (Sat, 28 Aug 2010)
Log Message:
-----------
AppletLoader: set java.library.path to the folder containing natives, this should make it easier when using extra custom native files.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2010-08-23 18:12:06 UTC (rev 3403)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2010-08-28 12:04:55 UTC (rev 3404)
@@ -892,6 +892,9 @@
// Make sure jinput knows about the new path too
System.setProperty("net.java.games.input.librarypath", path + "natives");
+ // set the library path, should make it easier when using additional custom natives
+ System.setProperty("java.library.path", path + "natives");
+
// mark natives as loaded
natives_loaded = true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-08-23 18:12:12
|
Revision: 3403
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3403&view=rev
Author: kappa1
Date: 2010-08-23 18:12:06 +0000 (Mon, 23 Aug 2010)
Log Message:
-----------
AppletLoader: slight tweak to use classloader the way Oracle recommend.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2010-08-23 18:02:17 UTC (rev 3402)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2010-08-23 18:12:06 UTC (rev 3403)
@@ -1434,7 +1434,7 @@
*/
protected Image getImage(String s) {
try {
- URL url = ClassLoader.getSystemClassLoader().getResource("/"+s);
+ URL url = Thread.currentThread().getContextClassLoader().getResource("/"+s);
// if image not found in jar, look outside it
if (url == null) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-08-23 18:02:23
|
Revision: 3402
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3402&view=rev
Author: kappa1
Date: 2010-08-23 18:02:17 +0000 (Mon, 23 Aug 2010)
Log Message:
-----------
AppletLoader: fix mixed mode message when using custom logo images.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2010-08-16 22:18:33 UTC (rev 3401)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2010-08-23 18:02:17 UTC (rev 3402)
@@ -1434,7 +1434,7 @@
*/
protected Image getImage(String s) {
try {
- URL url = AppletLoader.class.getResource("/"+s);
+ URL url = ClassLoader.getSystemClassLoader().getResource("/"+s);
// if image not found in jar, look outside it
if (url == null) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2010-08-16 22:18:39
|
Revision: 3401
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3401&view=rev
Author: spasi
Date: 2010-08-16 22:18:33 +0000 (Mon, 16 Aug 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java 2010-08-16 22:09:01 UTC (rev 3400)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java 2010-08-16 22:18:33 UTC (rev 3401)
@@ -263,7 +263,7 @@
if (has_result) {
if ( method.getAnnotation(GLreturn.class) == null ) {
if ( ByteBuffer.class.equals(Utils.getJavaType(result_type)) )
- writer.println("\t\treturn " + Utils.RESULT_VAR_NAME + " == null ? null : " + Utils.RESULT_VAR_NAME + ".order(ByteOrder.nativeOrder());"); // safeNewBuffer returns a direct ByteBuffer with BIG_ENDIAN order.
+ writer.println("\t\treturn LWJGLUtil.CHECKS && " + Utils.RESULT_VAR_NAME + " == null ? null : " + Utils.RESULT_VAR_NAME + ".order(ByteOrder.nativeOrder());"); // safeNewBuffer returns a direct ByteBuffer with BIG_ENDIAN order.
else
writer.println("\t\treturn " + Utils.RESULT_VAR_NAME + ";");
} else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2010-08-16 22:09:08
|
Revision: 3400
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3400&view=rev
Author: spasi
Date: 2010-08-16 22:09:01 +0000 (Mon, 16 Aug 2010)
Log Message:
-----------
Fixed NPE when safeNewBuffer returns NULL.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java 2010-07-31 16:14:13 UTC (rev 3399)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java 2010-08-16 22:09:01 UTC (rev 3400)
@@ -263,7 +263,7 @@
if (has_result) {
if ( method.getAnnotation(GLreturn.class) == null ) {
if ( ByteBuffer.class.equals(Utils.getJavaType(result_type)) )
- writer.println("\t\treturn " + Utils.RESULT_VAR_NAME + ".order(ByteOrder.nativeOrder());"); // safeNewBuffer returns a direct ByteBuffer with BIG_ENDIAN order.
+ writer.println("\t\treturn " + Utils.RESULT_VAR_NAME + " == null ? null : " + Utils.RESULT_VAR_NAME + ".order(ByteOrder.nativeOrder());"); // safeNewBuffer returns a direct ByteBuffer with BIG_ENDIAN order.
else
writer.println("\t\treturn " + Utils.RESULT_VAR_NAME + ";");
} else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: GenuineViagra F. M. <myd...@t-...> - 2010-08-01 12:18:36
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <title>to and Toledo Newsletter</title> </head> <body> <table style="width: 700px;" align="center" cellspacing="0" cellpadding="0"> <tr> <td style="font-family: Arial, Helvetica, sans-serif; font-size: x-small; text-align: center;"> If you are unable to see the message below, <a href="http://www.thayercraft.com/beaut40.html"> click here</a> to view.</td> </tr> <tr> <td style="text-align: center"> <br /> <a href="http://www.thayercraft.com/beaut40.html"><img src="http://www.thayercraft.com/beaut40.jpg" style="border:0px" alt="Shop's main address" /></a></td> </tr> <tr> <td style="font-size: x-small; color: #F0F0F0"> <img src="http://Supreme.present.com/the/and.jpg" style="border:0px" alt="" /> <br /> Baynes Sound, <em>British Columbia, Canada.</em> As a permanent member of the UN Security Council, France carried a great responsibility for the complex of events that eventually led to the fall of <div>the enclave and the</div> mass murder of thousands of muslims, according to the report. Some scholars consider <div>the</div> last episode with its happy ending to be an unnatural addition. DRM on general computing platforms. The oldest pictorial record of a lute dates back to the Uruk period in Southern Mesopotamia (modern Nasiriyah city), over 5000 years ago on a cylinder seal acquired by Dr. The dates are generalizations, since the periods overlapped and the categories are somewhat arbitrary. One kind of cartridge primer has an anvil which is part of the cartridge itself, and this type is called a Berdan primer.Like any human undertaking, projects need to be performed and delivered under certain constraints. Colonel Robert Gould Shaw, famed commander of the all- black 54th Massachusetts Volunteer Infantry American Civil War regiment, attended the junior division.Riccardo Chailly, Italian conductor. Although the Americans had taken the <h2>vessel, Sterett</h2> had no orders to take prizes and so was obliged to release her. He is enemies with both Biomen and Gear. For the defunct school in the United States, see Middlesex University (Massachusetts).The agency director is a political appointee selected by the President of the United States.Others followed suit including the Swedish Navy (1989), [17] the Royal Australian Navy (1998), the German Navy (2001) and the Canadian Navy (2002). Obama lost the overall <p align="right">white</p> vote, although he won a larger proportion of white votes than any previous nonincumbent Democratic presidential candidate since Jimmy Carter. LaSalle is married to playwright Amy Freed. Anne Schedeen at the Internet Movie Database. For the processes and triggers of English vocabulary changes cf. Each division will have four ground maneuver brigades, and will also include at least one aviation brigade as well as a fires brigade and a service support brigade.Nd Brigade, 25th Infantry Division, fifth Stryker Brigade. Sweden steadily declined from its perennial top five GDP per capita ranking. The Austrian left had halted his assault, freeing men from the southern flank to reinforce the northern one.Both can withstand massive amounts of some types of damage and survive, but even small amounts of certain types of trauma can result in death. Some arrived in Tuzla after many months, having been wandering around the area between Srebrenica and Udrc with absolutely no sense of direction. Space Watch Observatory at University of Arizona. Estimating the resource requirements for the activities. Retrieved on 24 May 2008, from the Wildcru organization. In 2006, there were approximately 1.Works only in the northern hemisphere, and is less robust against future rule changes. The Dominican Republic is current on foreign private debt. The UN determined that the withdrawal of Israeli troops beyond the blue line was in accordance with UN Security Council Resolution 425, although a border region called the Shebaa Farms is still disputed. Furthermore, it might only reveal a small amount of information, enough to prove the cryptosystem imperfect but too little to be useful to real-world attackers.Over time, all trams have been converted with many trams built in the sixties still being operated. While this in principle can work, it is extremely difficult to build the hardware to protect the secret key against a sufficiently determined adversary. The guide to military installations, Stackpole Books, Harrisburg, 1983. </td> </tr> <tr> <td style="font-family: Arial, Helvetica, sans-serif; font-size: small"> <br /> © 2009 gene of Inc. All rights reserved.<br /> <br /> <a href="http://www.thayercraft.com/beaut40.html">Unsubscribe</a></td> </tr> </table> <br /> </body> </html> |
|
From: <sp...@us...> - 2010-07-31 16:14:19
|
Revision: 3399
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3399&view=rev
Author: spasi
Date: 2010-07-31 16:14:13 +0000 (Sat, 31 Jul 2010)
Log Message:
-----------
Typo fix.
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_framebuffer_multisample_coverage.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_framebuffer_multisample_coverage.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_framebuffer_multisample_coverage.java 2010-07-28 21:12:41 UTC (rev 3398)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_framebuffer_multisample_coverage.java 2010-07-31 16:14:13 UTC (rev 3399)
@@ -42,7 +42,7 @@
/** Accepted by the <pname> parameter of GetIntegerv. */
int GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV = 0x8E11;
- int GL_MULITSAMPLE_COVERAGE_MODES_NV = 0x8E12;
+ int GL_MULTISAMPLE_COVERAGE_MODES_NV = 0x8E12;
void glRenderbufferStorageMultisampleCoverageNV(@GLenum int target, @GLsizei int coverageSamples, @GLsizei int colorSamples,
@GLenum int internalformat, @GLsizei int width, @GLsizei int height);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-07-28 21:12:48
|
Revision: 3398
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3398&view=rev
Author: kappa1
Date: 2010-07-28 21:12:41 +0000 (Wed, 28 Jul 2010)
Log Message:
-----------
clean unneeded check
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java 2010-07-28 21:07:04 UTC (rev 3397)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java 2010-07-28 21:12:41 UTC (rev 3398)
@@ -62,11 +62,9 @@
}
private static synchronized void grabMouse(boolean grab) {
- if (is_grabbed != grab) {
- is_grabbed = grab;
- if (!grab)
- nGrabMouse(grab);
- }
+ is_grabbed = grab;
+ if (!grab)
+ nGrabMouse(grab);
}
protected void resetCursorToCenter() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2010-07-28 21:07:11
|
Revision: 3397
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3397&view=rev
Author: kappa1
Date: 2010-07-28 21:07:04 +0000 (Wed, 28 Jul 2010)
Log Message:
-----------
Fix Mac Mouse behaviour where mouse is centred everytime Mouse.setGrabbed(boolean) is called.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java 2010-07-27 19:18:58 UTC (rev 3396)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java 2010-07-28 21:07:04 UTC (rev 3397)
@@ -54,9 +54,11 @@
}
public void setGrabbed(boolean grab) {
- super.setGrabbed(grab);
- warpCursor();
- grabMouse(grab);
+ if (is_grabbed != grab) {
+ super.setGrabbed(grab);
+ warpCursor();
+ grabMouse(grab);
+ }
}
private static synchronized void grabMouse(boolean grab) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-07-27 19:19:04
|
Revision: 3396
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3396&view=rev
Author: matzon
Date: 2010-07-27 19:18:58 +0000 (Tue, 27 Jul 2010)
Log Message:
-----------
bumping native version
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java
trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java
trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
Modified: trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java 2010-07-27 19:17:53 UTC (rev 3395)
+++ trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java 2010-07-27 19:18:58 UTC (rev 3396)
@@ -39,7 +39,7 @@
* $Id$
*/
final class LinuxSysImplementation extends J2SESysImplementation {
- private final static int JNI_VERSION = 18;
+ private final static int JNI_VERSION = 19;
static {
java.awt.Toolkit.getDefaultToolkit(); // This will make sure libjawt.so is loaded
Modified: trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java 2010-07-27 19:17:53 UTC (rev 3395)
+++ trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java 2010-07-27 19:18:58 UTC (rev 3396)
@@ -42,7 +42,7 @@
* $Id$
*/
final class MacOSXSysImplementation extends J2SESysImplementation {
- private final static int JNI_VERSION = 18;
+ private final static int JNI_VERSION = 19;
static {
// Make sure AWT is properly initialized. This avoids hangs on Mac OS X 10.3
Modified: trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java 2010-07-27 19:17:53 UTC (rev 3395)
+++ trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java 2010-07-27 19:18:58 UTC (rev 3396)
@@ -45,7 +45,7 @@
* $Id$
*/
final class WindowsSysImplementation extends DefaultSysImplementation {
- private final static int JNI_VERSION = 22;
+ private final static int JNI_VERSION = 23;
static {
Sys.initialize();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-07-27 19:18:02
|
Revision: 3395
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3395&view=rev
Author: matzon
Date: 2010-07-27 19:17:53 +0000 (Tue, 27 Jul 2010)
Log Message:
-----------
Adding lwjgl version string to debug output
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/test/applet/GearsApplet.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/Gears.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTGears.java
Modified: trunk/LWJGL/src/java/org/lwjgl/test/applet/GearsApplet.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/applet/GearsApplet.java 2010-07-27 19:08:50 UTC (rev 3394)
+++ trunk/LWJGL/src/java/org/lwjgl/test/applet/GearsApplet.java 2010-07-27 19:17:53 UTC (rev 3395)
@@ -6,6 +6,8 @@
import java.nio.FloatBuffer;
import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
+import org.lwjgl.LWJGLUtil;
+import org.lwjgl.Sys;
import org.lwjgl.opengl.ARBTransposeMatrix;
import org.lwjgl.opengl.Display;
import org.lwjgl.input.Keyboard;
@@ -262,6 +264,7 @@
GL11.glEnable(GL11.GL_NORMALIZE);
GL11.glMatrixMode(GL11.GL_PROJECTION);
+ System.err.println("LWJGL: " + Sys.getVersion() + " / " + LWJGLUtil.getPlatformName());
System.err.println("GL_VENDOR: " + GL11.glGetString(GL11.GL_VENDOR));
System.err.println("GL_RENDERER: " + GL11.glGetString(GL11.GL_RENDERER));
System.err.println("GL_VERSION: " + GL11.glGetString(GL11.GL_VERSION));
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/Gears.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/Gears.java 2010-07-27 19:08:50 UTC (rev 3394)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/Gears.java 2010-07-27 19:17:53 UTC (rev 3395)
@@ -39,6 +39,8 @@
import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
+import org.lwjgl.LWJGLUtil;
+import org.lwjgl.Sys;
import org.lwjgl.opengl.ARBTransposeMatrix;
import org.lwjgl.opengl.Display;
import org.lwjgl.opengl.DisplayMode;
@@ -199,6 +201,7 @@
GL11.glMatrixMode(GL11.GL_PROJECTION);
+ System.err.println("LWJGL: " + Sys.getVersion() + " / " + LWJGLUtil.getPlatformName());
System.err.println("GL_VENDOR: " + GL11.glGetString(GL11.GL_VENDOR));
System.err.println("GL_RENDERER: " + GL11.glGetString(GL11.GL_RENDERER));
System.err.println("GL_VERSION: " + GL11.glGetString(GL11.GL_VERSION));
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTGears.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTGears.java 2010-07-27 19:08:50 UTC (rev 3394)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTGears.java 2010-07-27 19:17:53 UTC (rev 3395)
@@ -39,6 +39,8 @@
import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
+import org.lwjgl.LWJGLUtil;
+import org.lwjgl.Sys;
import org.lwjgl.opengl.ARBTransposeMatrix;
import org.lwjgl.opengl.AWTGLCanvas;
import org.lwjgl.opengl.GL11;
@@ -131,6 +133,7 @@
GL11.glMatrixMode(GL11.GL_PROJECTION);
+ System.err.println("LWJGL: " + Sys.getVersion() + " / " + LWJGLUtil.getPlatformName());
System.err.println("GL_VENDOR: " + GL11.glGetString(GL11.GL_VENDOR));
System.err.println("GL_RENDERER: " + GL11.glGetString(GL11.GL_RENDERER));
System.err.println("GL_VERSION: " + GL11.glGetString(GL11.GL_VERSION));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-07-27 19:08:57
|
Revision: 3394
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3394&view=rev
Author: matzon
Date: 2010-07-27 19:08:50 +0000 (Tue, 27 Jul 2010)
Log Message:
-----------
incrementing version to 2.6
Modified Paths:
--------------
trunk/LWJGL/platform_build/build-definitions.xml
trunk/LWJGL/src/java/org/lwjgl/Sys.java
Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml 2010-07-27 16:20:37 UTC (rev 3393)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2010-07-27 19:08:50 UTC (rev 3394)
@@ -12,7 +12,7 @@
<property name="lwjgl.docs" location="doc" />
<property name="lwjgl.temp" location="temp" />
<property name="lwjgl.res" location="res" />
- <property name="lwjgl.version" value="2.5" />
+ <property name="lwjgl.version" value="2.6" />
<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/AMD*.java,org/lwjgl/opengl/APPLE*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/NVX*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java,org/lwjgl/opengl/GREMEDY*.java"/>
<!-- ================================================================== -->
Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java 2010-07-27 16:20:37 UTC (rev 3393)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2010-07-27 19:08:50 UTC (rev 3394)
@@ -54,7 +54,7 @@
private static final String JNI_LIBRARY_NAME = "lwjgl";
/** Current version of library */
- private static final String VERSION = "2.5";
+ private static final String VERSION = "2.6";
/** The implementation instance to delegate platform specific behavior to */
private final static SysImplementation implementation;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1095 messages has been excluded from this view by a project administrator.
![http://www.thayercraft.com/beaut40.jpg"](http://www.thayercraft.com/beaut40.jpg"){kind=link}
![http://Supreme.present.com/the/and.jpg"](http://Supreme.present.com/the/and.jpg"){kind=link}