[Mesa-dev] [PATCH v2 06/14] etnaviv: use correct format for translate_msaa_format(..)

[Christian Gmeiner]

In a later patch we will remove the calls to etna_compatible_rs_format(..)
which will cause some troubles if nr_samples > 1.

fbo-depthstencil: etnaviv_rs.c:664: etna_try_rs_blit: Assertion `msaa_format != ETNA_NO_MATCH' failed.

In this case we call translate_msaa_format(..) with the full set of rs formats which
ends a return value of ETNA_NO_MATCH. As a fix just call etna_compatible_rs_format(..)
to get a rs format based on the block size of the format.

Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
---
 src/gallium/drivers/etnaviv/etnaviv_rs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/etnaviv/etnaviv_rs.c b/src/gallium/drivers/etnaviv/etnaviv_rs.c
index fbcdb4f57d..08bc334dea 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_rs.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_rs.c
@@ -656,7 +656,7 @@ 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);
+      uint32_t msaa_format = translate_msaa_format(etna_compatible_rs_format(src_format));
       assert(msaa_format != ETNA_NO_MATCH);
       ts_mem_config |= VIVS_TS_MEM_CONFIG_COLOR_COMPRESSION | msaa_format;
    }
-- 
2.17.0