mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl/glx: use the context's display rather than asking for the window's

Browse source
This commit is contained in:
Matthew Waters 2014-04-02 22:53:10 +11:00 committed by Tim-Philipp Müller
parent b70069bc61
commit ff52514714
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst-libs/gst/gl/x11/gstglcontext_glx.c
View file

@ -142,6 +142,7 @@ gst_gl_context_glx_create_context (GstGLContext * context,
GstGLContextGLX *context_glx; GstGLContextGLX *context_glx;
GstGLWindow *window; GstGLWindow *window;
GstGLWindowX11 *window_x11; GstGLWindowX11 *window_x11;
GstGLDisplay *display;
gboolean create_context; gboolean create_context;
const char *glx_exts; const char *glx_exts;
int x_error; int x_error;
@ -151,6 +152,7 @@ gst_gl_context_glx_create_context (GstGLContext * context,
context_glx = GST_GL_CONTEXT_GLX (context); context_glx = GST_GL_CONTEXT_GLX (context);
window = gst_gl_context_get_window (context); window = gst_gl_context_get_window (context);
window_x11 = GST_GL_WINDOW_X11 (window); window_x11 = GST_GL_WINDOW_X11 (window);
display = gst_gl_context_get_display (context);
if (other_context) { if (other_context) {
if (gst_gl_context_get_gl_platform (other_context) != GST_GL_PLATFORM_GLX) { if (gst_gl_context_get_gl_platform (other_context) != GST_GL_PLATFORM_GLX) {
@ -163,7 +165,7 @@ gst_gl_context_glx_create_context (GstGLContext * context,
external_gl_context = gst_gl_context_get_gl_context (other_context); external_gl_context = gst_gl_context_get_gl_context (other_context);
} }
device = (Display *) gst_gl_display_get_handle (window->display); device = (Display *) gst_gl_display_get_handle (display);
glx_exts = glXQueryExtensionsString (device, DefaultScreen (device)); glx_exts = glXQueryExtensionsString (device, DefaultScreen (device));
create_context = gst_gl_check_extension ("GLX_ARB_create_context", glx_exts); create_context = gst_gl_check_extension ("GLX_ARB_create_context", glx_exts);
@ -229,12 +231,14 @@ gst_gl_context_glx_create_context (GstGLContext * context,
GST_LOG ("gl context id: %ld", (gulong) context_glx->glx_context); GST_LOG ("gl context id: %ld", (gulong) context_glx->glx_context);
gst_object_unref (window); gst_object_unref (window);
gst_object_unref (display);
return TRUE; return TRUE;
failure: failure:
if (window) if (window)
gst_object_unref (window); gst_object_unref (window);
gst_object_unref (display);
return FALSE; return FALSE;
} }