summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Schmidt <jan@centricular.com>2016-08-16 00:40:53 +1000
committerJan Schmidt <jan@centricular.com>2016-08-16 00:53:38 +1000
commit117f81dc00a5e9fbfa24321b316d803dd2629cc1 (patch)
tree49dd30a2a4bca4bf0c09d3e246c7701cc193f2c2
parent08311c51bed71003faf7c06946a6aa930e69605c (diff)
qt: Use wglShareLists() workaround unconditionally.
Sometimes wglCreateContextAttribsARB() exists, but isn't functional (some Intel drivers), so it's easiest to do the workaround unconditionally.
-rw-r--r--ext/qt/gstqtglutility.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/qt/gstqtglutility.cc b/ext/qt/gstqtglutility.cc
index 84061202c..4d6d31864 100644
--- a/ext/qt/gstqtglutility.cc
+++ b/ext/qt/gstqtglutility.cc
@@ -174,7 +174,7 @@ gst_qt_get_gl_wrapcontext (GstGLDisplay * display,
#if GST_GL_HAVE_WINDOW_WIN32 && GST_GL_HAVE_PLATFORM_WGL && defined (HAVE_QT_WIN32)
g_return_val_if_fail (context != NULL, FALSE);
- if (!wglGetProcAddress ("wglCreateContextAttribsARB")) {
+ G_STMT_START {
GstGLWindow *window;
HDC device;
@@ -184,6 +184,10 @@ gst_qt_get_gl_wrapcontext (GstGLDisplay * display,
*
* The workaround here is to temporarily disable Qt's GL context while we
* set up our own.
+ *
+ * Sometimes wglCreateContextAttribsARB()
+ * exists, but isn't functional (some Intel drivers), so it's easiest to do this
+ * unconditionally.
*/
*context = gst_gl_context_new (display);
window = gst_gl_context_get_window (*context);
@@ -204,7 +208,7 @@ gst_qt_get_gl_wrapcontext (GstGLDisplay * display,
}
#endif
gst_gl_context_activate (*wrap_glcontext, FALSE);
- }
+ } G_STMT_END;
return TRUE;
}