mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 14:56:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

glshader: advertise the default vertex and fragment shaders on desktop GL

Browse source
This commit is contained in:
Matthew Waters 2014-10-30 12:43:09 +11:00 committed by Tim-Philipp Müller
parent e173ab2b9d
commit 366eaea6d2
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst-libs/gst/gl/gstglshader.c
View file

@ -26,7 +26,6 @@
#include "gl.h"
#include "gstglshader.h"
#if GST_GL_HAVE_GLES2
/* *INDENT-OFF* */
static const gchar *simple_vertex_shader_str_gles2 =
"attribute vec4 a_position; \n"
@ -39,7 +38,9 @@ static const gchar *simple_vertex_shader_str_gles2 =
"} \n";
static const gchar *simple_fragment_shader_str_gles2 =
"#ifdef GL_ES \n"
"precision mediump float; \n"
"#endif \n"
"varying vec2 v_texCoord; \n"
"uniform sampler2D tex; \n"
"void main() \n"
@ -47,7 +48,6 @@ static const gchar *simple_fragment_shader_str_gles2 =
" gl_FragColor = texture2D( tex, v_texCoord ); \n"
"} \n";
/* *INDENT-ON* */
#endif
#ifndef GL_COMPILE_STATUS
#define GL_COMPILE_STATUS 0x8B81
@ -634,7 +634,6 @@ gst_gl_shader_compile_all_with_attribs_and_check (GstGLShader * shader,
return TRUE;
}
#if GST_GL_HAVE_GLES2
gboolean
gst_gl_shader_compile_with_default_f_and_check (GstGLShader * shader,
const gchar * v_src, const gint n_attribs, const gchar * attrib_names[],
@ -671,7 +670,6 @@ gst_gl_shader_compile_with_default_vf_and_check (GstGLShader * shader,
return gst_gl_shader_compile_with_default_v_and_check (shader,
simple_fragment_shader_str_gles2, pos_loc, tex_loc);
}
#endif
void
gst_gl_shader_set_uniform_1f (GstGLShader * shader, const gchar * name,

2
gst-libs/gst/gl/gstglshader.h
View file

@ -79,11 +79,9 @@ gboolean gst_gl_shader_is_compiled (GstGLShader *shader);
gboolean gst_gl_shader_compile (GstGLShader *shader, GError **error);
gboolean gst_gl_shader_compile_and_check (GstGLShader *shader, const gchar *source, GstGLShaderSourceType type);
gboolean gst_gl_shader_compile_all_with_attribs_and_check (GstGLShader *shader, const gchar *v_src, const gchar *f_src, const gint n_attribs, const gchar *attrib_names[], GLint attrib_locs[]);
#if GST_GL_HAVE_GLES2
gboolean gst_gl_shader_compile_with_default_f_and_check (GstGLShader *shader, const gchar *v_src, const gint n_attribs, const gchar *attrib_names[], GLint attrib_locs[]);
gboolean gst_gl_shader_compile_with_default_v_and_check (GstGLShader *shader, const gchar *f_src, GLint *pos_loc, GLint *tex_loc);
gboolean gst_gl_shader_compile_with_default_vf_and_check (GstGLShader *shader, GLint *pos_loc, GLint *tex_loc);
#endif
void gst_gl_shader_release (GstGLShader *shader);
void gst_gl_shader_use (GstGLShader *shader);