generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ocl: restore clFinish() in unmap() for AMD devices

Browse Source 
This reverts commit 7d91b8efcd053304e5b0fb5afff06e151b2d4096.
This commit is contained in:
Alexander Alekhin 2014-10-24 14:29:38 +04:00
parent e40567eaee
commit 579a7fff6d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/src/ocl.cpp
View File

@ -3979,6 +3979,11 @@ public:
u->markDeviceMemMapped(false); u->markDeviceMemMapped(false);
CV_Assert( (retval = clEnqueueUnmapMemObject(q, CV_Assert( (retval = clEnqueueUnmapMemObject(q,
(cl_mem)u->handle, u->data, 0, 0, 0)) == CL_SUCCESS ); (cl_mem)u->handle, u->data, 0, 0, 0)) == CL_SUCCESS );
if (Device::getDefault().isAMD())
{
// required for multithreaded applications (see stitching test)
CV_OclDbgAssert(clFinish(q) == CL_SUCCESS);
}
u->data = 0; u->data = 0;
} }
else if( u->copyOnMap() && u->deviceCopyObsolete() ) else if( u->copyOnMap() && u->deviceCopyObsolete() )