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

ocl: workaround for synchronization issue in ::map()

Browse Source
This commit is contained in:
Alexander Alekhin
2014-03-13 16:39:54 +04:00
committed by Andrey Pavlenko
parent 588658d1a3
commit 3578f0afe9
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3798,11 +3798,16 @@ public:
cl_command_queue q = (cl_command_queue)Queue::getDefault().ptr(); cl_command_queue q = (cl_command_queue)Queue::getDefault().ptr();
if( u->refcount == 0 ) // FIXIT Workaround for UMat synchronization issue
// if( u->refcount == 0 )
{ {
if( !u->copyOnMap() ) if( !u->copyOnMap() )
{ {
CV_Assert(u->data == 0); if (u->data) // FIXIT Workaround for UMat synchronization issue
{
//CV_Assert(u->hostCopyObsolete() == false);
return;
}
// because there can be other map requests for the same UMat with different access flags, // because there can be other map requests for the same UMat with different access flags,
// we use the universal (read-write) access mode. // we use the universal (read-write) access mode.
cl_int retval = 0; cl_int retval = 0;
@@ -3844,6 +3849,10 @@ public:
UMatDataAutoLock autolock(u); UMatDataAutoLock autolock(u);
// FIXIT Workaround for UMat synchronization issue
if(u->refcount > 0)
return;
cl_command_queue q = (cl_command_queue)Queue::getDefault().ptr(); cl_command_queue q = (cl_command_queue)Queue::getDefault().ptr();
cl_int retval = 0; cl_int retval = 0;
if( !u->copyOnMap() && u->data ) if( !u->copyOnMap() && u->data )