From: Michal Krol <michal@vmware.com>
Date: Wed, 23 Dec 2009 18:08:45 +0000 (+0100)
Subject: tgsi/ureg: Improve immediate match & expand logic.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=08a3efee10034d9bd8809eb6707a372b81ea3957;p=mesa.git

tgsi/ureg: Improve immediate match & expand logic.

Do not pollute immediates with unsuccessfull attempts to expand them.
---

diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.c b/src/gallium/auxiliary/tgsi/tgsi_ureg.c
index 5eb6aaafca9..e64e2b731df 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_ureg.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.c
@@ -495,9 +495,10 @@ static int
 match_or_expand_immediate( const unsigned *v,
                            unsigned nr,
                            unsigned *v2,
-                           unsigned *nr2,
+                           unsigned *pnr2,
                            unsigned *swizzle )
 {
+   unsigned nr2 = *pnr2;
    unsigned i, j;
 
    *swizzle = 0;
@@ -505,7 +506,7 @@ match_or_expand_immediate( const unsigned *v,
    for (i = 0; i < nr; i++) {
       boolean found = FALSE;
 
-      for (j = 0; j < *nr2 && !found; j++) {
+      for (j = 0; j < nr2 && !found; j++) {
          if (v[i] == v2[j]) {
             *swizzle |= j << (i * 2);
             found = TRUE;
@@ -513,16 +514,19 @@ match_or_expand_immediate( const unsigned *v,
       }
 
       if (!found) {
-         if (*nr2 >= 4) {
+         if (nr2 >= 4) {
             return FALSE;
          }
 
-         v2[*nr2] = v[i];
-         *swizzle |= *nr2 << (i * 2);
-         (*nr2)++;
+         v2[nr2] = v[i];
+         *swizzle |= nr2 << (i * 2);
+         nr2++;
       }
    }
 
+   /* Actually expand immediate only when fully succeeded.
+    */
+   *pnr2 = nr2;
    return TRUE;
 }