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

6
modules/ocl/src/initialization.cpp
View File

@@ -130,6 +130,7 @@ namespace cv
cl_platform_id oclplatform;
std::vector<cl_device_id> devices;
std::vector<std::string> devName;
std::string clVersion;
cl_context oclcontext;
cl_command_queue clCmdQueue;
@@ -304,6 +305,7 @@ namespace cv
char deviceName[256];
int devcienums = 0;
char clVersion[256];
for (unsigned i = 0; i < numPlatforms; ++i)
{
cl_uint numsdev;
@@ -319,6 +321,8 @@ namespace cv
Info ocltmpinfo;
ocltmpinfo.impl->oclplatform = platforms[i];
openCLSafeCall(clGetPlatformInfo(platforms[i], CL_PLATFORM_VERSION, sizeof(clVersion), clVersion, NULL));
ocltmpinfo.impl->clVersion = clVersion;
for(unsigned j = 0; j < numsdev; ++j)
{
ocltmpinfo.impl->devices.push_back(devices[j]);
@@ -997,6 +1001,8 @@ namespace cv
return impl->double_support == 1;
case CL_UNIFIED_MEM:
return impl->unified_memory == 1;
case CL_VER_1_2:
return impl->clVersion.find("OpenCL 1.2") != string::npos;
default:
return false;
}