Module: Mesa Branch: master Commit: 0d8944866293c147cb043322cc68e13136278ae5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d8944866293c147cb043322cc68e13136278ae5
Author: Dave Airlie <[email protected]> Date: Wed Jun 11 14:03:11 2014 +1000 softpipe: fix pt->resource assert placement oops meant to move this. Signed-off-by: Dave Airlie <[email protected]> --- src/gallium/drivers/softpipe/sp_tile_cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/softpipe/sp_tile_cache.c b/src/gallium/drivers/softpipe/sp_tile_cache.c index ceb66f6..78534b5 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 */ _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
