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

Revision: 3428
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3428&view=rev
Author:   spasi
Date:     2010-10-02 12:19:00 +0000 (Sat, 02 Oct 2010)

Log Message:
-----------
Attempt to fix build issues.

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

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2010-10-01 22:37:45 UTC (rev 3427)
+++ trunk/LWJGL/build.xml	2010-10-02 12:19:00 UTC (rev 3428)
@@ -34,23 +34,21 @@
 	</target>
 
 	<!-- Cleans up any files created during the execution of this script -->
-	<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" />
+	<target name="clean" description="Cleans all directories controlled by this ant script" depends="clean-java, clean-native"/>
+
+    <!-- Cleans up any non-native files created during the execution of this script -->
+    <target name="clean-java" description="Cleans non-native files generated 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 java classes only to avoid unnecessary native recompilation -->
-		<delete dir="${lwjgl.bin}/org" quiet="true" failonerror="false" taskname="cleaning bin folder" />
-	</target>
+        <delete dir="${lwjgl.bin}/org" quiet="true" failonerror="false" taskname="cleaning bin folder" />
+    </target>
 
     <!-- Useful when we need to force native recompilation -->
-    <target name="clean-native" description="Cleans bin folder's native directory" depends="clean-generated-native">
+    <target name="clean-native" description="Cleans native files generated by this ant script" depends="clean-generated-native">
         <delete dir="${lwjgl.bin}/lwjgl" quiet="true" failonerror="false" taskname="cleaning native bin folder" />
-        <mkdir dir="${lwjgl.bin}/lwjgl" taskname="initialiazing native bin folder" />
     </target>
 
-    <target name="clean-all" depends="clean, clean-generated-native" description="Cleans all directories controlled by this ant script">
-        <delete dir="${lwjgl.bin}/lwjgl" quiet="true" failonerror="false" taskname="cleaning native bin folder" />
-    </target>
-
 	<!-- Creates a distribution of LWJGL -->
 	<target name="release" description="Creates a distribution of LWJGL using supplied native binaries">
 		<!-- Warn user -->
@@ -67,7 +65,7 @@
 
         <!-- prepare -->
         <delete dir="${lwjgl.dist}" quiet="true" failonerror="false" />
-        <antcall target="clean" />
+        <antcall target="clean-java" />
         <antcall target="-initialize" />
 
         <!-- compile and create debug jars -->
@@ -335,6 +333,7 @@
 	  <sequential>
 			<java classname="org.lwjgl.test.NativeTest" logError="false" resultproperty="nativetest.res" outputproperty="nativetest.out" errorproperty="nativetest.err" fork="true">
 				<jvmarg value="-Djava.library.path=libs/@{platform}"/>
+                <jvmarg value="-Dorg.lwjgl.util.Debug=true"/>
 	    	<classpath>
 	      	<pathelement path="${lwjgl.bin}"/>
 	        <pathelement path="${java.class.path}"/>
@@ -371,7 +370,7 @@
 		<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">
+	<target name="compile_native" depends="-initialize, headers, touch-version, version-mismatch" description="Compiles the native files">
 		<condition property="lwjgl.platform.windows">
 			<os family="windows" />
 		</condition>

Modified: trunk/LWJGL/platform_build/build-generator.xml
===================================================================
--- trunk/LWJGL/platform_build/build-generator.xml	2010-10-01 22:37:45 UTC (rev 3427)
+++ trunk/LWJGL/platform_build/build-generator.xml	2010-10-02 12:19:00 UTC (rev 3428)
@@ -7,8 +7,8 @@
 		</delete>
 	</target>
 
-    <target name="clean-generated-native" description="Deletes the generated native source">
-        <delete quiet="true" failonerror="false">
+    <target name="clean-generated-native" description="Deletes the generated native source" depends="clean-generated">
+        <delete quiet="false" failonerror="false">
             <fileset dir="${lwjgl.src.native}/generated" includes="**"/>
         </delete>
     </target>


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

Revision: 3427
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3427&view=rev
Author:   spasi
Date:     2010-10-01 22:37:45 +0000 (Fri, 01 Oct 2010)

