summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-07-19 10:31:03 -0700
committerEric Anholt <eric@anholt.net>2010-07-19 10:47:12 -0700
commit82d4b9593bd541b20771cddc1365add21dea6ba9 (patch)
tree70687f46b37b3a6bf418116507de018cb93b27f0
parent95c08920ea3d040360e5cc51d8a852d21a0329ee (diff)
glsl2: Fix the expression type for atan's pi * sign(y).
Fixes CorrectFunction.vert.
-rw-r--r--src/glsl/builtin_function.cpp8
-rw-r--r--src/glsl/builtins/110/atan8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/glsl/builtin_function.cpp b/src/glsl/builtin_function.cpp
index b3a283306d..75e058c41c 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 e5542350b5..bcf75718e4 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))))))
()))
())