mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-25 14:47:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #19408 from crackwitz:ogl-wndprop-vsync

Browse Source
This commit is contained in:
Alexander Alekhin 2021-02-03 09:56:57 +00:00
commit 3e34cec96b
4 changed files with 104 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/highgui/include/opencv2/highgui.hpp
View File

@ -202,7 +202,8 @@ enum WindowPropertyFlags {
WND_PROP_ASPECT_RATIO = 2, //!< window's aspect ration (can be set to WINDOW_FREERATIO or WINDOW_KEEPRATIO).
WND_PROP_OPENGL = 3, //!< opengl support.
WND_PROP_VISIBLE = 4, //!< checks whether the window exists and is visible
WND_PROP_TOPMOST = 5 //!< property to toggle normal window being topmost or not
WND_PROP_TOPMOST = 5, //!< property to toggle normal window being topmost or not
WND_PROP_VSYNC = 6 //!< enable or disable VSYNC (in OpenGL mode)
};
//! Mouse Events see cv::MouseCallback

3
modules/highgui/src/precomp.hpp
View File

@ -115,6 +115,9 @@ double cvGetPropTopmost_COCOA(const char* name);
void cvSetPropTopmost_W32(const char* name, const bool topmost);
void cvSetPropTopmost_COCOA(const char* name, const bool topmost);
double cvGetPropVsync_W32(const char* name);
void cvSetPropVsync_W32(const char* name, const bool enabled);
//for QT
#if defined (HAVE_QT)
CvRect cvGetWindowRect_QT(const char* name);

16
modules/highgui/src/window.cpp
View File

@ -92,6 +92,14 @@ CV_IMPL void cvSetWindowProperty(const char* name, int prop_id, double prop_valu
#endif
break;
case cv::WND_PROP_VSYNC:
#if defined (HAVE_WIN32UI)
cvSetPropVsync_W32(name, (prop_value != 0));
#else
// not implemented yet for other toolkits
#endif
break;
default:;
}
}
@ -182,6 +190,14 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
#endif
break;
case cv::WND_PROP_VSYNC:
#if defined (HAVE_WIN32UI)
return cvGetPropVsync_W32(name);
#else
return -1;
#endif
break;
default:
return -1;
}

83
modules/highgui/src/window_w32.cpp
View File

@ -596,6 +596,89 @@ void cvSetPropTopmost_W32(const char* name, const bool topmost)
}
}
double cvGetPropVsync_W32(const char* name)
{
#ifndef HAVE_OPENGL
CV_UNUSED(name);
CV_Error(Error::OpenGlNotSupported, "Library was built without OpenGL support");
#else
if (!name)
CV_Error(Error::StsNullPtr, "'name' argument must not be NULL");
CvWindow* window = icvFindWindowByName(name);
if (!window)
CV_Error_(Error::StsBadArg, ("there is no window named '%s'", name));
// https://www.khronos.org/opengl/wiki/Swap_Interval
// https://www.khronos.org/registry/OpenGL/extensions/EXT/WGL_EXT_extensions_string.txt
// https://www.khronos.org/registry/OpenGL/extensions/EXT/WGL_EXT_swap_control.txt
if (!wglMakeCurrent(window->dc, window->hGLRC))
CV_Error(Error::OpenGlApiCallError, "Can't Activate The GL Rendering Context");
typedef const char* (APIENTRY* PFNWGLGETEXTENSIONSSTRINGEXTPROC)(void);
PFNWGLGETEXTENSIONSSTRINGEXTPROC wglGetExtensionsString = NULL;
wglGetExtensionsString = (PFNWGLGETEXTENSIONSSTRINGEXTPROC)wglGetProcAddress("wglGetExtensionsStringEXT");
if (wglGetExtensionsString == NULL)
return -1; // wglGetProcAddress failed to get wglGetExtensionsStringEXT
const char* wgl_extensions = wglGetExtensionsString();
if (wgl_extensions == NULL)
return -1; // Can't get WGL extensions string
if (strstr(wgl_extensions, "WGL_EXT_swap_control") == NULL)
return -1; // WGL extensions don't contain WGL_EXT_swap_control
typedef int (APIENTRY* PFNWGLGETSWAPINTERVALPROC)(void);
PFNWGLGETSWAPINTERVALPROC wglGetSwapInterval = 0;
wglGetSwapInterval = (PFNWGLGETSWAPINTERVALPROC)wglGetProcAddress("wglGetSwapIntervalEXT");
if (wglGetSwapInterval == NULL)
return -1; // wglGetProcAddress failed to get wglGetSwapIntervalEXT
return wglGetSwapInterval();
#endif
}
void cvSetPropVsync_W32(const char* name, const bool enable_vsync)
{
#ifndef HAVE_OPENGL
CV_UNUSED(name);
CV_UNUSED(enable_vsync);
CV_Error(Error::OpenGlNotSupported, "Library was built without OpenGL support");
#else
if (!name)
CV_Error(Error::StsNullPtr, "'name' argument must not be NULL");
CvWindow* window = icvFindWindowByName(name);
if (!window)
CV_Error_(Error::StsBadArg, ("there is no window named '%s'", name));
if (!wglMakeCurrent(window->dc, window->hGLRC))
CV_Error(Error::OpenGlApiCallError, "Can't Activate The GL Rendering Context");
typedef const char* (APIENTRY* PFNWGLGETEXTENSIONSSTRINGEXTPROC)(void);
PFNWGLGETEXTENSIONSSTRINGEXTPROC wglGetExtensionsString = NULL;
wglGetExtensionsString = (PFNWGLGETEXTENSIONSSTRINGEXTPROC)wglGetProcAddress("wglGetExtensionsStringEXT");
if (wglGetExtensionsString == NULL)
CV_Error(Error::OpenGlApiCallError, "wglGetProcAddress failed to get wglGetExtensionsStringEXT");
const char* wgl_extensions = wglGetExtensionsString();
if (wgl_extensions == NULL)
CV_Error(Error::OpenGlApiCallError, "Can't get WGL extensions string");
if (strstr(wgl_extensions, "WGL_EXT_swap_control") == NULL)
CV_Error(Error::OpenGlApiCallError, "WGL extensions don't contain WGL_EXT_swap_control");
typedef BOOL(APIENTRY* PFNWGLSWAPINTERVALPROC)(int);
PFNWGLSWAPINTERVALPROC wglSwapInterval = 0;
wglSwapInterval = (PFNWGLSWAPINTERVALPROC)wglGetProcAddress("wglSwapIntervalEXT");
if (wglSwapInterval == NULL)
CV_Error(Error::OpenGlApiCallError, "wglGetProcAddress failed to get wglSwapIntervalEXT");
wglSwapInterval(enable_vsync);
#endif
}
void cv::setWindowTitle(const String& winname, const String& title)
{
CvWindow* window = icvFindWindowByName(winname.c_str());