From 20dd75a9268a1adf0a8b47267ba2c5acc55cb207 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Wed, 23 May 2018 22:42:49 -0400 Subject: radeonsi: use storage_samples instead of color_samples in most places MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and use pipe_resource::nr_storage_samples instead of r600_texture::num_color_samples. Tested-by: Dieter Nützel --- src/gallium/drivers/radeonsi/si_state.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/gallium/drivers/radeonsi/si_state.c') diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index fc5d63f02d3..a1b00cb979a 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -2431,7 +2431,7 @@ static void si_initialize_color_surface(struct si_context *sctx, if (tex->buffer.b.b.nr_samples > 1) { unsigned log_samples = util_logbase2(tex->buffer.b.b.nr_samples); - unsigned log_fragments = util_logbase2(tex->num_color_samples); + unsigned log_fragments = util_logbase2(tex->buffer.b.b.nr_storage_samples); color_attrib |= S_028C74_NUM_SAMPLES(log_samples) | S_028C74_NUM_FRAGMENTS(log_fragments); @@ -2458,7 +2458,7 @@ static void si_initialize_color_surface(struct si_context *sctx, if (!sctx->screen->info.has_dedicated_vram) min_compressed_block_size = V_028C78_MIN_BLOCK_SIZE_64B; - if (tex->num_color_samples > 1) { + if (tex->buffer.b.b.nr_storage_samples > 1) { if (tex->surface.bpe == 1) max_uncompressed_block_size = V_028C78_MAX_BLOCK_SIZE_64B; else if (tex->surface.bpe == 2) @@ -2869,10 +2869,12 @@ static void si_set_framebuffer_state(struct pipe_context *ctx, * (e.g. destination of MSAA resolve) */ if (tex->buffer.b.b.nr_samples >= 2 && - tex->num_color_samples < tex->buffer.b.b.nr_samples) { + tex->buffer.b.b.nr_storage_samples < tex->buffer.b.b.nr_samples) { sctx->framebuffer.nr_color_samples = MIN2(sctx->framebuffer.nr_color_samples, - tex->num_color_samples); + tex->buffer.b.b.nr_storage_samples); + sctx->framebuffer.nr_color_samples = + MAX2(1, sctx->framebuffer.nr_color_samples); } if (tex->surface.is_linear) @@ -3633,7 +3635,8 @@ si_make_texture_descriptor(struct si_screen *screen, desc = util_format_description(pipe_format); num_samples = desc->colorspace == UTIL_FORMAT_COLORSPACE_ZS ? - MAX2(1, res->nr_samples) : tex->num_color_samples; + MAX2(1, res->nr_samples) : + MAX2(1, res->nr_storage_samples); if (desc->colorspace == UTIL_FORMAT_COLORSPACE_ZS) { const unsigned char swizzle_xxxx[4] = {0, 0, 0, 0}; @@ -3831,10 +3834,10 @@ si_make_texture_descriptor(struct si_screen *screen, va = tex->buffer.gpu_address + tex->fmask_offset; -#define FMASK(s,f) (((unsigned)(s) * 16) + (f)) +#define FMASK(s,f) (((unsigned)(MAX2(1, s)) * 16) + (MAX2(1, f))) if (screen->info.chip_class >= GFX9) { data_format = V_008F14_IMG_DATA_FORMAT_FMASK; - switch (FMASK(res->nr_samples, tex->num_color_samples)) { + switch (FMASK(res->nr_samples, res->nr_storage_samples)) { case FMASK(2,1): num_format = V_008F14_IMG_FMASK_8_2_1; break; @@ -3878,7 +3881,7 @@ si_make_texture_descriptor(struct si_screen *screen, unreachable("invalid nr_samples"); } } else { - switch (FMASK(res->nr_samples, tex->num_color_samples)) { + switch (FMASK(res->nr_samples, res->nr_storage_samples)) { case FMASK(2,1): data_format = V_008F14_IMG_DATA_FORMAT_FMASK8_S2_F1; break; -- cgit v1.2.3