mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 04:31:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

[476/906] OpenGL ES 2.0: fix build and disable some examples

Browse source 
Fix bug #631019
This commit is contained in:
Antoni Silvestre 2011-11-18 17:26:35 +01:00 committed by Matthew Waters
parent cc70130c6f
commit b640cbc542
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/gl/gstglfilter.c
View file

@ -455,6 +455,7 @@ gst_gl_filter_render_to_target (GstGLFilter * filter,
GST_GL_DISPLAY_PROJECTION_ORTHO2D, data); GST_GL_DISPLAY_PROJECTION_ORTHO2D, data);
} }
#ifndef OPENGL_ES2
static void static void
_draw_with_shader_cb (gint width, gint height, guint texture, gpointer stuff) _draw_with_shader_cb (gint width, gint height, guint texture, gpointer stuff)
{ {
@ -506,3 +507,4 @@ gst_gl_filter_draw_texture (GstGLFilter * filter, GLuint texture)
glEnd (); glEnd ();
} }
#endif

10
gst-libs/gst/gl/gstglfilter.h
View file

@ -1,4 +1,4 @@
/* /*
* GStreamer * GStreamer
* Copyright (C) 2007 David Schleef <ds@schleef.org> * Copyright (C) 2007 David Schleef <ds@schleef.org>
* Copyright (C) 2008 Julien Isorce <julien.isorce@gmail.com> * Copyright (C) 2008 Julien Isorce <julien.isorce@gmail.com>
@ -41,7 +41,7 @@ typedef struct _GstGLFilter GstGLFilter;
typedef struct _GstGLFilterClass GstGLFilterClass; typedef struct _GstGLFilterClass GstGLFilterClass;
typedef gboolean (*GstGLFilterSetCaps) (GstGLFilter* filter, typedef gboolean (*GstGLFilterSetCaps) (GstGLFilter* filter,
GstCaps* incaps, GstCaps* outcaps); GstCaps* incaps, GstCaps* outcaps);
typedef gboolean (*GstGLFilterProcessFunc) (GstGLFilter *filter, typedef gboolean (*GstGLFilterProcessFunc) (GstGLFilter *filter,
GstGLBuffer *inbuf, GstGLBuffer *outbuf); GstGLBuffer *inbuf, GstGLBuffer *outbuf);
@ -75,7 +75,7 @@ struct _GstGLFilterClass
GstGLFilterSetCaps set_caps; GstGLFilterSetCaps set_caps;
GstGLFilterProcessFunc filter; GstGLFilterProcessFunc filter;
GstGLFilterOnInitFBO onInitFBO; GstGLFilterOnInitFBO onInitFBO;
GstGLFilterOnStart onStart; GstGLFilterOnStart onStart;
GstGLFilterOnStop onStop; GstGLFilterOnStop onStop;
GstGLFilterOnReset onReset; GstGLFilterOnReset onReset;
@ -89,14 +89,16 @@ GType gst_gl_filter_get_type(void);
void void
gst_gl_filter_render_to_target (GstGLFilter *filter, gst_gl_filter_render_to_target (GstGLFilter *filter,
GLuint input, GLuint target, GLuint input, GLuint target,
GLCB func, gpointer data); GLCB func, gpointer data);
#ifndef OPENGL_ES2
void void
gst_gl_filter_render_to_target_with_shader (GstGLFilter * filter, gst_gl_filter_render_to_target_with_shader (GstGLFilter * filter,
GLuint input, GLuint target, GstGLShader *shader); GLuint input, GLuint target, GstGLShader *shader);
void gst_gl_filter_draw_texture (GstGLFilter *filter, GLuint texture); void gst_gl_filter_draw_texture (GstGLFilter *filter, GLuint texture);
#endif
G_END_DECLS G_END_DECLS