diff options
| author | Roland Scheidegger <[email protected]> | 2013-05-22 02:13:02 +0200 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2013-05-22 22:57:27 +0200 |
| commit | 2f567fb7b50e39aef20f0a0cd9b2eba184ed6441 (patch) | |
| tree | 9a3e6a38f18a3077aa3439eb9125a814ea62191d /src/gallium/drivers/softpipe/sp_tex_sample.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 <[email protected]>
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_tex_sample.c')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_tex_sample.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/gallium/drivers/softpipe/sp_tex_sample.c b/src/gallium/drivers/softpipe/sp_tex_sample.c index 15501994acc..2c7f17f20be 100644 --- a/src/gallium/drivers/softpipe/sp_tex_sample.c +++ b/src/gallium/drivers/softpipe/sp_tex_sample.c @@ -580,10 +580,10 @@ get_texel_2d_no_border(const struct sp_sampler_view *sp_sview, union tex_tile_address addr, int x, int y) { const struct softpipe_tex_cached_tile *tile; - addr.bits.x = x / TILE_SIZE; - addr.bits.y = y / TILE_SIZE; - y %= TILE_SIZE; - x %= TILE_SIZE; + addr.bits.x = x / TEX_TILE_SIZE; + addr.bits.y = y / TEX_TILE_SIZE; + y %= TEX_TILE_SIZE; + x %= TEX_TILE_SIZE; tile = sp_get_cached_tile_tex(sp_sview->cache, addr); @@ -722,10 +722,10 @@ get_texel_quad_2d_no_border_single_tile(const struct sp_sampler_view *sp_sview, { const struct softpipe_tex_cached_tile *tile; - addr.bits.x = x / TILE_SIZE; - addr.bits.y = y / TILE_SIZE; - y %= TILE_SIZE; - x %= TILE_SIZE; + addr.bits.x = x / TEX_TILE_SIZE; + addr.bits.y = y / TEX_TILE_SIZE; + y %= TEX_TILE_SIZE; + x %= TEX_TILE_SIZE; tile = sp_get_cached_tile_tex(sp_sview->cache, addr); @@ -777,11 +777,11 @@ get_texel_3d_no_border(const struct sp_sampler_view *sp_sview, { const struct softpipe_tex_cached_tile *tile; - addr.bits.x = x / TILE_SIZE; - addr.bits.y = y / TILE_SIZE; + addr.bits.x = x / TEX_TILE_SIZE; + addr.bits.y = y / TEX_TILE_SIZE; addr.bits.z = z; - y %= TILE_SIZE; - x %= TILE_SIZE; + y %= TEX_TILE_SIZE; + x %= TEX_TILE_SIZE; tile = sp_get_cached_tile_tex(sp_sview->cache, addr); @@ -917,8 +917,8 @@ img_filter_2d_linear_repeat_POT(struct sp_sampler_view *sp_sview, { unsigned xpot = pot_level_size(sp_sview->xpot, level); unsigned ypot = pot_level_size(sp_sview->ypot, level); - unsigned xmax = (xpot - 1) & (TILE_SIZE - 1); /* MIN2(TILE_SIZE, xpot) - 1; */ - unsigned ymax = (ypot - 1) & (TILE_SIZE - 1); /* MIN2(TILE_SIZE, ypot) - 1; */ + unsigned xmax = (xpot - 1) & (TEX_TILE_SIZE - 1); /* MIN2(TEX_TILE_SIZE, xpot) - 1; */ + unsigned ymax = (ypot - 1) & (TEX_TILE_SIZE - 1); /* MIN2(TEX_TILE_SIZE, ypot) - 1; */ union tex_tile_address addr; int c; |