[Bf-blender-cvs] [d187014675c] master: Cycles: Remove extra clFinish from driver workaround

Mai Lavelle noreply at git.blender.org
Tue May 2 20:27:34 CEST 2017


Commit: d187014675cad9a8882ee1bf0fb77c125578e667
Author: Mai Lavelle
Date:   Tue May 2 13:56:05 2017 -0400
Branches: master
https://developer.blender.org/rBd187014675cad9a8882ee1bf0fb77c125578e667

Cycles: Remove extra clFinish from driver workaround

These were causing problems with Nvidia OpenCL.

===================================================================

M	intern/cycles/device/opencl/opencl.h

===================================================================

diff --git a/intern/cycles/device/opencl/opencl.h b/intern/cycles/device/opencl/opencl.h
index 764216d0dfa..d061973dcb7 100644
--- a/intern/cycles/device/opencl/opencl.h
+++ b/intern/cycles/device/opencl/opencl.h
@@ -31,19 +31,16 @@ CCL_NAMESPACE_BEGIN
 /* Work around AMD driver hangs by ensuring each command is finished before doing anything else. */
 #  undef clEnqueueNDRangeKernel
 #  define clEnqueueNDRangeKernel(a, b, c, d, e, f, g, h, i) \
-	clFinish(a); \
 	CLEW_GET_FUN(__clewEnqueueNDRangeKernel)(a, b, c, d, e, f, g, h, i); \
 	clFinish(a);
 
 #  undef clEnqueueWriteBuffer
 #  define clEnqueueWriteBuffer(a, b, c, d, e, f, g, h, i) \
-	clFinish(a); \
 	CLEW_GET_FUN(__clewEnqueueWriteBuffer)(a, b, c, d, e, f, g, h, i); \
 	clFinish(a);
 
 #  undef clEnqueueReadBuffer
 #  define clEnqueueReadBuffer(a, b, c, d, e, f, g, h, i) \
-	clFinish(a); \
 	CLEW_GET_FUN(__clewEnqueueReadBuffer)(a, b, c, d, e, f, g, h, i); \
 	clFinish(a);
 #endif  /* CYCLES_DISABLE_DRIVER_WORKAROUNDS */




More information about the Bf-blender-cvs mailing list