made sure to flush gl/cl pipelines correctly (-> fixed rare segmentat…

…ion fault).
sgothel · Mar 16, 2010 · 2c230d8 · 2c230d8
1 parent df1138e
commit 2c230d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/com/mbien/opencl/demos/fractal/MultiDeviceFractal.java b/src/com/mbien/opencl/demos/fractal/MultiDeviceFractal.java
@@ -118,6 +118,7 @@ public void init(GLAutoDrawable drawable) {
         // enable GL error checking using the composable pipeline
         drawable.setGL(new DebugGL2(drawable.getGL().getGL2()));
 
+        drawable.getGL().glFinish();
         initCL(drawable.getContext());
 
         GL2 gl = drawable.getGL().getGL2();
@@ -295,6 +296,8 @@ private void setKernelConstants() {
     public void display(GLAutoDrawable drawable) {
         GL gl = drawable.getGL();
 
+        // make sure GL does not use our objects before we start computeing
+        gl.glFinish();
         if(!buffersInitialized) {
             initPBO(gl);
             setKernelConstants();
@@ -303,8 +306,6 @@ public void display(GLAutoDrawable drawable) {
             buildProgram();
             setKernelConstants();
         }
-        // make sure GL does not use our objects before we start computeing
-        gl.glFinish();
         compute();
 
         render(gl.getGL2());
@@ -335,7 +336,7 @@ private void compute() {
 
         }
 
-        // block until done
+        // block until done (important: finish before doing further gl work)
         for (int i = 0; i < slices; i++) {
             queues[i].finish();
         }

diff --git a/src/com/mbien/opencl/demos/joglinterop/GLCLInteroperabilityDemo.java b/src/com/mbien/opencl/demos/joglinterop/GLCLInteroperabilityDemo.java
@@ -179,10 +179,13 @@ private void initCL() {
 
     public void display(GLAutoDrawable drawable) {
 
-        computeHeightfield();
-
         GL2 gl = drawable.getGL().getGL2();
 
+        // ensure pipeline is clean before doing cl work
+        gl.glFinish();
+
+        computeHeightfield();
+
         gl.glClear(GL2.GL_COLOR_BUFFER_BIT | GL2.GL_DEPTH_BUFFER_BIT);
         gl.glLoadIdentity();
 
@@ -199,8 +202,6 @@ public void display(GLAutoDrawable drawable) {
         gl.glDisableClientState(GL2.GL_VERTEX_ARRAY);
 
 //            gl.glBindBuffer(GL2.GL_ARRAY_BUFFER, 0);
-
-        gl.glFinish();
 
     }