From e58d0d7f34d4def756dd9654b1acf563dfcc3e87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= <pippin@openedhand.com>
Date: Mon, 21 Jan 2008 11:27:53 +0000
Subject: [PATCH] * tests/test-shader.c: fix incompatible types in shader
 programs Apparently floats can't be multiplied or divided with ints without
 explicit type casts. Use 2.0 or float(var) where appropriate. Patch from
 Tommi Komulainen (#715).

---
 ChangeLog           |  8 ++++++++
 tests/test-shader.c | 10 +++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d413d71b3..692d3bfe2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-21  Øyvind Kolås  <pippin@gimp.org>
+
+	* tests/test-shader.c: fix incompatible types in shader programs
+
+	Apparently floats can't be multiplied or divided with ints without
+	explicit type casts. Use 2.0 or float(var) where appropriate. Patch
+	from Tommi Komulainen (#715).
+
 2008-01-19  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/clutter-main.c (generate_enter_leave_events): Do not
diff --git a/tests/test-shader.c b/tests/test-shader.c
index 89b0af7e3..6a09d9396 100644
--- a/tests/test-shader.c
+++ b/tests/test-shader.c
@@ -44,11 +44,11 @@ static ShaderSource shaders[]=
         "    for (u=-radius;u<radius;u++)"
         "      for (v=-radius;v<radius;v++)"
         "        {"
-        "          color += texture2DRect(rectTexture, vec2(gl_TexCoord[0].s + u * 2, gl_TexCoord[0].t +v * 2));"
+        "          color += texture2DRect(rectTexture, vec2(gl_TexCoord[0].s + u * 2.0, gl_TexCoord[0].t +v * 2.0));"
         "          count ++;"
         "        }"
         ""
-        "    gl_FragColor = color / count;"
+        "    gl_FragColor = color / float(count);"
         "}"
     },
     {"brightness-contrast.asm",
@@ -103,7 +103,7 @@ static ShaderSource shaders[]=
       "void main ()"
       "{"
       "  vec4 color = texture2DRect (tex, vec2(gl_TexCoord[0].st));"
-      "  float avg = (color.r + color.g + color.b) / 3;"
+      "  float avg = (color.r + color.g + color.b) / 3.0;"
       "  color.r = avg;"
       "  color.g = avg;"
       "  color.b = avg;"
@@ -116,11 +116,11 @@ static ShaderSource shaders[]=
       "{"
       "  vec4 color = texture2DRect (tex, vec2(gl_TexCoord[0].st));"
       "  vec4 colorB = texture2DRect (tex, vec2(gl_TexCoord[0].ts));"
-      "  float avg = (color.r + color.g + color.b) / 3;"
+      "  float avg = (color.r + color.g + color.b) / 3.0;"
       "  color.r = avg;"
       "  color.g = avg;"
       "  color.b = avg;"
-      "  color = (color + colorB)/2;"
+      "  color = (color + colorB)/2.0;"
       "  gl_FragColor = color;"
       "}",
     },