From: Roland Scheidegger <sroland@vmware.com>
Date: Thu, 15 Aug 2013 17:26:39 +0000 (+0200)
Subject: gallivm: revert accidentally commited hunk
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6ca18e06aecd041e94c2cec5dcf15721c9c0a94d;p=mesa.git

gallivm: revert accidentally commited hunk

That magic wasn't meant to be commited, need to work on some proper fix.
---

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_arit.c b/src/gallium/auxiliary/gallivm/lp_bld_arit.c
index ee30a02d78c..98409c3be86 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_arit.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_arit.c
@@ -1411,19 +1411,8 @@ lp_build_clamp(struct lp_build_context *bld,
    assert(lp_check_value(bld->type, min));
    assert(lp_check_value(bld->type, max));
 
-   /*
-    * XXX dark magic warning: The order of min/max here matters (!).
-    * The reason is a typical use case is clamp(a, 0.0, 1.0)
-    * (for example for float->unorm conversion) and on x86 sse2
-    * this will give 0.0 for NaNs, whereas doing min first will
-    * give 1.0 for NaN which makes d3d10 angry...
-    * This is very much not guaranteed behavior though which just
-    * happens to work x86 sse2 (and up), and obviously won't do anything
-    * for other non-zero clamps (say -1.0/1.0 in a SNORM conversion) neither,
-    * so need to fix this for real...
-    */
-   a = lp_build_max(bld, a, min);
    a = lp_build_min(bld, a, max);
+   a = lp_build_max(bld, a, min);
    return a;
 }