radeonsi: fix 2D array MSAA failures since image support landed

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index b9bdd47c4967301587f6275fa9e802c6bb9f0914..b8fde00c66860b438854dfdac1405f5e463de735 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -2993,7 +2993,8 @@ si_make_texture_descriptor(struct si_screen *screen,
        if (type == V_008F1C_SQ_RSRC_IMG_1D_ARRAY) {
                height = 1;
                depth = res->array_size;
-       } else if (type == V_008F1C_SQ_RSRC_IMG_2D_ARRAY) {
+       } else if (type == V_008F1C_SQ_RSRC_IMG_2D_ARRAY ||
+                  type == V_008F1C_SQ_RSRC_IMG_2D_MSAA_ARRAY) {
                if (sampler || res->target != PIPE_TEXTURE_3D)
                        depth = res->array_size;
        } else if (type == V_008F1C_SQ_RSRC_IMG_CUBE)