Merge pull request #1920 from alalek:ocl_disable_workaround

39754bd6 · Andrey Pavlenko · OpenCV Buildbot · 098d4e61 · 7b551af4 · 39754bd6
Commit 39754bd6 authored Dec 05, 2013 by Andrey Pavlenko Committed by OpenCV Buildbot Dec 05, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

cl_operations.cpp modules/ocl/src/cl_operations.cpp +3 -2

No files found.
--- a/modules/ocl/src/cl_operations.cpp
+++ b/modules/ocl/src/cl_operations.cpp
@@ -290,8 +290,9 @@ void openCLFree(void *devPtr)
        }
 #else
        // TODO FIXIT Attach clReleaseMemObject call to event completion callback
-        Context* ctx = Context::getContext();
-        clFinish(getClCommandQueue(ctx));
+        // TODO 2013/12/04 Disable workaround
+        // Context* ctx = Context::getContext();
+        // clFinish(getClCommandQueue(ctx));
 #endif
        openCLSafeCall(clReleaseMemObject(data.mainBuffer));
    }