isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 11:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

* clutter/clutter-shader.c (bind_glsl_shader): Fix a cut-and-paste

Browse Source 
error which broke vertex shaders
This commit is contained in:
Neil Roberts 2008-07-03 12:29:03 +00:00
parent 60341ad959
commit 0ee57b37cd
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-07-03 Neil Roberts <neil@o-hand.com>
* clutter/clutter-shader.c (bind_glsl_shader): Fix a cut-and-paste
error which broke vertex shaders
2008-07-03 Øyvind Kolås <pippin@o-hand.com> 2008-07-03 Øyvind Kolås <pippin@o-hand.com>
* clutter/cogl/common/cogl-bitmap-pixbuf.c: * clutter/cogl/common/cogl-bitmap-pixbuf.c:

4
clutter/clutter-shader.c
View File

@ -414,14 +414,14 @@ bind_glsl_shader (ClutterShader *self,
cogl_shader_source (priv->vertex_shader, priv->vertex_source); cogl_shader_source (priv->vertex_shader, priv->vertex_source);
cogl_shader_compile (priv->vertex_shader); cogl_shader_compile (priv->vertex_shader);
cogl_shader_get_parameteriv (priv->fragment_shader, cogl_shader_get_parameteriv (priv->vertex_shader,
CGL_OBJECT_COMPILE_STATUS, CGL_OBJECT_COMPILE_STATUS,
&compiled); &compiled);
if (compiled != CGL_TRUE) if (compiled != CGL_TRUE)
{ {
gchar error_buf[512]; gchar error_buf[512];
cogl_shader_get_info_log (priv->fragment_shader, 512, error_buf); cogl_shader_get_info_log (priv->vertex_shader, 512, error_buf);
g_set_error (error, CLUTTER_SHADER_ERROR, g_set_error (error, CLUTTER_SHADER_ERROR,
CLUTTER_SHADER_ERROR_COMPILE, CLUTTER_SHADER_ERROR_COMPILE,