summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-08-02 12:28:38 -0700
committerEric Anholt <eric@anholt.net>2010-08-02 12:33:18 -0700
commiteb7e120f0f342541716882c211eca115c2cd0d21 (patch)
tree98800482399129f35feddeb84d06c71f9945796f /src
parentee7666b5ac2fc7de64baf60835271e15baf89474 (diff)
glsl2: Fix expression type in builtin tan().
Fixes glsl-fs-tan-1.
Diffstat (limited to 'src')
-rw-r--r--src/glsl/builtin_function.cpp6
-rw-r--r--src/glsl/builtins/110/tan6
2 files changed, 6 insertions, 6 deletions
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))))))
))