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

ocl: stereo_csbp: divUp -> roundUp

Browse Source
This commit is contained in:
Alexander Alekhin 2013-09-30 20:33:56 +04:00
parent 8224f9843e
commit 90df620deb
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/ocl/src/stereo_csbp.cpp
View File

@ -179,10 +179,7 @@ namespace cv
//size_t blockSize = 256;
size_t localThreads[] = {32, 8 ,1};
size_t globalThreads[] = {divUp(w, localThreads[0]) *localThreads[0],
divUp(h, localThreads[1]) *localThreads[1],
1
};
size_t globalThreads[] = { roundUp(w, localThreads[0]), roundUp(h, localThreads[1]), 1 };
int disp_step = msg_step * h;
openCLVerifyKernel(clCxt, kernel, localThreads);
@ -274,11 +271,8 @@ namespace cv
cl_kernel kernel = openCLGetKernelFromSource(clCxt, &stereocsbp, kernelName);
size_t localThreads[] = {32, 8, 1};
size_t globalThreads[] = {divUp(w, localThreads[0]) *localThreads[0],
divUp(h, localThreads[1]) *localThreads[1],
1
};
size_t localThreads[] = { 32, 8, 1 };
size_t globalThreads[] = { roundUp(w, localThreads[0]), roundUp(h, localThreads[1]), 1 };
int disp_step1 = msg_step1 * h;
int disp_step2 = msg_step2 * h2;
@ -387,10 +381,7 @@ namespace cv
//size_t blockSize = 256;
size_t localThreads[] = {32, 8, 1};
size_t globalThreads[] = {divUp(w, localThreads[0]) *localThreads[0],
divUp(h, localThreads[1]) *localThreads[1],
1
};
size_t globalThreads[] = { roundUp(w, localThreads[0]), roundUp(h, localThreads[1]), 1 };
int disp_step1 = msg_step1 * h;
int disp_step2 = msg_step2 * h2;
@ -490,11 +481,8 @@ namespace cv
cl_kernel kernel = openCLGetKernelFromSource(clCxt, &stereocsbp, kernelName);
//size_t blockSize = 256;
size_t localThreads[] = {32, 8, 1};
size_t globalThreads[] = {divUp(disp.cols, localThreads[0]) *localThreads[0],
divUp(disp.rows, localThreads[1]) *localThreads[1],
1
};
size_t localThreads[] = { 32, 8, 1 };
size_t globalThreads[] = { roundUp(disp.cols, localThreads[0]), roundUp(disp.rows, localThreads[1]), 1 };
int step_size = disp.step / disp.elemSize();
int disp_step = disp.rows * msg_step;