mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-18 16:11:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

renaming

Browse Source
This commit is contained in:
kallaballa 2024-10-10 14:48:49 +02:00
parent 63b5dee274
commit 50f6d54f87
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/core/src/opengl.cpp
View File

@ -1641,20 +1641,20 @@ Context& initializeContextFromGL()
#elif !defined(HAVE_OPENCL_OPENGL_SHARING) #elif !defined(HAVE_OPENCL_OPENGL_SHARING)
NO_OPENCL_SHARING_ERROR; NO_OPENCL_SHARING_ERROR;
#else #else
cl_uint numPlatforms; cl_uint platformsCnt;
cl_uint devCnt; cl_uint devCnt;
cl_device_id* devices; cl_device_id* devices;
cl_uint devUsed; cl_uint devUsed;
cl_context context; cl_context context;
cl_int status = clGetPlatformIDs(0, NULL, &numPlatforms); cl_int status = clGetPlatformIDs(0, NULL, &platformsCnt);
if (status != CL_SUCCESS) if (status != CL_SUCCESS)
CV_Error_(cv::Error::OpenCLInitError, ("OpenCL: Can't get number of platforms: %d", status)); CV_Error_(cv::Error::OpenCLInitError, ("OpenCL: Can't get number of platforms: %d", status));
if (numPlatforms == 0) if (platformsCnt == 0)
CV_Error(cv::Error::OpenCLInitError, "OpenCL: No available platforms"); CV_Error(cv::Error::OpenCLInitError, "OpenCL: No available platforms");
std::vector<cl_platform_id> platforms(numPlatforms); std::vector<cl_platform_id> platforms(platformsCnt);
status = clGetPlatformIDs(numPlatforms, &platforms[0], NULL); status = clGetPlatformIDs(platformsCnt, &platforms[0], NULL);
if (status != CL_SUCCESS) if (status != CL_SUCCESS)
CV_Error_(cv::Error::OpenCLInitError, ("OpenCL: Can't get platforms: %d", status)); CV_Error_(cv::Error::OpenCLInitError, ("OpenCL: Can't get platforms: %d", status));
@ -1662,7 +1662,7 @@ Context& initializeContextFromGL()
// TODO Filter platforms by name from OPENCV_OPENCL_DEVICE // TODO Filter platforms by name from OPENCV_OPENCL_DEVICE
bool sharingSupported = false; bool sharingSupported = false;
for (unsigned int i = 0; (!sharingSupported && (i < numPlatforms)); ++i) { for (unsigned int i = 0; (!sharingSupported && (i < platformsCnt)); ++i) {
status = clGetDeviceIDs(platforms[i], CL_DEVICE_TYPE_GPU, 0, NULL, &devCnt); status = clGetDeviceIDs(platforms[i], CL_DEVICE_TYPE_GPU, 0, NULL, &devCnt);
if (status != CL_SUCCESS) if (status != CL_SUCCESS)
CV_Error_(cv::Error::OpenCLInitError, ("OpenCL: No devices available: %d", status)); CV_Error_(cv::Error::OpenCLInitError, ("OpenCL: No devices available: %d", status));