Skip to content

Commit 595bb7d

Browse files
committed
OpenCL: Remove unused code
The OpenCL kernel pixSubtract is never used, so remove it. Signed-off-by: Stefan Weil <sw@weilnetz.de>
1 parent 7c7c6ec commit 595bb7d

File tree

2 files changed

+4
-28
lines changed

2 files changed

+4
-28
lines changed

src/opencl/oclkernels.h

-16
Original file line numberDiff line numberDiff line change
@@ -59,22 +59,6 @@ KERNEL(
5959
}\n
6060
)
6161

62-
KERNEL(
63-
\n__kernel void pixSubtract(__global int *dword, __global int *sword,
64-
const int wpl, const int h, __global int *outword)
65-
{
66-
const unsigned int row = get_global_id(1);
67-
const unsigned int col = get_global_id(0);
68-
const unsigned int pos = row * wpl + col;
69-
70-
//Ignore the execss
71-
if (row >= h || col >= wpl)
72-
return;
73-
74-
*(outword + pos) = *(dword + pos) & ~(*(sword + pos));
75-
}\n
76-
)
77-
7862
KERNEL(
7963
\n__kernel void morphoDilateHor_5x5(__global int *sword,__global int *dword,
8064
const int wpl, const int h)

src/opencl/openclwrapper.cpp

+4-12
Original file line numberDiff line numberDiff line change
@@ -1510,7 +1510,7 @@ static cl_int pixCloseCL(l_int32 hsize, l_int32 vsize, l_int32 wpl, l_int32 h) {
15101510

15111511
// output = buffer1 & ~(buffer2)
15121512
static cl_int pixSubtractCL_work(l_uint32 wpl, l_uint32 h, cl_mem buffer1,
1513-
cl_mem buffer2, cl_mem outBuffer = nullptr) {
1513+
cl_mem buffer2) {
15141514
cl_int status;
15151515
size_t globalThreads[2];
15161516
int gsize;
@@ -1521,23 +1521,15 @@ static cl_int pixSubtractCL_work(l_uint32 wpl, l_uint32 h, cl_mem buffer1,
15211521
gsize = (h + GROUPSIZE_Y - 1) / GROUPSIZE_Y * GROUPSIZE_Y;
15221522
globalThreads[1] = gsize;
15231523

1524-
if (outBuffer != nullptr) {
1525-
rEnv.mpkKernel = clCreateKernel(rEnv.mpkProgram, "pixSubtract", &status);
1526-
CHECK_OPENCL(status, "clCreateKernel pixSubtract");
1527-
} else {
1528-
rEnv.mpkKernel =
1529-
clCreateKernel(rEnv.mpkProgram, "pixSubtract_inplace", &status);
1530-
CHECK_OPENCL(status, "clCreateKernel pixSubtract_inplace");
1531-
}
1524+
rEnv.mpkKernel =
1525+
clCreateKernel(rEnv.mpkProgram, "pixSubtract_inplace", &status);
1526+
CHECK_OPENCL(status, "clCreateKernel pixSubtract_inplace");
15321527

15331528
// Enqueue a kernel run call.
15341529
status = clSetKernelArg(rEnv.mpkKernel, 0, sizeof(cl_mem), &buffer1);
15351530
status = clSetKernelArg(rEnv.mpkKernel, 1, sizeof(cl_mem), &buffer2);
15361531
status = clSetKernelArg(rEnv.mpkKernel, 2, sizeof(wpl), &wpl);
15371532
status = clSetKernelArg(rEnv.mpkKernel, 3, sizeof(h), &h);
1538-
if (outBuffer != nullptr) {
1539-
status = clSetKernelArg(rEnv.mpkKernel, 4, sizeof(cl_mem), &outBuffer);
1540-
}
15411533
status =
15421534
clEnqueueNDRangeKernel(rEnv.mpkCmdQueue, rEnv.mpkKernel, 2, nullptr,
15431535
globalThreads, localThreads, 0, nullptr, nullptr);

0 commit comments

Comments
 (0)