Fix some typing issues in asin.

CorrectFunction.vert now passes.

diff --git a/builtin_function.cpp b/builtin_function.cpp
index bc0409035a0d4820a9fee9516fdb7af4967fbbc0..c75805c782a1296eab4c36a156ba1868f3147ca1 100644 (file)
--- 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 5e1d16719fc266cd430dde1f392093b088614e02..fe93337bffc7856b78319836b1bfff8254dab5a6 100644 (file)
--- 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