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 eade72ad3a55dc353b75a7fa302400b3a2650831..a8acff47315c2d59c5f32650f87e91835a279608 100644 (file)
--- 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 3e04892a76cb86b80cc548e5d0b9b5f29cb058aa..99798631859449c28e2aeb6de061ce2220923e44 100644 (file)
--- 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))))))
 ))