From: Eric Anholt <eric@anholt.net>
Date: Mon, 2 Aug 2010 19:28:38 +0000 (-0700)
Subject: glsl2: Fix expression type in builtin tan().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eb7e120f0f342541716882c211eca115c2cd0d21;p=mesa.git

glsl2: Fix expression type in builtin tan().

Fixes glsl-fs-tan-1.
---

diff --git a/src/glsl/builtin_function.cpp b/src/glsl/builtin_function.cpp
index eade72ad3a5..a8acff47315 100644
--- a/src/glsl/builtin_function.cpp
+++ b/src/glsl/builtin_function.cpp
@@ -2097,17 +2097,17 @@ static const char *builtins_110_tan = {
    "   (signature vec2\n"
    "     (parameters\n"
    "       (declare (in) vec2 angle))\n"
-   "     ((return (expression float / (expression float sin (var_ref angle)) (expression vec2 cos (var_ref angle))))))\n"
+   "     ((return (expression vec2 / (expression vec2 sin (var_ref angle)) (expression vec2 cos (var_ref angle))))))\n"
    "\n"
    "   (signature vec3\n"
    "     (parameters\n"
    "       (declare (in) vec3 angle))\n"
-   "     ((return (expression float / (expression float sin (var_ref angle)) (expression vec3 cos (var_ref angle))))))\n"
+   "     ((return (expression vec3 / (expression vec3 sin (var_ref angle)) (expression vec3 cos (var_ref angle))))))\n"
    "\n"
    "   (signature vec4\n"
    "     (parameters\n"
    "       (declare (in) vec4 angle))\n"
-   "     ((return (expression float / (expression float sin (var_ref angle)) (expression vec4 cos (var_ref angle))))))\n"
+   "     ((return (expression vec4 / (expression vec4 sin (var_ref angle)) (expression vec4 cos (var_ref angle))))))\n"
    "))\n"
 };
 
diff --git a/src/glsl/builtins/110/tan b/src/glsl/builtins/110/tan
index 3e04892a76c..99798631859 100644
--- a/src/glsl/builtins/110/tan
+++ b/src/glsl/builtins/110/tan
@@ -7,15 +7,15 @@
    (signature vec2
      (parameters
        (declare (in) vec2 angle))
-     ((return (expression float / (expression float sin (var_ref angle)) (expression vec2 cos (var_ref angle))))))
+     ((return (expression vec2 / (expression vec2 sin (var_ref angle)) (expression vec2 cos (var_ref angle))))))
 
    (signature vec3
      (parameters
        (declare (in) vec3 angle))
-     ((return (expression float / (expression float sin (var_ref angle)) (expression vec3 cos (var_ref angle))))))
+     ((return (expression vec3 / (expression vec3 sin (var_ref angle)) (expression vec3 cos (var_ref angle))))))
 
    (signature vec4
      (parameters
        (declare (in) vec4 angle))
-     ((return (expression float / (expression float sin (var_ref angle)) (expression vec4 cos (var_ref angle))))))
+     ((return (expression vec4 / (expression vec4 sin (var_ref angle)) (expression vec4 cos (var_ref angle))))))
 ))