From: Marek Olšák <marek.olsak@amd.com>
Date: Sun, 27 Mar 2016 17:11:09 +0000 (+0200)
Subject: gallium/util: fix up inaccurate behavior of util_framebuffer_state_equal (v2)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6262d6125a175d64045083341e74985652f44f17;p=mesa.git

gallium/util: fix up inaccurate behavior of util_framebuffer_state_equal (v2)

v2: move the nr_cbufs check above the loop

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu> (v1)
---

diff --git a/src/gallium/auxiliary/util/u_framebuffer.c b/src/gallium/auxiliary/util/u_framebuffer.c
index 2e0ef749e82..49b391d8162 100644
--- a/src/gallium/auxiliary/util/u_framebuffer.c
+++ b/src/gallium/auxiliary/util/u_framebuffer.c
@@ -55,16 +55,16 @@ util_framebuffer_state_equal(const struct pipe_framebuffer_state *dst,
        dst->height != src->height)
       return FALSE;
 
-   for (i = 0; i < Elements(src->cbufs); i++) {
+   if (dst->nr_cbufs != src->nr_cbufs) {
+      return FALSE;
+   }
+
+   for (i = 0; i < src->nr_cbufs; i++) {
       if (dst->cbufs[i] != src->cbufs[i]) {
          return FALSE;
       }
    }
 
-   if (dst->nr_cbufs != src->nr_cbufs) {
-      return FALSE;
-   }
-
    if (dst->zsbuf != src->zsbuf) {
       return FALSE;
    }