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

Fixes CorrectFunction.vert.

diff --git a/src/glsl/builtin_function.cpp b/src/glsl/builtin_function.cpp
index b3a283306df205b3af4175b973e8567e173bb201..75e058c41c83a3dd9fc97e5e9e24f0f198f0de19 100644 (file)
--- 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 e5542350b51645f1b12264aa8865457bff4b20fb..bcf75718e45ba5d864a2abd7e4fe5a8da0995330 100644 (file)
--- 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))))))
         ()))
        ())