Log Message:
-----------


Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opencl/CallbackUtil.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opencl/CallbackUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opencl/CallbackUtil.java	2010-10-01 22:20:14 UTC (rev 3426)
+++ trunk/LWJGL/src/java/org/lwjgl/opencl/CallbackUtil.java	2010-10-01 22:37:45 UTC (rev 3427)
@@ -34,8 +34,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.lwjgl.opencl.CL10.*;
-
 /**
  * Utility class that handles OpenCL API callbacks.
  *
@@ -81,7 +79,7 @@
 	 * @param user_data the GlobalRef memory address
 	 */
 	static void checkCallback(final int errcode, final long user_data) {
-		if ( errcode != CL_SUCCESS && user_data != 0 )
+		if ( errcode != 0x0 && user_data != 0 )
 			deleteGlobalRef(user_data);
 	}
 


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

Revision: 3426
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3426&view=rev
Author:   spasi
Date:     2010-10-01 22:20:14 +0000 (Fri, 01 Oct 2010)

Log Message:
-----------
OpenCL bug fixes on MacOS.
Improved 64bit pointer detection.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/DefaultSysImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/Sys.java
    trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/opencl/APIUtil.java
    trunk/LWJGL/src/java/org/lwjgl/opencl/CallbackUtil.java
    trunk/LWJGL/src/java/org/lwjgl/test/opencl/HelloOpenCL.java
    trunk/LWJGL/src/native/common/common_tools.c

Modified: trunk/LWJGL/src/java/org/lwjgl/DefaultSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/DefaultSysImplementation.java	2010-10-01 17:00:17 UTC (rev 3425)
+++ trunk/LWJGL/src/java/org/lwjgl/DefaultSysImplementation.java	2010-10-01 22:20:14 UTC (rev 3426)
@@ -40,6 +40,7 @@
  */
 abstract class DefaultSysImplementation implements SysImplementation {
 	public native int getJNIVersion();
+	public native int getPointerSize();
 	public native void setDebug(boolean debug);
 
 	public long getTimerResolution() {

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2010-10-01 17:00:17 UTC (rev 3425)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2010-10-01 22:20:14 UTC (rev 3426)
@@ -77,15 +77,13 @@
 		});
 	}
 
