From 87c383a2e5cbd026966e29c4a869617d4d4da255 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Fri, 21 Aug 2009 09:00:47 +0100 Subject: [PATCH] llvmpipe: Clean dead tile cache code. --- src/gallium/drivers/llvmpipe/lp_tile_cache.c | 21 -------------------- src/gallium/drivers/llvmpipe/lp_tile_cache.h | 7 ------- 2 files changed, 28 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/lp_tile_cache.c b/src/gallium/drivers/llvmpipe/lp_tile_cache.c index 074d2dabb43..badfbf40873 100644 --- a/src/gallium/drivers/llvmpipe/lp_tile_cache.c +++ b/src/gallium/drivers/llvmpipe/lp_tile_cache.c @@ -115,10 +115,6 @@ lp_destroy_tile_cache(struct llvmpipe_tile_cache *tc) screen = tc->transfer->texture->screen; screen->tex_transfer_destroy(tc->transfer); } - if (tc->tex_trans) { - screen = tc->tex_trans->texture->screen; - screen->tex_transfer_destroy(tc->tex_trans); - } align_free( tc ); } @@ -131,8 +127,6 @@ void lp_tile_cache_set_surface(struct llvmpipe_tile_cache *tc, struct pipe_surface *ps) { - assert(!tc->texture); - if (tc->transfer) { struct pipe_screen *screen = tc->transfer->texture->screen; @@ -176,9 +170,6 @@ lp_tile_cache_map_transfers(struct llvmpipe_tile_cache *tc) { if (tc->transfer && !tc->transfer_map) tc->transfer_map = tc->screen->transfer_map(tc->screen, tc->transfer); - - if (tc->tex_trans && !tc->tex_trans_map) - tc->tex_trans_map = tc->screen->transfer_map(tc->screen, tc->tex_trans); } @@ -189,11 +180,6 @@ lp_tile_cache_unmap_transfers(struct llvmpipe_tile_cache *tc) tc->screen->transfer_unmap(tc->screen, tc->transfer); tc->transfer_map = NULL; } - - if (tc->tex_trans_map) { - tc->screen->transfer_unmap(tc->screen, tc->tex_trans); - tc->tex_trans_map = NULL; - } } @@ -295,13 +281,6 @@ lp_flush_tile_cache(struct llvmpipe_tile_cache *tc) lp_tile_cache_flush_clear(tc); #endif } - else if (tc->texture) { - /* caching a texture, mark all entries as empty */ - for (pos = 0; pos < NUM_ENTRIES; pos++) { - tc->entries[pos].addr.bits.invalid = 1; - } - tc->tex_face = -1; - } #if 0 debug_printf("flushed tiles in use: %d\n", inuse); diff --git a/src/gallium/drivers/llvmpipe/lp_tile_cache.h b/src/gallium/drivers/llvmpipe/lp_tile_cache.h index f1869b0d2bf..c7c4c9af47c 100644 --- a/src/gallium/drivers/llvmpipe/lp_tile_cache.h +++ b/src/gallium/drivers/llvmpipe/lp_tile_cache.h @@ -77,18 +77,11 @@ struct llvmpipe_tile_cache struct pipe_transfer *transfer; void *transfer_map; - struct pipe_texture *texture; /**< if caching a texture */ - unsigned timestamp; - struct llvmpipe_cached_tile entries[NUM_ENTRIES]; uint clear_flags[(MAX_WIDTH / TILE_SIZE) * (MAX_HEIGHT / TILE_SIZE) / 32]; uint8_t clear_color[4]; /**< for color bufs */ uint clear_val; /**< for z+stencil, or packed color clear value */ - struct pipe_transfer *tex_trans; - void *tex_trans_map; - int tex_face, tex_level, tex_z; - struct llvmpipe_cached_tile *last_tile; /**< most recently retrieved tile */ }; -- 2.30.2