From: James Benton <jbenton@vmware.com>
Date: Fri, 18 May 2012 15:06:44 +0000 (+0100)
Subject: gallivm: Fixed erroneous optimisation in lp_build_min/max.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a3d4af0c00a198bba00c0965131a14223d426dd4;p=mesa.git

gallivm: Fixed erroneous optimisation in lp_build_min/max.

Previously assumed normalised was 0 to 1, but it can be -1 to 1
if type is signed.
Tested with lp_test_conv and lp_test_format, reduced errors.

Signed-off-by: José Fonseca <jfonseca@vmware.com>
---

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_arit.c b/src/gallium/auxiliary/gallivm/lp_bld_arit.c
index d112f1a59b4..9fc57629822 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_arit.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_arit.c
@@ -763,9 +763,12 @@ lp_build_min(struct lp_build_context *bld,
    if(a == b)
       return a;
 
-   if(bld->type.norm) {
-      if(a == bld->zero || b == bld->zero)
-         return bld->zero;
+   if (bld->type.norm) {
+      if (!bld->type.sign) {
+         if (a == bld->zero || b == bld->zero) {
+            return bld->zero;
+         }
+      }
       if(a == bld->one)
          return b;
       if(b == bld->one)
@@ -797,10 +800,14 @@ lp_build_max(struct lp_build_context *bld,
    if(bld->type.norm) {
       if(a == bld->one || b == bld->one)
          return bld->one;
-      if(a == bld->zero)
-         return b;
-      if(b == bld->zero)
-         return a;
+      if (!bld->type.sign) {
+         if (a == bld->zero) {
+            return b;
+         }
+         if (b == bld->zero) {
+            return a;
+         }
+      }
    }
 
    return lp_build_max_simple(bld, a, b);