summaryrefslogtreecommitdiff
path: root/src/glsl
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-08-31 19:13:09 -0600
committerBrian Paul <brianp@vmware.com>2010-08-31 19:15:07 -0600
commit16c733495d74d8c2443aa915a55df97c02b415c7 (patch)
tree4917991d2a6398cffe82d232c13c085f0bec9650 /src/glsl
parent9b075cb9fa9eb6a95d0816283ef01ae72dafa680 (diff)
glsl2: fix bug in atan(y, x) function
When x==0, the result was wrong. Fixes piglit glsl-fs-atan-1.shader_test
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/builtin_function.cpp12
-rw-r--r--src/glsl/builtins/ir/atan10
2 files changed, 9 insertions, 13 deletions
diff --git a/src/glsl/builtin_function.cpp b/src/glsl/builtin_function.cpp
index d3484cbcd3..e6feb55759 100644
--- a/src/glsl/builtin_function.cpp
+++ b/src/glsl/builtin_function.cpp
@@ -324,6 +324,8 @@ static const char *builtin_atan =
") \n"
" (assign (constant bool (1)) (var_ref r) (var_ref atan_retval) ) \n"
" (if (expression bool < (var_ref x) (constant float (0.000000)) ) (\n"
+ "\n"
+ "\n"
" (if (expression bool >= (var_ref y) (constant float (0.000000)) ) (\n"
" (declare ( ) float assignment_tmp)\n"
" (assign (constant bool (1)) (var_ref assignment_tmp) (expression float + (var_ref r) (constant float (3.141593)) ) ) \n"
@@ -341,12 +343,10 @@ static const char *builtin_atan =
"\n"
" )\n"
" (\n"
- " (if (expression bool >= (var_ref y) (constant float (0.000000)) ) (\n"
- " (assign (constant bool (1)) (var_ref r) (constant float (1.570796)) ) \n"
- " )\n"
- " (\n"
- " (assign (constant bool (1)) (var_ref r) (constant float (-1.570796)) ) \n"
- " ))\n"
+ "\n"
+ " (declare () float sgn)\n"
+ " (assign (constant bool (1)) (var_ref sgn) (expression float sign (var_ref y)))\n"
+ " (assign (constant bool (1)) (var_ref r) (expression float * (var_ref sgn) (constant float (1.5707965))))\n"
"\n"
" ))\n"
"\n"
diff --git a/src/glsl/builtins/ir/atan b/src/glsl/builtins/ir/atan
index 8404829387..04e1898f9f 100644
--- a/src/glsl/builtins/ir/atan
+++ b/src/glsl/builtins/ir/atan
@@ -80,13 +80,9 @@
)
(
- (if (expression bool >= (var_ref y) (constant float (0.000000)) ) (
- (assign (constant bool (1)) (var_ref r) (constant float (1.570796)) )
- )
- (
- (assign (constant bool (1)) (var_ref r) (constant float (-1.570796)) )
- ))
-
+ (declare () float sgn)
+ (assign (constant bool (1)) (var_ref sgn) (expression float sign (var_ref y)))
+ (assign (constant bool (1)) (var_ref r) (expression float * (var_ref sgn) (constant float (1.5707965))))
))
(return (var_ref r) )