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

another attempt to fix Core_UMat.getUMat test

Browse Source
This commit is contained in:
Vadim Pisarevsky 2013-12-01 23:14:45 +04:00
parent f263fe145a
commit 9be727b1ea
1 changed files with 9 additions and 2 deletions

11
modules/core/src/ocl.cpp

@ -2043,6 +2043,7 @@ struct Kernel::Impl
clCreateKernel(ph, kname, &retval) : 0; clCreateKernel(ph, kname, &retval) : 0;
for( int i = 0; i < MAX_ARRS; i++ ) for( int i = 0; i < MAX_ARRS; i++ )
u[i] = 0; u[i] = 0;
haveTempDstUMats = false;
} }
void cleanupUMats() void cleanupUMats()
@ -2055,14 +2056,17 @@ struct Kernel::Impl
u[i] = 0; u[i] = 0;
} }
nu = 0; nu = 0;
haveTempDstUMats = false;
} }
void addUMat(const UMat& m) void addUMat(const UMat& m, bool dst)
{ {
CV_Assert(nu < MAX_ARRS && m.u && m.u->urefcount > 0); CV_Assert(nu < MAX_ARRS && m.u && m.u->urefcount > 0);
u[nu] = m.u; u[nu] = m.u;
CV_XADD(&m.u->urefcount, 1); CV_XADD(&m.u->urefcount, 1);
nu++; nu++;
if(dst && m.u->tempUMat())
haveTempDstUMats = true;
} }
void finit() void finit()
@ -2085,6 +2089,7 @@ struct Kernel::Impl
enum { MAX_ARRS = 16 }; enum { MAX_ARRS = 16 };
UMatData* u[MAX_ARRS]; UMatData* u[MAX_ARRS];
int nu; int nu;
bool haveTempDstUMats;
}; };
}} }}
@ -2243,7 +2248,7 @@ int Kernel::set(int i, const KernelArg& arg)
i += 3; i += 3;
} }
} }
p->addUMat(*arg.m); p->addUMat(*arg.m, (accessFlags & ACCESS_WRITE) != 0);
return i; return i;
} }
clSetKernelArg(p->handle, (cl_uint)i, arg.sz, arg.obj); clSetKernelArg(p->handle, (cl_uint)i, arg.sz, arg.obj);
@ -2271,6 +2276,8 @@ bool Kernel::run(int dims, size_t _globalsize[], size_t _localsize[],
} }
if( total == 0 ) if( total == 0 )
return true; return true;
if( p->haveTempDstUMats )
sync = true;
cl_int retval = clEnqueueNDRangeKernel(qq, p->handle, (cl_uint)dims, cl_int retval = clEnqueueNDRangeKernel(qq, p->handle, (cl_uint)dims,
offset, globalsize, _localsize, 0, 0, offset, globalsize, _localsize, 0, 0,
sync ? 0 : &p->e); sync ? 0 : &p->e);