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

[<sp...@us...>]

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.