diff options
| author | Matthew Waters <matthew@centricular.com> | 2017-10-28 21:34:08 +1100 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2017-10-28 21:34:08 +1100 |
| commit | ad057283516826b1f25548bee4313d47ebb9f4c0 (patch) | |
| tree | d8e4217836cb4e69d3210ed08f0be776d0536950 /gst-libs | |
| parent | f8d751f7b5195dbfd4a76f69bc99d0abbd1a10c1 (diff) | |
gl/shader: allow setting non-square matrices as uniforms on gles platforms
It is possible with GLES3
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/gl/gstglshader.c | 2 | ||||
| -rw-r--r-- | gst-libs/gst/gl/gstglshader.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/gst-libs/gst/gl/gstglshader.c b/gst-libs/gst/gl/gstglshader.c index 9c470810a..9e5e1f780 100644 --- a/gst-libs/gst/gl/gstglshader.c +++ b/gst-libs/gst/gl/gstglshader.c @@ -1336,7 +1336,6 @@ gst_gl_shader_set_uniform_matrix_4fv (GstGLShader * shader, const gchar * name, gl->UniformMatrix4fv (location, count, transpose, value); } -#if GST_GL_HAVE_OPENGL /** * gst_gl_shader_set_uniform_matrix_2x3fv: * @shader: a #GstGLShader @@ -1504,7 +1503,6 @@ gst_gl_shader_set_uniform_matrix_4x3fv (GstGLShader * shader, gl->UniformMatrix4x3fv (location, count, transpose, value); } -#endif /* GST_GL_HAVE_OPENGL */ /** * gst_gl_shader_get_attribute_location: diff --git a/gst-libs/gst/gl/gstglshader.h b/gst-libs/gst/gl/gstglshader.h index 8bda1683c..0e4912373 100644 --- a/gst-libs/gst/gl/gstglshader.h +++ b/gst-libs/gst/gl/gstglshader.h @@ -135,7 +135,6 @@ GST_EXPORT void gst_gl_shader_set_uniform_matrix_3fv (GstGLShader *shader, const gchar *name, gint count, gboolean transpose, const gfloat* value); GST_EXPORT void gst_gl_shader_set_uniform_matrix_4fv (GstGLShader *shader, const gchar *name, gint count, gboolean transpose, const gfloat* value); -#if GST_GL_HAVE_OPENGL GST_EXPORT void gst_gl_shader_set_uniform_matrix_2x3fv (GstGLShader *shader, const gchar *name, gint count, gboolean transpose, const gfloat* value); GST_EXPORT @@ -148,7 +147,6 @@ GST_EXPORT void gst_gl_shader_set_uniform_matrix_4x2fv (GstGLShader *shader, const gchar *name, gint count, gboolean transpose, const gfloat* value); GST_EXPORT void gst_gl_shader_set_uniform_matrix_4x3fv (GstGLShader *shader, const gchar *name, gint count, gboolean transpose, const gfloat* value); -#endif GST_EXPORT gint gst_gl_shader_get_attribute_location (GstGLShader *shader, const gchar *name); |