From 5356c2e6effcdec3c3a6e4f492ea8742bed668eb Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Tue, 26 Apr 2011 03:59:23 +0200
Subject: compatibility update to latest jocl.

---
 src/com/jogamp/opencl/demos/fractal/MultiDeviceFractal.java          | 5 +++--
 .../jogamp/opencl/demos/joglinterop/GLCLInteroperabilityDemo.java    | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/com')

diff --git a/src/com/jogamp/opencl/demos/fractal/MultiDeviceFractal.java b/src/com/jogamp/opencl/demos/fractal/MultiDeviceFractal.java
index 9fcd172..f03c0b8 100644
--- a/src/com/jogamp/opencl/demos/fractal/MultiDeviceFractal.java
+++ b/src/com/jogamp/opencl/demos/fractal/MultiDeviceFractal.java
@@ -12,6 +12,7 @@ import com.jogamp.opencl.CLKernel;
 import com.jogamp.opencl.CLPlatform;
 import com.jogamp.opencl.CLProgram;
 import com.jogamp.opencl.CLProgram.CompilerOptions;
+import com.jogamp.opencl.util.CLPlatformFilters;
 import com.jogamp.opencl.util.CLProgramConfiguration;
 import com.jogamp.opengl.util.awt.TextRenderer;
 import java.awt.Color;
@@ -386,9 +387,9 @@ public class MultiDeviceFractal implements GLEventListener {
                       .rewind();
 
             // aquire GL objects, and enqueue a kernel with a probe from the list
-            queues[i].putAcquireGLObject(pboBuffers[i].ID)
+            queues[i].putAcquireGLObject(pboBuffers[i])
                      .put2DRangeKernel(kernels[i], 0, 0, sliceWidth, height, 0, 0, probes)
-                     .putReleaseGLObject(pboBuffers[i].ID);
+                     .putReleaseGLObject(pboBuffers[i]);
 
         }
 
diff --git a/src/com/jogamp/opencl/demos/joglinterop/GLCLInteroperabilityDemo.java b/src/com/jogamp/opencl/demos/joglinterop/GLCLInteroperabilityDemo.java
index fbd3775..2e630c6 100644
--- a/src/com/jogamp/opencl/demos/joglinterop/GLCLInteroperabilityDemo.java
+++ b/src/com/jogamp/opencl/demos/joglinterop/GLCLInteroperabilityDemo.java
@@ -182,6 +182,7 @@ public class GLCLInteroperabilityDemo implements GLEventListener {
         commandQueue = clContext.getMaxFlopsDevice().createCommandQueue();
 
         clBuffer = clContext.createFromGLBuffer(glObjects[VERTICES], CLGLBuffer.Mem.WRITE_ONLY);
+        System.out.println("clsize: "+clBuffer.getCLSize());
 
         System.out.println("cl buffer type: " + clBuffer.getGLObjectType());
         System.out.println("shared with gl buffer: " + clBuffer.getGLObjectID());
@@ -230,9 +231,9 @@ public class GLCLInteroperabilityDemo implements GLEventListener {
 
         kernel.setArg(2, step += 0.05f);
 
-        commandQueue.putAcquireGLObject(clBuffer.ID)
+        commandQueue.putAcquireGLObject(clBuffer)
                     .put2DRangeKernel(kernel, 0, 0, MESH_SIZE, MESH_SIZE, 0, 0)
-                    .putReleaseGLObject(clBuffer.ID)
+                    .putReleaseGLObject(clBuffer)
                     .finish();
 
     }
-- 
cgit v1.2.3