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

Put the cl_image support detection in utils

Browse Source
This commit is contained in:
yao 2013-02-27 10:24:03 +08:00
parent ea433cc496
commit da47ccec9c
3 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,6 +221,36 @@ namespace cv
{
openCLFree(texture);
}
bool support_image2d(Context *clCxt)
{
static const char * _kernel_string = "__kernel void test_func(image2d_t img) {}";
static bool _isTested = false;
static bool _support = false;
if(_isTested)
{
return _support;
}
try
{
cv::ocl::openCLGetKernelFromSource(clCxt, &_kernel_string, "test_func");
_support = true;
}
catch (const cv::Exception& e)
{
if(e.code == -217)
{
_support = false;
}
else
{
// throw e once again
throw e;
}
}
_isTested = true;
return _support;
}
}//namespace ocl
}//namespace cv

4
modules/ocl/src/mcwutil.hpp
View File

@ -70,6 +70,10 @@ namespace cv
// 2. for faster clamping, there is no buffer padding for the constructed texture
cl_mem bindTexture(const oclMat &mat);
void releaseTexture(cl_mem& texture);
// returns whether the current context supports image2d_t format or not
bool support_image2d(Context *clCxt = Context::getContext());
}//namespace ocl
}//namespace cv

30
modules/ocl/src/surf.cpp
View File

@ -83,36 +83,6 @@ static inline int calcSize(int octave, int layer)
namespace
{
const char* noImage2dOption = "-D DISABLE_IMAGE2D";
// default kernel name can be any kernel in nonfree_surf.cl
bool support_image2d(const char* kernel_name = "icvCalcLayerDetAndTrace")
{
static bool _isTested = false;
static bool _support = false;
if(_isTested)
{
return _support;
}
try
{
cv::ocl::openCLGetKernelFromSource(Context::getContext(), &nonfree_surf, kernel_name);
_support = true;
}
catch (cv::Exception& e)
{
if(e.code == -217)
{
_support = false;
}
else
{
// throw e once again
cv::error(e);
}
}
_isTested = true;
return _support;
}
}
class SURF_OCL_Invoker