Mesa (master): glsl/builtins: normalize of a negative scalar should be -1.0 .

Kenneth Graunke kwg at kemper.freedesktop.org
Thu Sep 9 22:23:28 UTC 2010


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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Thu Sep  9 15:15:31 2010 -0700

glsl/builtins: normalize of a negative scalar should be -1.0.

---

 src/glsl/builtin_function.cpp  |    2 +-
 src/glsl/builtins/ir/normalize |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/glsl/builtin_function.cpp b/src/glsl/builtin_function.cpp
index d897fa6..7e40cd7 100644
--- a/src/glsl/builtin_function.cpp
+++ b/src/glsl/builtin_function.cpp
@@ -2138,7 +2138,7 @@ static const char *builtin_normalize =
    "   (signature float\n"
    "     (parameters\n"
    "       (declare (in) float arg0))\n"
-   "     ((return (constant float (1.0)))))\n"
+   "     ((return (expression float sign (var_ref arg0)))))\n"
    "\n"
    "   (signature vec2\n"
    "     (parameters\n"
diff --git a/src/glsl/builtins/ir/normalize b/src/glsl/builtins/ir/normalize
index 02b249a..0de0db0 100644
--- a/src/glsl/builtins/ir/normalize
+++ b/src/glsl/builtins/ir/normalize
@@ -2,7 +2,7 @@
    (signature float
      (parameters
        (declare (in) float arg0))
-     ((return (constant float (1.0)))))
+     ((return (expression float sign (var_ref arg0)))))
 
    (signature vec2
      (parameters




More information about the mesa-commit mailing list