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

move the "cpu device checking" from supportsFeatures() to queryDeviceInfo()

Browse Source
This commit is contained in:
yao
2013-04-05 09:17:14 +08:00
parent d5aaea2749
commit 5022bc8c25
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -397,6 +397,15 @@ namespace cv
}
break;
case IS_CPU_DEVICE:
{
cl_device_type devicetype;
openCLSafeCall(clGetDeviceInfo(impl->devices[impl->devnum],
CL_DEVICE_TYPE, sizeof(cl_device_type),
&devicetype, NULL));
*(bool*)info = (devicetype == CVCL_DEVICE_TYPE_CPU);
}
break;
default:
CV_Error(-1, "Invalid device info type");
break;
@@ -979,12 +988,6 @@ namespace cv
return impl->double_support == 1;
case CL_UNIFIED_MEM:
return impl->unified_memory == 1;
case CL_CPU:
cl_device_type devicetype;
clGetDeviceInfo(impl->devices[impl->devnum],
CL_DEVICE_TYPE, sizeof(cl_device_type),
&devicetype, NULL);
return devicetype == CVCL_DEVICE_TYPE_CPU;
default:
return false;
}