mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-09 18:43:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ocl: CL_MEM_USE_HOST_PTR workaround test

Browse Source
This commit is contained in:
Alexander Alekhin 2018-04-20 14:51:55 +03:00
parent 7ea5029ae5
commit d76b41b50e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4666,7 +4666,9 @@ public:
#endif #endif
{ {
tempUMatFlags = UMatData::TEMP_UMAT; tempUMatFlags = UMatData::TEMP_UMAT;
if (u->origdata == cv::alignPtr(u->origdata, 4)) // There are OpenCL runtime issues for less aligned data if (u->origdata == cv::alignPtr(u->origdata, 4) // There are OpenCL runtime issues for less aligned data
&& !(u->originalUMatData && u->originalUMatData->handle) // Avoid sharing of host memory between OpenCL buffers
)
{ {
handle = clCreateBuffer(ctx_handle, CL_MEM_USE_HOST_PTR|createFlags, handle = clCreateBuffer(ctx_handle, CL_MEM_USE_HOST_PTR|createFlags,
u->size, u->origdata, &retval); u->size, u->origdata, &retval);

2
modules/core/src/umatrix.cpp
View File

@ -381,6 +381,7 @@ UMat Mat::getUMat(int accessFlags, UMatUsageFlags usageFlags) const
if(!a) if(!a)
a = a0; a = a0;
new_u = a->allocate(dims, size.p, type(), data, step.p, accessFlags, usageFlags); new_u = a->allocate(dims, size.p, type(), data, step.p, accessFlags, usageFlags);
new_u->originalUMatData = u;
} }
bool allocated = false; bool allocated = false;
CV_TRY CV_TRY
@ -404,7 +405,6 @@ UMat Mat::getUMat(int accessFlags, UMatUsageFlags usageFlags) const
CV_Assert(new_u->tempUMat()); CV_Assert(new_u->tempUMat());
} }
#endif #endif
new_u->originalUMatData = u;
CV_XADD(&(u->refcount), 1); CV_XADD(&(u->refcount), 1);
CV_XADD(&(u->urefcount), 1); CV_XADD(&(u->urefcount), 1);
} }