From 1b48b9e61902a95d4e2d80009c33bc88f44b5d1b Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Tue, 27 Oct 2020 14:21:44 -0400
Subject: [PATCH] panfrost: Don't double-compose swizzles

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Fixes: b9a136cdd1e ("panfrost: Implement BGRA textures")
Tested-by: Christian Hewitt <christianshewitt@gmail.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7352>
---
 src/gallium/drivers/panfrost/pan_context.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c
index 3ff1d75eeba..0eb1863c961 100644
--- a/src/gallium/drivers/panfrost/pan_context.c
+++ b/src/gallium/drivers/panfrost/pan_context.c
@@ -1015,9 +1015,6 @@ panfrost_create_sampler_view_bo(struct panfrost_sampler_view *so,
                 panfrost_translate_texture_dimension(so->base.target);
 
         if (device->quirks & IS_BIFROST) {
-                unsigned char composed_swizzle[4];
-                util_format_compose_swizzles(desc->swizzle, user_swizzle, composed_swizzle);
-
                 unsigned size = panfrost_estimate_texture_payload_size(
                                 so->base.u.tex.first_level,
                                 so->base.u.tex.last_level,
@@ -1041,7 +1038,7 @@ panfrost_create_sampler_view_bo(struct panfrost_sampler_view *so,
                                 so->base.u.tex.last_layer,
                                 texture->nr_samples,
                                 prsrc->cubemap_stride,
-                                panfrost_translate_swizzle_4(composed_swizzle),
+                                panfrost_translate_swizzle_4(user_swizzle),
                                 prsrc->bo->ptr.gpu,
                                 prsrc->slices, &so->bo->ptr);
         } else {