Mesa (glsl2): glsl2: Fix the expression type for atan's pi * sign(y).

Eric Anholt anholt at kemper.freedesktop.org
Mon Jul 19 17:48:42 UTC 2010


Module: Mesa
Branch: glsl2
Commit: 82d4b9593bd541b20771cddc1365add21dea6ba9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=82d4b9593bd541b20771cddc1365add21dea6ba9

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jul 19 10:31:03 2010 -0700

glsl2: Fix the expression type for atan's pi * sign(y).

Fixes CorrectFunction.vert.

---

 src/glsl/builtin_function.cpp |    8 ++++----
 src/glsl/builtins/110/atan    |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/glsl/builtin_function.cpp b/src/glsl/builtin_function.cpp
index b3a2833..75e058c 100644
--- a/src/glsl/builtin_function.cpp
+++ b/src/glsl/builtin_function.cpp
@@ -292,7 +292,7 @@ static const char *builtins_110_atan = {
    "	   (expression float +\n"
    "	    (var_ref r)\n"
    "	    (expression float *\n"
-   "	     (expression int sign (var_ref y))\n"
+   "	     (expression float sign (var_ref y))\n"
    "	     (constant float (3.1415926))))))\n"
    "	 ()))\n"
    "       ())\n"
@@ -318,7 +318,7 @@ static const char *builtins_110_atan = {
    "	   (expression vec2 +\n"
    "	    (var_ref r)\n"
    "	    (expression vec2 *\n"
-   "	     (expression int sign (var_ref y))\n"
+   "	     (expression float sign (var_ref y))\n"
    "	     (constant float (3.1415926))))))\n"
    "	 ()))\n"
    "       ())\n"
@@ -344,7 +344,7 @@ static const char *builtins_110_atan = {
    "	   (expression vec3 +\n"
    "	    (var_ref r)\n"
    "	    (expression vec3 *\n"
-   "	     (expression int sign (var_ref y))\n"
+   "	     (expression float sign (var_ref y))\n"
    "	     (constant float (3.1415926))))))\n"
    "	 ()))\n"
    "       ())\n"
@@ -370,7 +370,7 @@ static const char *builtins_110_atan = {
    "	   (expression vec4 +\n"
    "	    (var_ref r)\n"
    "	    (expression vec4 *\n"
-   "	     (expression int sign (var_ref y))\n"
+   "	     (expression float sign (var_ref y))\n"
    "	     (constant float (3.1415926))))))\n"
    "	 ()))\n"
    "       ())\n"
diff --git a/src/glsl/builtins/110/atan b/src/glsl/builtins/110/atan
index e554235..bcf7571 100644
--- a/src/glsl/builtins/110/atan
+++ b/src/glsl/builtins/110/atan
@@ -67,7 +67,7 @@
 	   (expression float +
 	    (var_ref r)
 	    (expression float *
-	     (expression int sign (var_ref y))
+	     (expression float sign (var_ref y))
 	     (constant float (3.1415926))))))
 	 ()))
        ())
@@ -93,7 +93,7 @@
 	   (expression vec2 +
 	    (var_ref r)
 	    (expression vec2 *
-	     (expression int sign (var_ref y))
+	     (expression float sign (var_ref y))
 	     (constant float (3.1415926))))))
 	 ()))
        ())
@@ -119,7 +119,7 @@
 	   (expression vec3 +
 	    (var_ref r)
 	    (expression vec3 *
-	     (expression int sign (var_ref y))
+	     (expression float sign (var_ref y))
 	     (constant float (3.1415926))))))
 	 ()))
        ())
@@ -145,7 +145,7 @@
 	   (expression vec4 +
 	    (var_ref r)
 	    (expression vec4 *
-	     (expression int sign (var_ref y))
+	     (expression float sign (var_ref y))
 	     (constant float (3.1415926))))))
 	 ()))
        ())




More information about the mesa-commit mailing list