0029844: Volume Rendering - NVIDIA graphic driver timeout errors with callback enabled

An attempt to resolve CPU-GPU synchronization issues using glFinish()

diff --git a/src/OpenGl/OpenGl_Context.cxx b/src/OpenGl/OpenGl_Context.cxx
index 18cbea056d29b53b56bcc7e4a82b1e7bf1e04ac4..8e0beecc4b8a051b2f48468d49f555623e97d6a3 100644 (file)
--- a/src/OpenGl/OpenGl_Context.cxx
+++ b/src/OpenGl/OpenGl_Context.cxx
@@ -671,7 +671,7 @@ void OpenGl_Context::SwapBuffers()
   if ((HDC )myWindowDC != NULL)
   {
     ::SwapBuffers ((HDC )myWindowDC);
-    glFlush();
+    glFinish();
   }
 #else
   if ((Display* )myDisplay != NULL)

diff --git a/src/OpenGl/OpenGl_View_Redraw.cxx b/src/OpenGl/OpenGl_View_Redraw.cxx
index d499839e4df1e01ceeed66417d4addff4d13f62d..a25ebf2c08fcea0ed340bf9721a148178fce52f1 100644 (file)
--- a/src/OpenGl/OpenGl_View_Redraw.cxx
+++ b/src/OpenGl/OpenGl_View_Redraw.cxx
@@ -561,7 +561,7 @@ void OpenGl_View::Redraw()
   }
   else
   {
-    aCtx->core11fwd->glFlush();
+    aCtx->core11fwd->glFinish();
   }
 
   // reset render mode state
@@ -731,7 +731,7 @@ void OpenGl_View::RedrawImmediate()
   }
   else
   {
-    aCtx->core11fwd->glFlush();
+    aCtx->core11fwd->glFinish();
   }
   aCtx->FrameStats()->FrameEnd (myWorkspace);