Mesa (master): glsl: Fix for scalar float built-in definitions.

[Kenneth Graunke]

Module: Mesa
Branch: master
Commit: fc1daab2a2846912d3da5eb69e1ce0afbf08ab04
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc1daab2a2846912d3da5eb69e1ce0afbf08ab04

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Wed Sep  8 15:38:09 2010 -0700

glsl: Fix for scalar float built-in definitions.

These need abs, and we need more tests.

---

 src/glsl/builtin_function.cpp |    4 ++--
 src/glsl/builtins/ir/distance |    2 +-
 src/glsl/builtins/ir/length   |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/glsl/builtin_function.cpp b/src/glsl/builtin_function.cpp
index 11b96fd..0a2b012 100644
--- 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 f73f755..7789ca6 100644
--- 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 3fc3103..b72334e 100644
--- 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