diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c index 198e766f26..7a0b161a3d 100644 --- a/gst-libs/gst/gl/gstgldisplay.c +++ b/gst-libs/gst/gl/gstgldisplay.c @@ -103,46 +103,6 @@ gst_gl_display_get_gl_api (GstGLDisplay * display) return gst_gl_context_get_gl_api (display->context); } -void -gst_gl_display_set_context (GstGLDisplay * display, GstGLContext * context) -{ - g_return_if_fail (GST_IS_GL_DISPLAY (display)); - g_return_if_fail (GST_GL_IS_CONTEXT (context)); - - gst_gl_display_lock (display); - - if (display->context) - gst_object_unref (display->context); - - display->context = gst_object_ref (context); - - gst_gl_display_unlock (display); -} - -GstGLContext * -gst_gl_display_get_context (GstGLDisplay * display) -{ - GstGLContext *context; - - g_return_val_if_fail (GST_IS_GL_DISPLAY (display), NULL); - - gst_gl_display_lock (display); - - context = display->context ? gst_object_ref (display->context) : NULL; - - gst_gl_display_unlock (display); - - return context; -} - -GstGLContext * -gst_gl_display_get_context_unlocked (GstGLDisplay * display) -{ - g_return_val_if_fail (GST_IS_GL_DISPLAY (display), NULL); - - return display->context ? gst_object_ref (display->context) : NULL; -} - void gst_context_set_gl_display (GstContext * context, GstGLDisplay * display) { diff --git a/gst-libs/gst/gl/gstgldisplay.h b/gst-libs/gst/gl/gstgldisplay.h index 46f2228105..9fb22f54f4 100644 --- a/gst-libs/gst/gl/gstgldisplay.h +++ b/gst-libs/gst/gl/gstgldisplay.h @@ -68,9 +68,6 @@ GstGLDisplay *gst_gl_display_new (void); GstGLAPI gst_gl_display_get_gl_api (GstGLDisplay * display); gpointer gst_gl_display_get_gl_vtable (GstGLDisplay * display); -void gst_gl_display_set_context (GstGLDisplay * display, GstGLContext * context); -GstGLContext * gst_gl_display_get_context (GstGLDisplay * display); -GstGLContext * gst_gl_display_get_context_unlocked (GstGLDisplay * display); #define GST_GL_DISPLAY_CONTEXT_TYPE "gst.gl.GLDisplay" void gst_context_set_gl_display (GstContext * context, GstGLDisplay * display); diff --git a/gst-libs/gst/gl/gstglmixer.c b/gst-libs/gst/gl/gstglmixer.c index 92678fbdc8..453f5a386d 100644 --- a/gst-libs/gst/gl/gstglmixer.c +++ b/gst-libs/gst/gl/gstglmixer.c @@ -965,7 +965,6 @@ gst_gl_mixer_activate (GstGLMixer * mix, gboolean activate) GST_INFO ("Creating GstGLDisplay"); mix->context = gst_gl_context_new (mix->display); - gst_gl_display_set_context (mix->display, mix->context); if (!gst_gl_context_create (mix->context, 0, &error)) { GST_ELEMENT_ERROR (mix, RESOURCE, NOT_FOUND, diff --git a/tests/check/libs/gstglcontext.c b/tests/check/libs/gstglcontext.c index bb2d2d2466..aa58c69b8c 100644 --- a/tests/check/libs/gstglcontext.c +++ b/tests/check/libs/gstglcontext.c @@ -233,7 +233,6 @@ GST_START_TEST (test_share) display = gst_gl_display_new (); context = gst_gl_context_new (display); - gst_gl_display_set_context (display, context); window = gst_gl_window_new (display); gst_gl_context_set_window (context, window); diff --git a/tests/check/libs/gstglmemory.c b/tests/check/libs/gstglmemory.c index 985129a90d..ae42ada5ce 100644 --- a/tests/check/libs/gstglmemory.c +++ b/tests/check/libs/gstglmemory.c @@ -38,7 +38,6 @@ setup (void) { display = gst_gl_display_new (); context = gst_gl_context_new (display); - gst_gl_display_set_context (display, context); gst_gl_context_create (context, 0, NULL); gst_gl_memory_init (); }