diff options
| author | Marek Olšák <[email protected]> | 2013-09-22 22:12:18 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-09-29 15:18:09 +0200 |
| commit | 1bb77f81db0ed3d1b3dd14c055ff7a9679399bb1 (patch) | |
| tree | 56e5d485d32449bf2065116f85883cf212731440 /src/gallium/drivers/r600/r600_texture.c | |
| parent | 09fc5d6e262aeb1b21faf6d952c204588602ef97 (diff) | |
r600g,radeonsi: consolidate tiling_info initialization
and the util_format_s3tc_init calls too.
Diffstat (limited to 'src/gallium/drivers/r600/r600_texture.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_texture.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index 403efd1a2ae..481c6543923 100644 --- a/src/gallium/drivers/r600/r600_texture.c +++ b/src/gallium/drivers/r600/r600_texture.c @@ -29,7 +29,6 @@ #include "r600d.h" #include <errno.h> -#include "util/u_format_s3tc.h" #include "util/u_memory.h" @@ -372,8 +371,8 @@ void r600_texture_get_cmask_info(struct r600_screen *rscreen, unsigned cmask_tile_elements = cmask_tile_width * cmask_tile_height; unsigned element_bits = 4; unsigned cmask_cache_bits = 1024; - unsigned num_pipes = rscreen->tiling_info.num_channels; - unsigned pipe_interleave_bytes = rscreen->tiling_info.group_bytes; + unsigned num_pipes = rscreen->b.tiling_info.num_channels; + unsigned pipe_interleave_bytes = rscreen->b.tiling_info.group_bytes; unsigned elements_per_macro_tile = (cmask_cache_bits / element_bits) * num_pipes; unsigned pixels_per_macro_tile = elements_per_macro_tile * cmask_tile_elements; |