-	private static boolean loadLibrary(final String lib_name) {
+	private static void loadLibrary(final String lib_name) {
 		try {
 			doLoadLibrary(lib_name);
-			return false;
 		} catch (UnsatisfiedLinkError e) {
 			if (implementation.has64Bit()) {
 				try {
 					doLoadLibrary(lib_name + POSTFIX64BIT);
-					return true;
 				} catch (UnsatisfiedLinkError e2) {
 					LWJGLUtil.log("Failed to load 64 bit library: " + e2.getMessage());
 				}
@@ -97,13 +95,14 @@
 
 	static {
 		implementation = createImplementation();
-		is64Bit = loadLibrary(JNI_LIBRARY_NAME);
+		loadLibrary(JNI_LIBRARY_NAME);
+		is64Bit = implementation.getPointerSize() == 8;
 
 		int native_jni_version = implementation.getJNIVersion();
 		int required_version = implementation.getRequiredJNIVersion();
 		if (native_jni_version != required_version)
 			throw new LinkageError("Version mismatch: jar version is '" + required_version +
-                             "', native libary version is '" + native_jni_version + "'");
+                             "', native library version is '" + native_jni_version + "'");
 		implementation.setDebug(LWJGLUtil.DEBUG);
 	}
 

Modified: trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java	2010-10-01 17:00:17 UTC (rev 3425)
+++ trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java	2010-10-01 22:20:14 UTC (rev 3426)
@@ -51,6 +51,11 @@
 	 */
 	int getJNIVersion();
 
+	/**
+	 * Returns the platform's pointer size in bytes
+	 */
+	int getPointerSize();
+
 	void setDebug(boolean debug);
 
 	/**

Modified: trunk/LWJGL/src/java/org/lwjgl/opencl/APIUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opencl/APIUtil.java	2010-10-01 17:00:17 UTC (rev 3425)
+++ trunk/LWJGL/src/java/org/lwjgl/opencl/APIUtil.java	2010-10-01 22:20:14 UTC (rev 3426)
@@ -430,9 +430,11 @@
 	static Set<String> getExtensions(final String extensionList) {
 		final Set<String> extensions = new HashSet<String>();
 
-		final StringTokenizer tokenizer = new StringTokenizer(extensionList);
-		while ( tokenizer.hasMoreTokens() )
-			extensions.add(tokenizer.nextToken());
+		if ( extensionList != null ) {
+			final StringTokenizer tokenizer = new StringTokenizer(extensionList);
+			while ( tokenizer.hasMoreTokens() )
+				extensions.add(tokenizer.nextToken());
+		}
 
 		return extensions;
 	}

Modified: trunk/LWJGL/src/java/org/lwjgl/opencl/CallbackUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opencl/CallbackUtil.java	2010-10-01 17:00:17 UTC (rev 3425)
+++ trunk/LWJGL/src/java/org/lwjgl/opencl/CallbackUtil.java	2010-10-01 22:20:14 UTC (rev 3426)
@@ -34,6 +34,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.lwjgl.opencl.CL10.*;
+
 /**
  * Utility class that handles OpenCL API callbacks.
  *
@@ -79,7 +81,7 @@
 	 * @param user_data the GlobalRef memory address
 	 */
 	static void checkCallback(final int errcode, final long user_data) {
-		if ( errcode != 0x0 && user_data != 0 )
+		if ( errcode != CL_SUCCESS && user_data != 0 )
 			deleteGlobalRef(user_data);
 	}
 
@@ -107,7 +109,7 @@
 	 * @param user_data the global reference pointer
 	 */
 	static void registerCallback(final CLContext context, final long user_data) {
-		if ( context.getPointer() == 0 ) {
+		if ( context.getPointerUnsafe() == 0 ) {
 			if ( user_data != 0 )
 				deleteGlobalRef(user_data);
 			return;

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opencl/HelloOpenCL.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opencl/HelloOpenCL.java	2010-10-01 17:00:17 UTC (rev 3425)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opencl/HelloOpenCL.java	2010-10-01 22:20:14 UTC (rev 3426)
@@ -33,6 +33,7 @@
 
 import org.lwjgl.BufferUtils;
 import org.lwjgl.LWJGLException;
+import org.lwjgl.LWJGLUtil;
 import org.lwjgl.PointerBuffer;
 import org.lwjgl.opencl.*;
 import org.lwjgl.opencl.api.CLBufferRegion;
@@ -49,7 +50,7 @@
 	public HelloOpenCL() {
 	}
 
-	protected void execute() {
+	protected static void execute() {
 		try {
 			CL.create();
 
@@ -135,28 +136,31 @@
 
 					clRetainMemObject(buffer);
 
-					final long exec_caps = device.getInfoLong(CL_DEVICE_EXECUTION_CAPABILITIES);
-					if ( (exec_caps & CL_EXEC_NATIVE_KERNEL) == CL_EXEC_NATIVE_KERNEL ) {
-						System.out.println("-TRYING TO EXEC NATIVE KERNEL-");
-						final CLCommandQueue queue = clCreateCommandQueue(context, device, 0, null);
+					if ( LWJGLUtil.getPlatform() != LWJGLUtil.PLATFORM_MACOSX ) {
+						// TODO: Native kernels crash on MacOSX, disable this until we can debug properly.
+						final long exec_caps = device.getInfoLong(CL_DEVICE_EXECUTION_CAPABILITIES);
+						if ( (exec_caps & CL_EXEC_NATIVE_KERNEL) == CL_EXEC_NATIVE_KERNEL ) {
+							System.out.println("-TRYING TO EXEC NATIVE KERNEL-");
+							final CLCommandQueue queue = clCreateCommandQueue(context, device, 0, null);
 
-						clEnqueueNativeKernel(queue, new CLNativeKernel() {
-							protected void execute(final ByteBuffer[] memobjs) {
-								if ( memobjs == null )
-									System.out.println("OK, it's null");
-								else {
-									System.out.println("memobjs = " + memobjs.length);
-									for ( int k = 0; k < memobjs.length; k++ ) {
-										System.out.println("memobjs[" + k + "].remaining() = " + memobjs[k].remaining());
-										for ( int l = memobjs[k].position(); l < memobjs[k].limit(); l++ ) {
-											memobjs[k].put(l, (byte)l);
+							clEnqueueNativeKernel(queue, new CLNativeKernel() {
+								protected void execute(final ByteBuffer[] memobjs) {
+									if ( memobjs == null )
+										System.out.println("OK, it's null");
+									else {
+										System.out.println("memobjs = " + memobjs.length);
+										for ( int k = 0; k < memobjs.length; k++ ) {
+											System.out.println("memobjs[" + k + "].remaining() = " + memobjs[k].remaining());
+											for ( int l = memobjs[k].position(); l < memobjs[k].limit(); l++ ) {
+												memobjs[k].put(l, (byte)l);
+											}
 										}
 									}
 								}
-							}
-						}, new CLMem[] { buffer }, new long[] { 128 }, null, null);
+							}, new CLMem[] { buffer }, new long[] { 128 }, null, null);
 
-						clFinish(queue);
+							clFinish(queue);
+						}
 					}
 
 					clReleaseMemObject(buffer);

Modified: trunk/LWJGL/src/native/common/common_tools.c
===================================================================
--- trunk/LWJGL/src/native/common/common_tools.c	2010-10-01 17:00:17 UTC (rev 3425)
+++ trunk/LWJGL/src/native/common/common_tools.c	2010-10-01 22:20:14 UTC (rev 3426)
@@ -61,6 +61,10 @@
 	list->current_index++;
 }
 
+JNIEXPORT jint JNICALL Java_org_lwjgl_DefaultSysImplementation_getPointerSize(JNIEnv *env, jclass clazz) {
+    return (jint)sizeof(void *);
+}
+
 JNIEXPORT void JNICALL Java_org_lwjgl_DefaultSysImplementation_setDebug
   (JNIEnv *env, jobject ignored, jboolean enable) {
 	  debug = enable == JNI_TRUE ? true : false;


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

Revision: 3425
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3425&view=rev
Author:   spasi
Date:     2010-10-01 17:00:17 +0000 (Fri, 01 Oct 2010)

Log Message:
-----------
Fixed Mandelbrot.cl to not crash on Cuda.

Modified Paths:
--------------
    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/templates/org/lwjgl/opengl/ARB_viewport_array.java

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/DemoFractal.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/DemoFractal.java	2010-10-01 03:48:41 UTC (rev 3424)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/DemoFractal.java	2010-10-01 17:00:17 UTC (rev 3425)
@@ -476,7 +476,7 @@
 		for ( int i = 0; i < programs.length; i++ ) {
 			final CLDevice device = queues[i].getCLDevice();
 
-			final StringBuilder options = new StringBuilder(useTextures ? " -D USE_TEXTURE" : "");
+			final StringBuilder options = new StringBuilder(useTextures ? "-D USE_TEXTURE" : "");
 			final CLDeviceCapabilities caps = CLCapabilities.getDeviceCapabilities(device);
 			if ( doublePrecision && isDoubleFPAvailable(device) ) {
 				//cl_khr_fp64

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/Mandelbrot.cl
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/Mandelbrot.cl	2010-10-01 03:48:41 UTC (rev 3424)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/Mandelbrot.cl	2010-10-01 17:00:17 UTC (rev 3425)
@@ -4,15 +4,17 @@
     #else
         #pragma OPENCL EXTENSION cl_khr_fp64 : enable
     #endif
-    typedef double varfloat;
+    #define varfloat double
+    #define _255 255.0
 #else
-    typedef float varfloat;
+    #define varfloat float
+    #define _255 255.0f
 #endif
 
 #ifdef USE_TEXTURE
-    typedef __write_only image2d_t OUTPUT_TYPE;
+    #define OUTPUT_TYPE __write_only image2d_t
 #else
-    typedef global uint * OUTPUT_TYPE;
+    #define OUTPUT_TYPE global uint *
 #endif
 
 /**
@@ -54,7 +56,7 @@
         #else
             output[iy * width + ix] = 0;
         #endif
-        } else {
+    } else {
         varfloat alpha = (varfloat)iteration / maxIterations;
         int colorIndex = (int)(alpha * colorMapSize);
         #ifdef USE_TEXTURE
@@ -67,9 +69,9 @@
                 (c & 0xFF) >> 0,
                 (c & 0xFF00) >> 8,
                 (c & 0xFF0000) >> 16,
-                255.0
+                _255
             );
-            write_imagef(output, (int2)(ix, iy), oc / 255.0);
+            write_imagef(output, (int2)(ix, iy), oc / _255);
         #else
             output[iy * width + ix] = colorMap[colorIndex];
         #endif

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_viewport_array.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_viewport_array.java	2010-10-01 03:48:41 UTC (rev 3424)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_viewport_array.java	2010-10-01 17:00:17 UTC (rev 3425)
@@ -122,17 +122,15 @@
 	@StripPostfix("data")
 	void glGetDoublei_v2(@GLenum int target, @GLuint int index, @OutParameter DoubleBuffer data);
 
-	// TODO: It's glGetIntegerIndexedvEXT in EXT_draw_buffers2, spec typo?
-	//@Reuse(extension = "EXT_draw_buffers2", className = "EXTDrawBuffers2")
+	@Reuse("EXTDrawBuffers2")
 	@StripPostfix(value = "v", extension = "EXT")
-	void glGetIntegerIndexedivEXT(@GLenum int target, @GLuint int index, @Check @OutParameter IntBuffer v);
+	void glGetIntegerIndexedvEXT(@GLenum int target, @GLuint int index, @Check @OutParameter IntBuffer v);
 
-	// TODO: It's glGetIntegerIndexedvEXT in EXT_draw_buffers2, spec typo?
-	//@Reuse(extension = "EXT_draw_buffers2", className = "EXTDrawBuffers2")
+	@Reuse("EXTDrawBuffers2")
 	@Alternate("glGetIntegerIndexedivEXT")
 	@GLreturn("v")
 	@StripPostfix(value = "v", extension = "EXT")
-	void glGetIntegerIndexedivEXT2(@GLenum int target, @GLuint int index, @OutParameter IntBuffer v);
+	void glGetIntegerIndexedvEXT2(@GLenum int target, @GLuint int index, @OutParameter IntBuffer v);
 
 	@Reuse("EXTDrawBuffers2")
 	void glEnableIndexedEXT(@GLenum int target, @GLuint int index);


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

Revision: 3424
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3424&view=rev
Author:   spasi
Date:     2010-10-01 03:48:41 +0000 (Fri, 01 Oct 2010)

Log Message:
-----------
OpenCL C 1.0 didn't support 3-component vectors.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/DemoFractal.java
    trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/Mandelbrot.cl

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/DemoFractal.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/DemoFractal.java	2010-10-01 00:18:45 UTC (rev 3423)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/DemoFractal.java	2010-10-01 03:48:41 UTC (rev 3424)
@@ -346,10 +346,12 @@
 		else if ( device_type == CL_DEVICE_TYPE_CPU && !caps.OpenGL21 )
 			throw new RuntimeException("OpenGL 2.1 is required to run this demo.");
 
-		if ( caps.GL_ARB_debug_output )
-			glDebugMessageCallbackARB(new ARBDebugOutputCallback());
-		else if ( caps.GL_AMD_debug_output )
-			glDebugMessageCallbackAMD(new AMDDebugOutputCallback());
+		if ( params.contains("debugGL") ) {
+			if ( caps.GL_ARB_debug_output )
+				glDebugMessageCallbackARB(new ARBDebugOutputCallback());
+			else if ( caps.GL_AMD_debug_output )
+				glDebugMessageCallbackAMD(new AMDDebugOutputCallback());
+		}
 
 		if ( device_type == CL_DEVICE_TYPE_GPU )
 			System.out.println("OpenCL Device Type: GPU (Use -forceCPU to use CPU)");

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/Mandelbrot.cl
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/Mandelbrot.cl	2010-10-01 00:18:45 UTC (rev 3423)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/Mandelbrot.cl	2010-10-01 03:48:41 UTC (rev 3424)
@@ -63,12 +63,13 @@
             // We could also use an R32UI texture and do the unpacking in GLSL,
             // but then we'd require OpenGL 3.0 (GLSL 1.30).
             uint c = colorMap[colorIndex];
-            float3 oc = (float3)(
+            float4 oc = (float4)(
                 (c & 0xFF) >> 0,
                 (c & 0xFF00) >> 8,
-                (c & 0xFF0000) >> 16
+                (c & 0xFF0000) >> 16,
+                255.0
             );
-            write_imagef(output, (int2)(ix, iy), (float4)(oc / 255.0, 1.0));
+            write_imagef(output, (int2)(ix, iy), oc / 255.0);
         #else
             output[iy * width + ix] = colorMap[colorIndex];
         #endif


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

Revision: 3423
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3423&view=rev
Author:   spasi
Date:     2010-10-01 00:18:45 +0000 (Fri, 01 Oct 2010)

Log Message:
-----------
More CL fixes.

Modified Paths:
--------------
    trunk/LWJGL/src/templates/org/lwjgl/opencl/APPLE_gl_sharing.java
    trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_gl_sharing.java

Removed Paths:
-------------
    trunk/LWJGL/src/templates/org/lwjgl/opencl/AMD_event_callback.java

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

Modified: trunk/LWJGL/src/templates/org/lwjgl/opencl/APPLE_gl_sharing.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opencl/APPLE_gl_sharing.java	2010-09-30 23:36:37 UTC (rev 3422)
+++ trunk/LWJGL/src/templates/org/lwjgl/opencl/APPLE_gl_sharing.java	2010-10-01 00:18:45 UTC (rev 3423)
@@ -69,7 +69,7 @@
 
 	@Code(
 		javaBeforeNative = "\t\tif ( param_value_size_ret == null && APIUtil.isDevicesParam(param_name) ) param_value_size_ret = APIUtil.getBufferPointer();",
-		javaAfterNative = "\t\tif ( __result == CL_SUCCESS && param_value != null && APIUtil.isDevicesParam(param_name) ) context.getParent().registerCLDevices(param_value, param_value_size_ret);"
+		javaAfterNative = "\t\tif ( __result == CL10.CL_SUCCESS && param_value != null && APIUtil.isDevicesParam(param_name) ) context.getParent().registerCLDevices(param_value, param_value_size_ret);"
 	)
 	@cl_int
 	int clGetGLContextInfoAPPLE(@PointerWrapper("cl_context") CLContext context,

Modified: trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_gl_sharing.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_gl_sharing.java	2010-09-30 23:36:37 UTC (rev 3422)
+++ trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_gl_sharing.java	2010-10-01 00:18:45 UTC (rev 3423)
@@ -65,7 +65,7 @@
 
 	@Code(
 		javaBeforeNative = "\t\tif ( param_value_size_ret == null && APIUtil.isDevicesParam(param_name) ) param_value_size_ret = APIUtil.getBufferPointer();",
-		javaAfterNative = "\t\tif ( __result == CL_SUCCESS && param_value != null && APIUtil.isDevicesParam(param_name) ) APIUtil.getCLPlatform(properties).registerCLDevices(param_value, param_value_size_ret);"
+		javaAfterNative = "\t\tif ( __result == CL10.CL_SUCCESS && param_value != null && APIUtil.isDevicesParam(param_name) ) APIUtil.getCLPlatform(properties).registerCLDevices(param_value, param_value_size_ret);"
 	)
 	@cl_int
 	int clGetGLContextInfoKHR(@NullTerminated @Const @NativeType("cl_context_properties") PointerBuffer properties,


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