From: Dave Airlie <airlied@redhat.com>
Date: Wed, 11 Jun 2014 04:03:11 +0000 (+1000)
Subject: softpipe: fix pt->resource assert placement
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0d8944866293c147cb043322cc68e13136278ae5;p=mesa.git

softpipe: fix pt->resource assert placement

oops meant to move this.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/gallium/drivers/softpipe/sp_tile_cache.c b/src/gallium/drivers/softpipe/sp_tile_cache.c
index ceb66f67502..78534b55902 100644
--- a/src/gallium/drivers/softpipe/sp_tile_cache.c
+++ b/src/gallium/drivers/softpipe/sp_tile_cache.c
@@ -529,7 +529,6 @@ sp_find_cached_tile(struct softpipe_tile_cache *tc,
 
    if (addr.value != tc->tile_addrs[pos].value) {
 
-      assert(pt->resource);
       layer = tc->tile_addrs[pos].bits.layer;
       if (tc->tile_addrs[pos].bits.invalid == 0) {
          /* put dirty tile back in framebuffer */
@@ -570,6 +569,7 @@ sp_find_cached_tile(struct softpipe_tile_cache *tc,
 
       layer = tc->tile_addrs[pos].bits.layer;
       pt = tc->transfer[layer];
+      assert(pt->resource);
 
       if (is_clear_flag_set(tc->clear_flags, addr, tc->clear_flags_size)) {
          /* don't get tile from framebuffer, just clear it */