diff options
| author | Marek Olšák <[email protected]> | 2013-11-20 13:48:19 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-11-23 01:54:58 +0100 |
| commit | 751e8697f2099a0ceaba09e0d8775e4636f209b1 (patch) | |
| tree | d9f45581b15e6e292edfa5ab64359deaf4e8559c /src/gallium/drivers/radeon/r600_texture.c | |
| parent | 7b136de79adf2ae54f2e60211ccee0c92f0741f2 (diff) | |
radeonsi: implement MSAA for CIK
There are also some changes to the printfs.
Reviewed-and-Tested-by: Michel Dänzer <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeon/r600_texture.c')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_texture.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c index 77b05c4a25e..5674f0b7e87 100644 --- a/src/gallium/drivers/radeon/r600_texture.c +++ b/src/gallium/drivers/radeon/r600_texture.c @@ -403,6 +403,10 @@ static void si_texture_get_cmask_info(struct r600_common_screen *rscreen, cl_width = 64; cl_height = 32; break; + case 16: /* Hawaii */ + cl_width = 64; + cl_height = 64; + break; default: assert(0); return; @@ -585,15 +589,15 @@ r600_texture_create_object(struct pipe_screen *screen, (rtex->resource.b.b.last_level > 0 && rscreen->debug_flags & DBG_TEXMIP)) { printf("Texture: npix_x=%u, npix_y=%u, npix_z=%u, blk_w=%u, " "blk_h=%u, blk_d=%u, array_size=%u, last_level=%u, " - "bpe=%u, nsamples=%u, flags=%u\n", + "bpe=%u, nsamples=%u, flags=0x%x, %s\n", rtex->surface.npix_x, rtex->surface.npix_y, rtex->surface.npix_z, rtex->surface.blk_w, rtex->surface.blk_h, rtex->surface.blk_d, rtex->surface.array_size, rtex->surface.last_level, rtex->surface.bpe, rtex->surface.nsamples, - rtex->surface.flags); + rtex->surface.flags, util_format_short_name(base->format)); for (int i = 0; i <= rtex->surface.last_level; i++) { - printf(" Z %i: offset=%llu, slice_size=%llu, npix_x=%u, " + printf(" L %i: offset=%llu, slice_size=%llu, npix_x=%u, " "npix_y=%u, npix_z=%u, nblk_x=%u, nblk_y=%u, " "nblk_z=%u, pitch_bytes=%u, mode=%u\n", i, rtex->surface.level[i].offset, |