etnaviv: combine translate_ts_sampler_format/translate_msaa_format

[mesa.git] / 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 631fced1e3708249bf98e6fd8cf2b57e0957ca66..01e97b2080d217afda2e9f70d41b80a9810533cd 100644 (file)
--- 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