diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2013-05-22 02:13:02 +0200 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2013-05-22 22:57:27 +0200 |
| commit | 2f567fb7b50e39aef20f0a0cd9b2eba184ed6441 (patch) | |
| tree | 9a3e6a38f18a3077aa3439eb9125a814ea62191d /src/gallium/drivers/softpipe/sp_tex_tile_cache.c | |
| parent | 80e2cc0f97f40c2af58980e3961c2b10b14c801e (diff) | |
softpipe: disambiguate TILE_SIZE / TEX_TILE_SIZE
These can be different (just like NUM_TEX_TILE_ENTRIES / NUM_ENTRIES),
though currently they aren't.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_tex_tile_cache.c')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_tex_tile_cache.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/gallium/drivers/softpipe/sp_tex_tile_cache.c b/src/gallium/drivers/softpipe/sp_tex_tile_cache.c index af1024d2c19..b0d8a18f672 100644 --- a/src/gallium/drivers/softpipe/sp_tex_tile_cache.c +++ b/src/gallium/drivers/softpipe/sp_tex_tile_cache.c @@ -50,7 +50,7 @@ sp_create_tex_tile_cache( struct pipe_context *pipe ) uint pos; /* make sure max texture size works */ - assert((TILE_SIZE << TEX_ADDR_BITS) >= (1 << (SP_MAX_TEXTURE_2D_LEVELS-1))); + assert((TEX_TILE_SIZE << TEX_ADDR_BITS) >= (1 << (SP_MAX_TEXTURE_2D_LEVELS-1))); tc = CALLOC_STRUCT( softpipe_tex_tile_cache ); if (tc) { @@ -212,7 +212,7 @@ sp_find_cached_tile_tex(struct softpipe_tex_tile_cache *tc, if (addr.value != tile->addr.value) { - /* cache miss. Most misses are because we've invaldiated the + /* cache miss. Most misses are because we've invalidated the * texture cache previously -- most commonly on binding a new * texture. Currently we effectively flush the cache on texture * bind. @@ -265,26 +265,26 @@ sp_find_cached_tile_tex(struct softpipe_tex_tile_cache *tc, */ if (!zs && util_format_is_pure_uint(tc->format)) { pipe_get_tile_ui_format(tc->tex_trans, tc->tex_trans_map, - addr.bits.x * TILE_SIZE, - addr.bits.y * TILE_SIZE, - TILE_SIZE, - TILE_SIZE, + addr.bits.x * TEX_TILE_SIZE, + addr.bits.y * TEX_TILE_SIZE, + TEX_TILE_SIZE, + TEX_TILE_SIZE, tc->format, (unsigned *) tile->data.colorui); } else if (!zs && util_format_is_pure_sint(tc->format)) { pipe_get_tile_i_format(tc->tex_trans, tc->tex_trans_map, - addr.bits.x * TILE_SIZE, - addr.bits.y * TILE_SIZE, - TILE_SIZE, - TILE_SIZE, + addr.bits.x * TEX_TILE_SIZE, + addr.bits.y * TEX_TILE_SIZE, + TEX_TILE_SIZE, + TEX_TILE_SIZE, tc->format, (int *) tile->data.colori); } else { pipe_get_tile_rgba_format(tc->tex_trans, tc->tex_trans_map, - addr.bits.x * TILE_SIZE, - addr.bits.y * TILE_SIZE, - TILE_SIZE, - TILE_SIZE, + addr.bits.x * TEX_TILE_SIZE, + addr.bits.y * TEX_TILE_SIZE, + TEX_TILE_SIZE, + TEX_TILE_SIZE, tc->format, (float *) tile->data.color); } |