glsl: Fix for scalar float built-in definitions.

These need abs, and we need more tests.

diff --git a/src/glsl/builtin_function.cpp b/src/glsl/builtin_function.cpp
index 11b96fdcbd8ca9e19f0ace7d37ca9d8874b5549b..0a2b0120f26e30bd648c5223bb2d704e6b6e729d 100644 (file)
--- a/src/glsl/builtin_function.cpp
+++ b/src/glsl/builtin_function.cpp
@@ -724,7 +724,7 @@ static const char *builtin_distance =
    "     (parameters\n"
    "       (declare (in) float p0)\n"
    "       (declare (in) float p1))\n"
-   "     ((return (expression float - (var_ref p0) (var_ref p1)))))\n"
+   "     ((return (expression float abs (expression float - (var_ref p0) (var_ref p1))))))\n"
    "\n"
    "   (signature float\n"
    "     (parameters\n"
@@ -1302,7 +1302,7 @@ static const char *builtin_length =
    "   (signature float\n"
    "     (parameters\n"
    "       (declare (in) float arg0))\n"
-   "     ((return (var_ref arg0))))\n"
+   "     ((return (expression float abs (var_ref arg0)))))\n"
    "\n"
    "   (signature float\n"
    "     (parameters\n"

diff --git a/src/glsl/builtins/ir/distance b/src/glsl/builtins/ir/distance
index f73f755b32b8ee801f61833de71bec903c9a2a30..7789ca6314dd860e2fd05134efeea4822b58747f 100644 (file)
--- a/src/glsl/builtins/ir/distance
+++ b/src/glsl/builtins/ir/distance
@@ -3,7 +3,7 @@
      (parameters
        (declare (in) float p0)
        (declare (in) float p1))
-     ((return (expression float - (var_ref p0) (var_ref p1)))))
+     ((return (expression float abs (expression float - (var_ref p0) (var_ref p1))))))
 
    (signature float
      (parameters

diff --git a/src/glsl/builtins/ir/length b/src/glsl/builtins/ir/length
index 3fc3103da16fde224aa71ba0b6a305746e2ea97b..b72334ee8a245c36abf1ba12dea6ce01e710d88b 100644 (file)
--- a/src/glsl/builtins/ir/length
+++ b/src/glsl/builtins/ir/length
@@ -2,7 +2,7 @@
    (signature float
      (parameters
        (declare (in) float arg0))
-     ((return (var_ref arg0))))
+     ((return (expression float abs (var_ref arg0)))))
 
    (signature float
      (parameters