Mesa (master): gallivm: revert accidentally commited hunk
Roland Scheidegger
sroland at kemper.freedesktop.org
Thu Aug 15 17:27:46 UTC 2013
Module: Mesa
Branch: master
Commit: 6ca18e06aecd041e94c2cec5dcf15721c9c0a94d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6ca18e06aecd041e94c2cec5dcf15721c9c0a94d
Author: Roland Scheidegger <sroland at vmware.com>
Date: Thu Aug 15 19:26:39 2013 +0200
gallivm: revert accidentally commited hunk
That magic wasn't meant to be commited, need to work on some proper fix.
---
src/gallium/auxiliary/gallivm/lp_bld_arit.c | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_arit.c b/src/gallium/auxiliary/gallivm/lp_bld_arit.c
index ee30a02..98409c3 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;
}
More information about the mesa-commit
mailing list