mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 03:30:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2795 from ilya-lavrenov:tapi_setto

Browse Source
This commit is contained in:
Alexander Alekhin 2014-06-03 13:21:05 +04:00 committed by OpenCV Buildbot
commit 93af92c878
2 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
modules/core/src/opencl/copyset.cl
View File

@ -101,32 +101,39 @@ __kernel void copyToMask(__global const uchar * srcptr, int src_step, int src_of
__kernel void setMask(__global const uchar* mask, int maskstep, int maskoffset, __kernel void setMask(__global const uchar* mask, int maskstep, int maskoffset,
__global uchar* dstptr, int dststep, int dstoffset, __global uchar* dstptr, int dststep, int dstoffset,
int rows, int cols, dstST value_ ) int rows, int cols, dstST value_)
{ {
int x = get_global_id(0); int x = get_global_id(0);
int y = get_global_id(1); int y0 = get_global_id(1) * rowsPerWI;
if (x < cols && y < rows) if (x < cols)
{ {
int mask_index = mad24(y, maskstep, x + maskoffset); int mask_index = mad24(y0, maskstep, x + maskoffset);
if( mask[mask_index] ) int dst_index = mad24(y0, dststep, mad24(x, (int)sizeof(dstT1) * cn, dstoffset));
for (int y = y0, y1 = min(rows, y0 + rowsPerWI); y < y1; ++y)
{ {
int dst_index = mad24(y, dststep, mad24(x, (int)sizeof(dstT1) * cn, dstoffset)); if( mask[mask_index] )
storedst(value); storedst(value);
mask_index += maskstep;
dst_index += dststep;
} }
} }
} }
__kernel void set(__global uchar* dstptr, int dststep, int dstoffset, __kernel void set(__global uchar* dstptr, int dststep, int dstoffset,
int rows, int cols, dstST value_ ) int rows, int cols, dstST value_)
{ {
int x = get_global_id(0); int x = get_global_id(0);
int y = get_global_id(1); int y0 = get_global_id(1) * rowsPerWI;
if (x < cols && y < rows) if (x < cols)
{ {
int dst_index = mad24(y, dststep, mad24(x, (int)sizeof(dstT1) * cn, dstoffset)); int dst_index = mad24(y0, dststep, mad24(x, (int)sizeof(dstT1) * cn, dstoffset));
storedst(value);
for (int y = y0, y1 = min(rows, y0 + rowsPerWI); y < y1; ++y, dst_index += dststep)
storedst(value);
} }
} }

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

@ -765,27 +765,27 @@ UMat& UMat::setTo(InputArray _value, InputArray _mask)
{ {
Mat value = _value.getMat(); Mat value = _value.getMat();
CV_Assert( checkScalar(value, type(), _value.kind(), _InputArray::UMAT) ); CV_Assert( checkScalar(value, type(), _value.kind(), _InputArray::UMAT) );
double buf[4]={0,0,0,0}; double buf[4] = { 0, 0, 0, 0 };
convertAndUnrollScalar(value, tp, (uchar*)buf, 1); convertAndUnrollScalar(value, tp, (uchar *)buf, 1);
int scalarcn = cn == 3 ? 4 : cn; int scalarcn = cn == 3 ? 4 : cn, rowsPerWI = ocl::Device::getDefault().isIntel() ? 4 : 1;
char opts[1024]; String opts = format("-D dstT=%s -D rowsPerWI=%d -D dstST=%s -D dstT1=%s -D cn=%d",
sprintf(opts, "-D dstT=%s -D dstST=%s -D dstT1=%s -D cn=%d", ocl::memopTypeToStr(tp), ocl::memopTypeToStr(tp), rowsPerWI,
ocl::memopTypeToStr(CV_MAKETYPE(tp,scalarcn)), ocl::memopTypeToStr(CV_MAKETYPE(tp, scalarcn)),
ocl::memopTypeToStr(CV_MAT_DEPTH(tp)), cn); ocl::memopTypeToStr(CV_MAT_DEPTH(tp)), cn);
ocl::Kernel setK(haveMask ? "setMask" : "set", ocl::core::copyset_oclsrc, opts); ocl::Kernel setK(haveMask ? "setMask" : "set", ocl::core::copyset_oclsrc, opts);
if( !setK.empty() ) if( !setK.empty() )
{ {
ocl::KernelArg scalararg(0, 0, 0, 0, buf, CV_ELEM_SIZE1(tp)*scalarcn); ocl::KernelArg scalararg(0, 0, 0, 0, buf, CV_ELEM_SIZE1(tp) * scalarcn);
UMat mask; UMat mask;
if( haveMask ) if( haveMask )
{ {
mask = _mask.getUMat(); mask = _mask.getUMat();
CV_Assert( mask.size() == size() && mask.type() == CV_8U ); CV_Assert( mask.size() == size() && mask.type() == CV_8UC1 );
ocl::KernelArg maskarg = ocl::KernelArg::ReadOnlyNoSize(mask); ocl::KernelArg maskarg = ocl::KernelArg::ReadOnlyNoSize(mask),
ocl::KernelArg dstarg = ocl::KernelArg::ReadWrite(*this); dstarg = ocl::KernelArg::ReadWrite(*this);
setK.args(maskarg, dstarg, scalararg); setK.args(maskarg, dstarg, scalararg);
} }
else else
@ -794,8 +794,8 @@ UMat& UMat::setTo(InputArray _value, InputArray _mask)
setK.args(dstarg, scalararg); setK.args(dstarg, scalararg);
} }
size_t globalsize[] = { cols, rows }; size_t globalsize[] = { cols, (rows + rowsPerWI - 1) / rowsPerWI };
if( setK.run(2, globalsize, 0, false) ) if( setK.run(2, globalsize, NULL, false) )
return *this; return *this;
} }
} }