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

fixing 'map_unmap_counting'

Browse Source
This commit is contained in:
Andrey Pavlenko
2015-08-25 17:25:03 +03:00
parent f6b758699b
commit 3656a1aa66
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4683,8 +4683,6 @@ public:
cl_command_queue q = (cl_command_queue)Queue::getDefault().ptr(); cl_command_queue q = (cl_command_queue)Queue::getDefault().ptr();
// FIXIT Workaround for UMat synchronization issue
// if( u->refcount == 0 )
{ {
if( !u->copyOnMap() ) if( !u->copyOnMap() )
{ {
@@ -4717,11 +4715,6 @@ public:
return; return;
} }
#endif #endif
if (!u->hostCopyObsolete()) // FIXIT Workaround for UMat synchronization issue
{
CV_Assert(u->data);
return;
}
cl_int retval = 0; cl_int retval = 0;
u->data = (uchar*)clEnqueueMapBuffer(q, (cl_mem)u->handle, CL_TRUE, u->data = (uchar*)clEnqueueMapBuffer(q, (cl_mem)u->handle, CL_TRUE,
@@ -4768,10 +4761,6 @@ 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->deviceMemMapped() ) if( !u->copyOnMap() && u->deviceMemMapped() )
@@ -4797,6 +4786,7 @@ public:
u->allocatorFlags_ &= ~svm::OPENCL_SVM_BUFFER_MAP; u->allocatorFlags_ &= ~svm::OPENCL_SVM_BUFFER_MAP;
} }
} }
if (u->refcount == 0)
u->data = 0; u->data = 0;
u->markDeviceCopyObsolete(false); u->markDeviceCopyObsolete(false);
u->markHostCopyObsolete(true); u->markHostCopyObsolete(true);
@@ -4810,6 +4800,8 @@ public:
// required for multithreaded applications (see stitching test) // required for multithreaded applications (see stitching test)
CV_OclDbgAssert(clFinish(q) == CL_SUCCESS); CV_OclDbgAssert(clFinish(q) == CL_SUCCESS);
} }
if (u->refcount == 0)
u->data = 0; u->data = 0;
} }
else if( u->copyOnMap() && u->deviceCopyObsolete() ) else if( u->copyOnMap() && u->deviceCopyObsolete() )

5
modules/core/test/test_umat.cpp
View File

@@ -1035,8 +1035,9 @@ TEST(UMat, map_unmap_counting)
Mat m(Size(10, 10), CV_8UC1); Mat m(Size(10, 10), CV_8UC1);
UMat um = m.getUMat(ACCESS_RW); UMat um = m.getUMat(ACCESS_RW);
{ {
Mat d = um.getMat(ACCESS_RW); Mat d1 = um.getMat(ACCESS_RW);
d.release(); //Mat d2 = um.getMat(ACCESS_RW);
d1.release();
} }
void* h = NULL; void* h = NULL;
EXPECT_NO_THROW(h = um.handle(ACCESS_RW)); EXPECT_NO_THROW(h = um.handle(ACCESS_RW));