Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

more guarding

Browse Source
pull/26281/head
kallaballa 2 months ago
parent 4cbb96b396
commit 3edcf410b6
1 changed files with 98 additions and 91 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 189
      modules/core/src/opengl.cpp

189
modules/core/src/opengl.cpp
Unescape View File

@ -1641,11 +1641,11 @@ 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 platformsCnt; cl_uint platformsCnt = 0;
cl_uint devCnt; cl_uint devCnt = 0;
cl_device_id* devices; cl_device_id* devices = nullptr;
cl_uint devUsed; cl_uint devUsed = 0;
cl_context context; cl_context context = nullptr;
cl_int status = clGetPlatformIDs(0, NULL, &platformsCnt); cl_int status = clGetPlatformIDs(0, NULL, &platformsCnt);
if (status != CL_SUCCESS) if (status != CL_SUCCESS)
@ -1667,102 +1667,109 @@ Context& initializeContextFromGL()
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));
devices = new cl_device_id[devCnt]; try {
devices = new cl_device_id[devCnt];
status = clGetDeviceIDs(platforms[i], CL_DEVICE_TYPE_GPU, devCnt, devices, NULL); status = clGetDeviceIDs(platforms[i], CL_DEVICE_TYPE_GPU, devCnt, devices, NULL);
if (status != CL_SUCCESS)
CV_Error_(cv::Error::OpenCLInitError, ("OpenCL: Can't get platform devices: %d", status));
for (unsigned int j = 0; (!sharingSupported && (j < devCnt)); ++j) {
size_t extensionSize;
status = clGetDeviceInfo(devices[j], CL_DEVICE_EXTENSIONS, 0, NULL, &extensionSize );
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: Can't get platform devices: %d", status));
if(extensionSize > 0) for (unsigned int j = 0; (!sharingSupported && (j < devCnt)); ++j) {
{ size_t extensionSize;
char* extensions = nullptr; status = clGetDeviceInfo(devices[j], CL_DEVICE_EXTENSIONS, 0, NULL, &extensionSize );
if (status != CL_SUCCESS)
try { CV_Error_(cv::Error::OpenCLInitError, ("OpenCL: No devices available: %d", status));
extensions = new char[extensionSize];
if(extensionSize > 0)
status = clGetDeviceInfo(devices[j], CL_DEVICE_EXTENSIONS, extensionSize, extensions, &extensionSize); {
if (status != CL_SUCCESS) char* extensions = nullptr;
continue;
} catch(std::exception& ex) { try {
CV_Error(cv::Error::OpenCLInitError, "OpenCL: Exception thrown during device extensions gathering"); extensions = new char[extensionSize];
}
status = clGetDeviceInfo(devices[j], CL_DEVICE_EXTENSIONS, extensionSize, extensions, &extensionSize);
if (status != CL_SUCCESS)
continue;
} catch(...) {
CV_Error(cv::Error::OpenCLInitError, "OpenCL: Exception thrown during device extensions gathering");
}
std::string devString; std::string devString;
if(extensions != nullptr) { if(extensions != nullptr) {
devString = extensions; devString = extensions;
delete[] extensions; delete[] extensions;
} }
else { else {
CV_Error(cv::Error::OpenCLInitError, "OpenCL: Unexpected error during device extensions gathering"); CV_Error(cv::Error::OpenCLInitError, "OpenCL: Unexpected error during device extensions gathering");
} }
size_t oldPos = 0; size_t oldPos = 0;
size_t spacePos = devString.find(' ', oldPos); // extensions string is space delimited size_t spacePos = devString.find(' ', oldPos); // extensions string is space delimited
while (spacePos != devString.npos) { while (spacePos != devString.npos) {
if (strcmp(GL_SHARING_EXTENSION, if (strcmp(GL_SHARING_EXTENSION,
devString.substr(oldPos, spacePos - oldPos).c_str()) devString.substr(oldPos, spacePos - oldPos).c_str())
== 0) { == 0) {
// Device supports context sharing with OpenGL // Device supports context sharing with OpenGL
devUsed = i; devUsed = i;
sharingSupported = true; sharingSupported = true;
break; break;
}
do {
oldPos = spacePos + 1;
spacePos = devString.find(' ', oldPos);
} while (spacePos == oldPos);
} }
do {
oldPos = spacePos + 1;
spacePos = devString.find(' ', oldPos);
} while (spacePos == oldPos);
} }
} }
} } catch(...) {
CV_Error(cv::Error::OpenCLInitError, "OpenCL: Exception thrown during device information gathering");
if (!sharingSupported) if(devices != nullptr) {
delete[] devices;
}
continue; continue;
}
// Define OS-specific context properties and create the OpenCL context if (sharingSupported) {
#if defined (__APPLE__) // Define OS-specific context properties and create the OpenCL context
CGLContextObj cglContext = CGLGetCurrentContext(); #if defined (__APPLE__)
CGLShareGroupObj cglShareGroup = CGLGetShareGroup(cglContext); CGLContextObj cglContext = CGLGetCurrentContext();
cl_context_properties props[] = CGLShareGroupObj cglShareGroup = CGLGetShareGroup(cglContext);
{ cl_context_properties props[] =
CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE, (cl_context_properties)cglShareGroup, {
0 CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE, (cl_context_properties)cglShareGroup,
}; 0
context = clCreateContext(props, 0,0, NULL, NULL, &ciErrNum); };
#elif defined(__ANDROID__) context = clCreateContext(props, 0,0, NULL, NULL, &ciErrNum);
cl_context_properties props[] = #elif defined(__ANDROID__)
{ cl_context_properties props[] =
CL_GL_CONTEXT_KHR, (cl_context_properties)glXGetCurrentContext(), {
CL_GLX_DISPLAY_KHR, (cl_context_properties)glXGetCurrentDisplay(), CL_GL_CONTEXT_KHR, (cl_context_properties)glXGetCurrentContext(),
CL_CONTEXT_PLATFORM, (cl_context_properties)platforms[i], CL_GLX_DISPLAY_KHR, (cl_context_properties)glXGetCurrentDisplay(),
0 CL_CONTEXT_PLATFORM, (cl_context_properties)platforms[i],
}; 0
context = clCreateContext(props, 1, &devices[devUsed], NULL, NULL, &status); };
#elif defined(_WIN32) context = clCreateContext(props, 1, &devices[devUsed], NULL, NULL, &status);
cl_context_properties props[] = #elif defined(_WIN32)
{ cl_context_properties props[] =
CL_GL_CONTEXT_KHR, (cl_context_properties)wglGetCurrentContext(), {
CL_WGL_HDC_KHR, (cl_context_properties)wglGetCurrentDC(), CL_GL_CONTEXT_KHR, (cl_context_properties)wglGetCurrentContext(),
CL_CONTEXT_PLATFORM, (cl_context_properties)platforms[i], CL_WGL_HDC_KHR, (cl_context_properties)wglGetCurrentDC(),
0 CL_CONTEXT_PLATFORM, (cl_context_properties)platforms[i],
}; 0
context = clCreateContext(props, 1, &devices[devUsed], NULL, NULL, &status); };
#elif defined(__linux__) context = clCreateContext(props, 1, &devices[devUsed], NULL, NULL, &status);
cl_context_properties props[] = #elif defined(__linux__)
{ cl_context_properties props[] =
CL_GL_CONTEXT_KHR, (cl_context_properties)glXGetCurrentContext(), {
CL_GLX_DISPLAY_KHR, (cl_context_properties)glXGetCurrentDisplay(), CL_GL_CONTEXT_KHR, (cl_context_properties)glXGetCurrentContext(),
CL_CONTEXT_PLATFORM, (cl_context_properties)platforms[i], CL_GLX_DISPLAY_KHR, (cl_context_properties)glXGetCurrentDisplay(),
0 CL_CONTEXT_PLATFORM, (cl_context_properties)platforms[i],
}; 0
context = clCreateContext(props, 1, &devices[devUsed], NULL, NULL, &status); };
#endif context = clCreateContext(props, 1, &devices[devUsed], NULL, NULL, &status);
#endif
}
if (status != CL_SUCCESS) if (status != CL_SUCCESS)
CV_Error_(cv::Error::OpenCLInitError, ("OpenCL: Can't create context for OpenGL interop: %d", status)); CV_Error_(cv::Error::OpenCLInitError, ("OpenCL: Can't create context for OpenGL interop: %d", status));

Write Preview
Loading…
Cancel
Save