From 0ee57b37cd46561dda84bcaa54476d0b1438f2e6 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Thu, 3 Jul 2008 12:29:03 +0000 Subject: [PATCH] * clutter/clutter-shader.c (bind_glsl_shader): Fix a cut-and-paste error which broke vertex shaders --- ChangeLog | 5 +++++ clutter/clutter-shader.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6f6a25a9..acd6e43b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-07-03 Neil Roberts + + * clutter/clutter-shader.c (bind_glsl_shader): Fix a cut-and-paste + error which broke vertex shaders + 2008-07-03 Øyvind Kolås * clutter/cogl/common/cogl-bitmap-pixbuf.c: diff --git a/clutter/clutter-shader.c b/clutter/clutter-shader.c index 7d1a8ab20..7ffefb3d6 100644 --- a/clutter/clutter-shader.c +++ b/clutter/clutter-shader.c @@ -414,14 +414,14 @@ bind_glsl_shader (ClutterShader *self, cogl_shader_source (priv->vertex_shader, priv->vertex_source); cogl_shader_compile (priv->vertex_shader); - cogl_shader_get_parameteriv (priv->fragment_shader, + cogl_shader_get_parameteriv (priv->vertex_shader, CGL_OBJECT_COMPILE_STATUS, &compiled); if (compiled != CGL_TRUE) { 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, CLUTTER_SHADER_ERROR_COMPILE,