freedreno/a3xx: use util_format_compose_swizzles()

Signed-off-by: Rob Clark <robclark@freedesktop.org>

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_util.c b/src/gallium/drivers/freedreno/a3xx/fd3_util.c
index 2cc8b8b..682b47d 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/fd3_util.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_util.c
@@ -389,14 +389,14 @@ fd3_tex_swiz(enum pipe_format format, unsigned swizzle_r, unsigned swizzle_g,
 {
        const struct util_format_description *desc =
                        util_format_description(format);
-       uint8_t swiz[] = {
+       unsigned char swiz[4] = {
                        swizzle_r, swizzle_g, swizzle_b, swizzle_a,
-                       PIPE_SWIZZLE_ZERO, PIPE_SWIZZLE_ONE,
-                       PIPE_SWIZZLE_ONE, PIPE_SWIZZLE_ONE,
-       };
-
-       return A3XX_TEX_CONST_0_SWIZ_X(tex_swiz(swiz[desc->swizzle[0]])) |
-                       A3XX_TEX_CONST_0_SWIZ_Y(tex_swiz(swiz[desc->swizzle[1]])) |
-                       A3XX_TEX_CONST_0_SWIZ_Z(tex_swiz(swiz[desc->swizzle[2]])) |
-                       A3XX_TEX_CONST_0_SWIZ_W(tex_swiz(swiz[desc->swizzle[3]]));
+       }, rswiz[4];
+
+       util_format_compose_swizzles(desc->swizzle, swiz, rswiz);
+
+       return A3XX_TEX_CONST_0_SWIZ_X(tex_swiz(rswiz[0])) |
+                       A3XX_TEX_CONST_0_SWIZ_Y(tex_swiz(rswiz[1])) |
+                       A3XX_TEX_CONST_0_SWIZ_Z(tex_swiz(rswiz[2])) |
+                       A3XX_TEX_CONST_0_SWIZ_W(tex_swiz(rswiz[3]));
 }