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

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

Revision: 3512
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3512&view=rev
Author:   spasi
Date:     2011-04-02 11:33:02 +0000 (Sat, 02 Apr 2011)

Log Message:
-----------
Attempt to fix NV compilation issue.

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	2011-03-30 09:35:14 UTC (rev 3511)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/DemoFractal.java	2011-04-02 11:33:02 UTC (rev 3512)
@@ -518,12 +518,9 @@
 				glDeleteBuffers(glIDs);
 		}
 
-		if ( useTextures )
+		if ( useTextures ) {
 			glGenTextures(glIDs);
-		else
-			glGenBuffers(glIDs);
 
-		if ( useTextures ) {
 			// Init textures
 			for ( int i = 0; i < slices; i++ ) {
 				glBindTexture(GL_TEXTURE_2D, glIDs.get(i));
@@ -535,6 +532,8 @@
 			}
 			glBindTexture(GL_TEXTURE_2D, 0);
 		} else {
+			glGenBuffers(glIDs);
+
 			// setup one empty PBO per slice
 			for ( int i = 0; i < slices; i++ ) {
 				glBindBuffer(GL_PIXEL_UNPACK_BUFFER, glIDs.get(i));

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/Mandelbrot.cl
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/Mandelbrot.cl	2011-03-30 09:35:14 UTC (rev 3511)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opencl/gl/Mandelbrot.cl	2011-04-02 11:33:02 UTC (rev 3512)
@@ -57,7 +57,7 @@
             output[iy * width + ix] = 0;
         #endif
     } else {
-        varfloat alpha = (varfloat)iteration / maxIterations;
+        float alpha = (float)iteration / maxIterations;
         int colorIndex = (int)(alpha * colorMapSize);
         #ifdef USE_TEXTURE
             // We could have changed colorMap to a texture + sampler, but the
@@ -69,9 +69,9 @@
                 (c & 0xFF) >> 0,
                 (c & 0xFF00) >> 8,
                 (c & 0xFF0000) >> 16,
-                _255
+                255.0f
             );
-            write_imagef(output, (int2)(ix, iy), oc / _255);
+            write_imagef(output, (int2)(ix, iy), oc / 255.0f);
         #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.