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

diff --git a/gst-libs/gst/gl/gstglshader.c b/gst-libs/gst/gl/gstglshader.c
index 4656afdf2d5f4ff6362651fa852309af70166cdd..8a77c8d123f5880f4a71987dee138ffd0969c07c 100644 (file)
--- a/gst-libs/gst/gl/gstglshader.c
+++ b/gst-libs/gst/gl/gstglshader.c
@@ -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,

diff --git a/gst-libs/gst/gl/gstglshader.h b/gst-libs/gst/gl/gstglshader.h
index e184b6b2e28603d70b0e6cfa142d1e5953898b6c..993cb2bd7223ee4dfc8d022c0ea2621726883313 100644 (file)
--- a/gst-libs/gst/gl/gstglshader.h
+++ b/gst-libs/gst/gl/gstglshader.h
@@ -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);