From 66411521ea9394132c6067f5b676dc2751f21d6c Mon Sep 17 00:00:00 2001 From: Jonathan Marek Date: Mon, 1 Jul 2019 16:42:50 -0400 Subject: etnaviv: combine translate_ts_sampler_format/translate_msaa_format Both translate the same thing, so just add the missing cases into one. Signed-off-by: Jonathan Marek Reviewed-by: Christian Gmeiner --- src/gallium/drivers/etnaviv/etnaviv_rs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gallium/drivers/etnaviv/etnaviv_rs.c') diff --git a/src/gallium/drivers/etnaviv/etnaviv_rs.c b/src/gallium/drivers/etnaviv/etnaviv_rs.c index 631fced1e37..01e97b2080d 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_rs.c +++ b/src/gallium/drivers/etnaviv/etnaviv_rs.c @@ -655,10 +655,10 @@ etna_try_rs_blit(struct pipe_context *pctx, goto manual; if (src->base.nr_samples > 1) { - uint32_t msaa_format = translate_msaa_format(src_format); - assert(msaa_format != ETNA_NO_MATCH); + uint32_t ts_format = translate_ts_format(src_format); + assert(ts_format != ETNA_NO_MATCH); ts_mem_config |= VIVS_TS_MEM_CONFIG_COLOR_COMPRESSION | - VIVS_TS_MEM_CONFIG_COLOR_COMPRESSION_FORMAT(msaa_format); + VIVS_TS_MEM_CONFIG_COLOR_COMPRESSION_FORMAT(ts_format); } /* Always flush color and depth cache together before resolving. This works -- cgit v1.2.3