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

gl/display: clean up pre gstglcontext api and struct fields

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=729551
This commit is contained in:
Matthew Waters 2014-05-06 16:39:06 +10:00
parent c28dd9b0d3
commit f19e5abcb8
4 changed files with 7 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gst-libs/gst/gl/gstglcontext.c
View file

@ -65,12 +65,6 @@
#include "eagl/gstglcontext_eagl.h" #include "eagl/gstglcontext_eagl.h"
#endif #endif
#define USING_OPENGL(display) (display->gl_api & GST_GL_API_OPENGL)
#define USING_OPENGL3(display) (display->gl_api & GST_GL_API_OPENGL3)
#define USING_GLES(display) (display->gl_api & GST_GL_API_GLES)
#define USING_GLES2(display) (display->gl_api & GST_GL_API_GLES2)
#define USING_GLES3(display) (display->gl_api & GST_GL_API_GLES3)
static GModule *module_self; static GModule *module_self;
#if GST_GL_HAVE_OPENGL #if GST_GL_HAVE_OPENGL
@ -726,10 +720,9 @@ gst_gl_context_create_thread (GstGLContext * context)
{ {
GstGLContextClass *context_class; GstGLContextClass *context_class;
GstGLWindowClass *window_class; GstGLWindowClass *window_class;
GstGLDisplay *display;
GstGLFuncs *gl; GstGLFuncs *gl;
gboolean ret = FALSE; gboolean ret = FALSE;
GstGLAPI compiled_api, user_api; GstGLAPI compiled_api, user_api, gl_api;
gchar *api_string; gchar *api_string;
gchar *compiled_api_s; gchar *compiled_api_s;
gchar *user_api_string; gchar *user_api_string;
@ -752,7 +745,6 @@ gst_gl_context_create_thread (GstGLContext * context)
goto failure; goto failure;
} }
display = context->priv->display;
gl = context->gl_vtable; gl = context->gl_vtable;
compiled_api = _compiled_api (); compiled_api = _compiled_api ();
@ -801,14 +793,13 @@ gst_gl_context_create_thread (GstGLContext * context)
goto failure; goto failure;
} }
display->gl_api = gst_gl_context_get_gl_api (context); gl_api = gst_gl_context_get_gl_api (context);
g_assert (display->gl_api != GST_GL_API_NONE g_assert (gl_api != GST_GL_API_NONE && gl_api != GST_GL_API_ANY);
&& display->gl_api != GST_GL_API_ANY);
api_string = gst_gl_api_to_string (display->gl_api); api_string = gst_gl_api_to_string (gl_api);
GST_INFO ("available GL APIs: %s", api_string); GST_INFO ("available GL APIs: %s", api_string);
if (((compiled_api & display->gl_api) & user_api) == GST_GL_API_NONE) { if (((compiled_api & gl_api) & user_api) == GST_GL_API_NONE) {
g_set_error (error, GST_GL_CONTEXT_ERROR, GST_GL_CONTEXT_ERROR_WRONG_API, g_set_error (error, GST_GL_CONTEXT_ERROR, GST_GL_CONTEXT_ERROR_WRONG_API,
"failed to create context, context " "failed to create context, context "
"could not provide correct api. user (%s), compiled (%s), context (%s)", "could not provide correct api. user (%s), compiled (%s), context (%s)",
@ -835,10 +826,10 @@ gst_gl_context_create_thread (GstGLContext * context)
} }
/* gl api specific code */ /* gl api specific code */
if (!ret && USING_OPENGL (display)) if (!ret && gl_api & GST_GL_API_OPENGL)
ret = _create_context_opengl (context, &context->priv->gl_major, ret = _create_context_opengl (context, &context->priv->gl_major,
&context->priv->gl_minor, error); &context->priv->gl_minor, error);
if (!ret && USING_GLES2 (display)) if (!ret && gl_api & GST_GL_API_GLES2)
ret = ret =
_create_context_gles2 (context, &context->priv->gl_major, _create_context_gles2 (context, &context->priv->gl_major,
&context->priv->gl_minor, error); &context->priv->gl_minor, error);

8
gst-libs/gst/gl/gstgldisplay.c
View file

@ -149,14 +149,6 @@ gst_gl_display_new (void)
return display; return display;
} }
GstGLAPI
gst_gl_display_get_gl_api (GstGLDisplay * display)
{
g_return_val_if_fail (GST_IS_GL_DISPLAY (display), GST_GL_API_NONE);
return display->gl_api;
}
guintptr guintptr
gst_gl_display_get_handle (GstGLDisplay * display) gst_gl_display_get_handle (GstGLDisplay * display)
{ {

4
gst-libs/gst/gl/gstgldisplay.h
View file

@ -66,9 +66,6 @@ struct _GstGLDisplay
GstGLDisplayType type; GstGLDisplayType type;
GstGLContext *context;
GstGLAPI gl_api;
GstGLDisplayPrivate *priv; GstGLDisplayPrivate *priv;
}; };
@ -84,7 +81,6 @@ GstGLDisplay *gst_gl_display_new (void);
#define gst_gl_display_lock(display) GST_OBJECT_LOCK (display) #define gst_gl_display_lock(display) GST_OBJECT_LOCK (display)
#define gst_gl_display_unlock(display) GST_OBJECT_UNLOCK (display) #define gst_gl_display_unlock(display) GST_OBJECT_UNLOCK (display)
GstGLAPI gst_gl_display_get_gl_api (GstGLDisplay * display);
guintptr gst_gl_display_get_handle (GstGLDisplay * display); guintptr gst_gl_display_get_handle (GstGLDisplay * display);
GstGLDisplayType gst_gl_display_get_handle_type (GstGLDisplay * display); GstGLDisplayType gst_gl_display_get_handle_type (GstGLDisplay * display);

1
tests/check/Makefile.am
View file

@ -223,7 +223,6 @@ check_PROGRAMS = \
elements/audiomixer \ elements/audiomixer \
elements/asfmux \ elements/asfmux \
elements/baseaudiovisualizer \ elements/baseaudiovisualizer \
elements/camerabin \
elements/dataurisrc \ elements/dataurisrc \
elements/gdppay \ elements/gdppay \
elements/gdpdepay \ elements/gdpdepay \