Skip to content

O
opencv
Commit 4f1d06d1 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #2874 from vbystricky:ocl_LUTAMDfix

parents 6952b90e ea6da6ee
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
modules/core/src/opencl/lut.cl
View file @ 4f1d06d1
...@@ -52,10 +52,10 @@ ...@@ -52,10 +52,10 @@
dst[2] = lut_l[idx.z]; dst[2] = lut_l[idx.z];
#elif dcn == 2 #elif dcn == 2
#define LUT_OP(num)\ #define LUT_OP(num)\
__global const uchar2 * idx = (__global const uchar2 *)(srcptr + mad24(num, src_step, src_index));\ short idx = *(__global const short *)(srcptr + mad24(num, src_step, src_index));\
dst = (__global dstT *)(dstptr + mad24(num, dst_step, dst_index));\ dst = (__global dstT *)(dstptr + mad24(num, dst_step, dst_index));\
dst[0] = lut_l[idx->x];\ dst[0] = lut_l[idx & 0xff];\
dst[1] = lut_l[idx->y]; dst[1] = lut_l[(idx >> 8) & 0xff];
#elif dcn == 1 #elif dcn == 1
#define LUT_OP(num)\ #define LUT_OP(num)\
uchar idx = (srcptr + mad24(num, src_step, src_index))[0];\ uchar idx = (srcptr + mad24(num, src_step, src_index))[0];\
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
dst[0] = lut_l[idx]; dst[0] = lut_l[idx];
#else #else
#define LUT_OP(num)\ #define LUT_OP(num)\
src = (__global const srcT *)(srcptr + mad24(num, src_step, src_index));\ __global const srcT * src = (__global const srcT *)(srcptr + mad24(num, src_step, src_index));\
dst = (__global dstT *)(dstptr + mad24(num, dst_step, dst_index));\ dst = (__global dstT *)(dstptr + mad24(num, dst_step, dst_index));\
for (int cn = 0; cn < dcn; ++cn)\ for (int cn = 0; cn < dcn; ++cn)\
dst[cn] = lut_l[src[cn]]; dst[cn] = lut_l[src[cn]];
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
dst[0] = lut_l[idx]; dst[0] = lut_l[idx];
#else #else
#define LUT_OP(num)\ #define LUT_OP(num)\
src = (__global const srcT *)(srcptr + mad24(num, src_step, src_index));\ __global const srcT *src = (__global const srcT *)(srcptr + mad24(num, src_step, src_index));\
dst = (__global dstT *)(dstptr + mad24(num, dst_step, dst_index));\ dst = (__global dstT *)(dstptr + mad24(num, dst_step, dst_index));\
for (int cn = 0; cn < dcn; ++cn)\ for (int cn = 0; cn < dcn; ++cn)\
dst[cn] = lut_l[mad24(src[cn], lcn, cn)]; dst[cn] = lut_l[mad24(src[cn], lcn, cn)];
...@@ -133,8 +133,7 @@ __kernel void LUT(__global const uchar * srcptr, int src_step, int src_offset, ...@@ -133,8 +133,7 @@ __kernel void LUT(__global const uchar * srcptr, int src_step, int src_offset,
{ {
int src_index = mad24(y, src_step, mad24(x, (int)sizeof(srcT) * dcn, src_offset)); int src_index = mad24(y, src_step, mad24(x, (int)sizeof(srcT) * dcn, src_offset));
int dst_index = mad24(y, dst_step, mad24(x, (int)sizeof(dstT) * dcn, dst_offset)); int dst_index = mad24(y, dst_step, mad24(x, (int)sizeof(dstT) * dcn, dst_offset));
__global const srcT * src; __global dstT * dst; __global dstT * dst;
int tmp_idx;
LUT_OP(0); LUT_OP(0);
if (y < rows - 1) if (y < rows - 1)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment