summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2010-06-09 14:15:04 -0700
committerKenneth Graunke <kenneth@whitecape.org>2010-06-09 14:15:04 -0700
commit3ffedf12496d17d0bcfab847293053222e996ff8 (patch)
tree46c9f39b939dc40c57b12a2c549da9207148117f
parentc476ba8fe26c499d4cdbc686e45ffe548fe65cd8 (diff)
Fix some typing issues in asin.
CorrectFunction.vert now passes.
-rw-r--r--builtin_function.cpp14
-rw-r--r--builtins/110/asin14
2 files changed, 14 insertions, 14 deletions
diff --git a/builtin_function.cpp b/builtin_function.cpp
index bc0409035a..c75805c782 100644
--- a/builtin_function.cpp
+++ b/builtin_function.cpp
@@ -131,12 +131,12 @@ static const char *builtins_110_asin = {
" (constant float (0.0742610))\n"
" (expression float abs (var_ref x))))))))))\n"
"\n"
- " (signature float\n"
+ " (signature vec2\n"
" (parameters\n"
" (declare (in) vec2 x))\n"
" ((return (expression vec2 *\n"
- " (expression vec2 -\n"
- " (expression vec2 *\n"
+ " (expression float -\n"
+ " (expression float *\n"
" (constant float (3.1415926))\n"
" (constant float (0.5)))\n"
" (expression vec2 sqrt\n"
@@ -153,12 +153,12 @@ static const char *builtins_110_asin = {
" (constant float (0.0742610))\n"
" (expression vec2 abs (var_ref x))))))))))\n"
"\n"
- " (signature float\n"
+ " (signature vec3\n"
" (parameters\n"
" (declare (in) vec3 x))\n"
" ((return (expression vec3 *\n"
" (expression vec3 -\n"
- " (expression vec3 *\n"
+ " (expression float *\n"
" (constant float (3.1415926))\n"
" (constant float (0.5)))\n"
" (expression vec3 sqrt\n"
@@ -175,12 +175,12 @@ static const char *builtins_110_asin = {
" (constant float (0.0742610))\n"
" (expression vec3 abs (var_ref x))))))))))\n"
"\n"
- " (signature float\n"
+ " (signature vec4\n"
" (parameters\n"
" (declare (in) vec4 x))\n"
" ((return (expression vec4 *\n"
" (expression vec4 -\n"
- " (expression vec4 *\n"
+ " (expression float *\n"
" (constant float (3.1415926))\n"
" (constant float (0.5)))\n"
" (expression vec4 sqrt\n"
diff --git a/builtins/110/asin b/builtins/110/asin
index 5e1d16719f..fe93337bff 100644
--- a/builtins/110/asin
+++ b/builtins/110/asin
@@ -21,12 +21,12 @@
(constant float (0.0742610))
(expression float abs (var_ref x))))))))))
- (signature float
+ (signature vec2
(parameters
(declare (in) vec2 x))
((return (expression vec2 *
- (expression vec2 -
- (expression vec2 *
+ (expression float -
+ (expression float *
(constant float (3.1415926))
(constant float (0.5)))
(expression vec2 sqrt
@@ -43,12 +43,12 @@
(constant float (0.0742610))
(expression vec2 abs (var_ref x))))))))))
- (signature float
+ (signature vec3
(parameters
(declare (in) vec3 x))
((return (expression vec3 *
(expression vec3 -
- (expression vec3 *
+ (expression float *
(constant float (3.1415926))
(constant float (0.5)))
(expression vec3 sqrt
@@ -65,12 +65,12 @@
(constant float (0.0742610))
(expression vec3 abs (var_ref x))))))))))
- (signature float
+ (signature vec4
(parameters
(declare (in) vec4 x))
((return (expression vec4 *
(expression vec4 -
- (expression vec4 *
+ (expression float *
(constant float (3.1415926))
(constant float (0.5)))
(expression vec4 sqrt