From b5bc09358416a07190e2535eea548141efaebf46 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 30 Oct 2020 14:43:37 -0400 Subject: [PATCH] panfrost: Fix RGB5A1 formats Signed-off-by: Alyssa Rosenzweig Reported-by: Icecream95 Suggested-by: Boris Brezillon Part-of: --- src/panfrost/lib/midgard.xml | 4 ++-- src/panfrost/lib/pan_format.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/panfrost/lib/midgard.xml b/src/panfrost/lib/midgard.xml index 938d76a0257..b2367ec603b 100644 --- a/src/panfrost/lib/midgard.xml +++ b/src/panfrost/lib/midgard.xml @@ -110,8 +110,8 @@ - - + + diff --git a/src/panfrost/lib/pan_format.c b/src/panfrost/lib/pan_format.c index 6a85dddcf0d..08fcbbc7bf1 100644 --- a/src/panfrost/lib/pan_format.c +++ b/src/panfrost/lib/pan_format.c @@ -187,7 +187,7 @@ const struct panfrost_format panfrost_pipe_format_v6[PIPE_FORMAT_COUNT] = { PAN_V6(ASTC_12x10_SRGB, ASTC_2D_LDR, RGBA, S, _T__), PAN_V6(ASTC_12x12_SRGB, ASTC_2D_LDR, RGBA, S, _T__), PAN_V6(B5G6R5_UNORM, RGB565, BGR1, L, VTR_), - PAN_V6(B5G5R5X1_UNORM, RGB5_X1_UNORM, BGR1, L, VT__), + PAN_V6(B5G5R5X1_UNORM, RGB5_A1_UNORM, BGR1, L, VT__), PAN_V6(R5G5B5A1_UNORM, RGB5_A1_UNORM, RGBA, L, VTR_), PAN_V6(R10G10B10X2_UNORM, RGB10_A2_UNORM, RGB1, L, VTR_), PAN_V6(B10G10R10X2_UNORM, RGB10_A2_UNORM, BGR1, L, VTR_), @@ -437,7 +437,7 @@ const struct panfrost_format panfrost_pipe_format_v7[PIPE_FORMAT_COUNT] = { PAN_V7(ASTC_12x10_SRGB, ASTC_2D_LDR, RGBA, S, _T__), PAN_V7(ASTC_12x12_SRGB, ASTC_2D_LDR, RGBA, S, _T__), PAN_V7(B5G6R5_UNORM, RGB565, BGR1, L, VTR_), - PAN_V7(B5G5R5X1_UNORM, RGB5_X1_UNORM, BGR1, L, VT__), + PAN_V7(B5G5R5X1_UNORM, RGB5_A1_UNORM, BGR1, L, VT__), PAN_V7(R5G5B5A1_UNORM, RGB5_A1_UNORM, RGBA, L, VTR_), PAN_V7(R10G10B10X2_UNORM, RGB10_A2_UNORM, RGB1, L, VTR_), PAN_V7(B10G10R10X2_UNORM, RGB10_A2_UNORM, BGR1, L, VTR_),