FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

gstqmlgl: retrieve correct device bound to current GL context (+ minor code cleanup)

Browse Source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/1032>
This commit is contained in:
Dmitry Shusharin 2021-07-30 17:20:49 +07:00 committed by GStreamer Marge Bot
parent 38b26c2f3f
commit 83dbeac150
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ext/qt/gstqtglutility.cc
View File

@ -179,9 +179,9 @@ gboolean
gst_qt_get_gl_wrapcontext (GstGLDisplay * display, gst_qt_get_gl_wrapcontext (GstGLDisplay * display,
GstGLContext **wrap_glcontext, GstGLContext **context) GstGLContext **wrap_glcontext, GstGLContext **context)
{ {
GstGLPlatform platform = (GstGLPlatform) 0; GstGLPlatform G_GNUC_UNUSED platform = (GstGLPlatform) 0;
GstGLAPI gl_api; GstGLAPI G_GNUC_UNUSED gl_api;
guintptr gl_handle; guintptr G_GNUC_UNUSED gl_handle;
GError *error = NULL; GError *error = NULL;
g_return_val_if_fail (display != NULL && wrap_glcontext != NULL, FALSE); g_return_val_if_fail (display != NULL && wrap_glcontext != NULL, FALSE);
@ -247,10 +247,6 @@ gst_qt_get_gl_wrapcontext (GstGLDisplay * display,
return FALSE; return FALSE;
} }
(void) platform;
(void) gl_api;
(void) gl_handle;
gst_gl_context_activate(*wrap_glcontext, TRUE); gst_gl_context_activate(*wrap_glcontext, TRUE);
if (!gst_gl_context_fill_info (*wrap_glcontext, &error)) { if (!gst_gl_context_fill_info (*wrap_glcontext, &error)) {
GST_ERROR ("failed to retrieve qt context info: %s", error->message); GST_ERROR ("failed to retrieve qt context info: %s", error->message);
@ -263,9 +259,6 @@ gst_qt_get_gl_wrapcontext (GstGLDisplay * display,
g_return_val_if_fail (context != NULL, FALSE); g_return_val_if_fail (context != NULL, FALSE);
G_STMT_START { G_STMT_START {
GstGLWindow *window;
HDC device;
/* If there's no wglCreateContextAttribsARB() support, then we would fallback to /* If there's no wglCreateContextAttribsARB() support, then we would fallback to
* wglShareLists() which will fail with ERROR_BUSY (0xaa) if either of the GL * wglShareLists() which will fail with ERROR_BUSY (0xaa) if either of the GL
* contexts are current in any other thread. * contexts are current in any other thread.
@ -277,12 +270,14 @@ gst_qt_get_gl_wrapcontext (GstGLDisplay * display,
* exists, but isn't functional (some Intel drivers), so it's easiest to do this * exists, but isn't functional (some Intel drivers), so it's easiest to do this
* unconditionally. * unconditionally.
*/ */
*context = gst_gl_context_new (display);
window = gst_gl_context_get_window (*context); /* retrieve Qt's GL device context as current device context */
device = (HDC) gst_gl_window_get_display (window); HDC device = wglGetCurrentDC ();
wglMakeCurrent (device, 0); wglMakeCurrent (device, 0);
gst_object_unref (window);
*context = gst_gl_context_new (display);
if (!gst_gl_context_create (*context, *wrap_glcontext, &error)) { if (!gst_gl_context_create (*context, *wrap_glcontext, &error)) {
GST_ERROR ("failed to create shared GL context: %s", error->message); GST_ERROR ("failed to create shared GL context: %s", error->message);
gst_object_unref (*context); gst_object_unref (*context);