summaryrefslogtreecommitdiffstats
path: root/test/com/jogamp/opencl/gl/CLGLTest.java
diff options
context:
space:
mode:
authorWade Walker <[email protected]>2014-04-06 15:05:46 -0500
committerWade Walker <[email protected]>2014-04-06 15:05:46 -0500
commitf98767152049ac141e115dcbb6a6ac66f4831d6a (patch)
treee41c7dfd1ba0e11f230c25f843b59d444af69dd3 /test/com/jogamp/opencl/gl/CLGLTest.java
parent00f4325c5a46bf7c46be8646c1eb6f53b632f30a (diff)
Fix CL-GL interoperability tests on Mac.
Fixed detection of compatible interoperability platforms (was silently skipping platform because GL vendor was Nvidia, but CL vendor was Apple). Also fixed CL kernel syntax error about signed-unsigned comparison that ATI's driver on Windows didn't find, and fixed the CL memory object to be write-only instead of read-only (which ATI's Windows driver just ignored).
Diffstat (limited to 'test/com/jogamp/opencl/gl/CLGLTest.java')
-rw-r--r--test/com/jogamp/opencl/gl/CLGLTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/com/jogamp/opencl/gl/CLGLTest.java b/test/com/jogamp/opencl/gl/CLGLTest.java
index 8c729c08..8c477002 100644
--- a/test/com/jogamp/opencl/gl/CLGLTest.java
+++ b/test/com/jogamp/opencl/gl/CLGLTest.java
@@ -284,13 +284,13 @@ public class CLGLTest extends UITestCase {
// create CLGL buffer
ByteBuffer bufferCL = Buffers.newDirectByteBuffer(texWidth*texHeight*4);
- CLGLTexture2d<ByteBuffer> clTexture = clglcontext.createFromGLTexture2d(bufferCL, GL2.GL_TEXTURE_2D, id[0], 0, CLBuffer.Mem.READ_ONLY);
+ CLGLTexture2d<ByteBuffer> clTexture = clglcontext.createFromGLTexture2d(bufferCL, GL2.GL_TEXTURE_2D, id[0], 0, CLBuffer.Mem.WRITE_ONLY);
// set texel values to a formula that can be read back and verified
String sourceCL = "__kernel void writeTexture (__write_only image2d_t imageTex, unsigned w, unsigned h ) \n" +
"{ \n" +
- " for(int y=1; y<=h; ++y) { \n" +
- " for(int x=1; x<=w; ++x) { \n" +
+ " for(unsigned y=1; y<=h; ++y) { \n" +
+ " for(unsigned x=1; x<=w; ++x) { \n" +
" write_imagef(imageTex, (int2)(x-1,y-1), (float4)(((float)x)/((float)(4*w)), ((float)y)/((float)(4*h)), 0.0f, 1.0f)); \n" +
" } \n" +
" } \n" +