From f2af23bd1208d1ccf6bee44c3aa37d0a4a544c9d Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 29 Oct 2020 09:19:36 -0400 Subject: [PATCH] panfrost: Use macro for panfrost_get_default_swizzle Eventually this function should go away, but for now let's clean up a bit. Signed-off-by: Alyssa Rosenzweig Suggested-by: Icecream95 Part-of: --- src/panfrost/lib/pan_texture.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/panfrost/lib/pan_texture.h b/src/panfrost/lib/pan_texture.h index 07fbbd0b96a..1135fadc5f3 100644 --- a/src/panfrost/lib/pan_texture.h +++ b/src/panfrost/lib/pan_texture.h @@ -171,17 +171,13 @@ panfrost_get_default_swizzle(unsigned components) { switch (components) { case 1: - return (MALI_CHANNEL_R << 0) | (MALI_CHANNEL_0 << 3) | - (MALI_CHANNEL_0 << 6) | (MALI_CHANNEL_1 << 9); + return PAN_V6_SWIZZLE(R, 0, 0, 1); case 2: - return (MALI_CHANNEL_R << 0) | (MALI_CHANNEL_G << 3) | - (MALI_CHANNEL_0 << 6) | (MALI_CHANNEL_1 << 9); + return PAN_V6_SWIZZLE(R, G, 0, 1); case 3: - return (MALI_CHANNEL_R << 0) | (MALI_CHANNEL_G << 3) | - (MALI_CHANNEL_B << 6) | (MALI_CHANNEL_1 << 9); + return PAN_V6_SWIZZLE(R, G, B, 1); case 4: - return (MALI_CHANNEL_R << 0) | (MALI_CHANNEL_G << 3) | - (MALI_CHANNEL_B << 6) | (MALI_CHANNEL_A << 9); + return PAN_V6_SWIZZLE(R, G, B, A); default: unreachable("Invalid number of components"); }