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

Add OpenCL version 1.2 query into ocl::Context::supportsFeature().

Browse Source 
Add backwards portability for OpenCL 1.1 when OpenCV executables
are compiled with OpenCL 1.2 profile support.
This commit is contained in:
peng xiao
2013-05-02 14:44:59 +08:00
parent 48a8aefd6b
commit 355bc691fc
3 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
modules/ocl/src/mcwutil.cpp
View File

@@ -124,7 +124,7 @@ namespace cv
build_options, finish_mode);
}
cl_mem bindTexture(const oclMat &mat)
cl_mem bindTexture(const oclMat &mat)
{
cl_mem texture;
cl_image_format format;
@@ -162,30 +162,37 @@ namespace cv
CV_Error(-1, "Image forma is not supported");
break;
}
if(Context::getContext()->supportsFeature(Context::CL_VER_1_2))
{
#if CL_VERSION_1_2
cl_image_desc desc;
desc.image_type = CL_MEM_OBJECT_IMAGE2D;
desc.image_width = mat.cols;
desc.image_height = mat.rows;
desc.image_depth = 0;
desc.image_array_size = 1;
desc.image_row_pitch = 0;
desc.image_slice_pitch = 0;
desc.buffer = NULL;
desc.num_mip_levels = 0;
desc.num_samples = 0;
texture = clCreateImage((cl_context)mat.clCxt->oclContext(), CL_MEM_READ_WRITE, &format, &desc, NULL, &err);
cl_image_desc desc;
desc.image_type = CL_MEM_OBJECT_IMAGE2D;
desc.image_width = mat.cols;
desc.image_height = mat.rows;
desc.image_depth = 0;
desc.image_array_size = 1;
desc.image_row_pitch = 0;
desc.image_slice_pitch = 0;
desc.buffer = NULL;
desc.num_mip_levels = 0;
desc.num_samples = 0;
texture = clCreateImage((cl_context)mat.clCxt->oclContext(), CL_MEM_READ_WRITE, &format, &desc, NULL, &err);
#else
texture = clCreateImage2D(
(cl_context)mat.clCxt->oclContext(),
CL_MEM_READ_WRITE,
&format,
mat.cols,
mat.rows,
0,
NULL,
&err);
CV_Error(CV_StsBadFunc, "Non-deprecated image creation API call is not supported.");
#endif
}
else
{
texture = clCreateImage2D(
(cl_context)mat.clCxt->oclContext(),
CL_MEM_READ_WRITE,
&format,
mat.cols,
mat.rows,
0,
NULL,
&err);
}
size_t origin[] = { 0, 0, 0 };
size_t region[] = { mat.cols, mat.rows, 1 };
@@ -198,7 +205,7 @@ namespace cv
clEnqueueCopyBufferRect((cl_command_queue)mat.clCxt->oclCommandQueue(), (cl_mem)mat.data, devData, origin, origin,
regin, mat.step, 0, mat.cols * mat.elemSize(), 0, 0, NULL, NULL);
clFlush((cl_command_queue)mat.clCxt->oclCommandQueue());
}
}
else
{
devData = (cl_mem)mat.data;
@@ -214,7 +221,6 @@ namespace cv
openCLSafeCall(err);
return texture;
}
void releaseTexture(cl_mem& texture)
{
openCLFree(texture);