From a5abb4eba7f969a9cbeeefaf4fff65b334aff78f Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Tue, 18 May 2021 16:03:29 +0200 Subject: [PATCH] panfrost: v7 does not support RGB32_UNORM textures Cc: mesa-stable Fixes: c6bdd976e611 ("panfrost: Split out v6/v7 format tables") Signed-off-by: Boris Brezillon Reviewed-by: Alyssa Rosenzweig Part-of: (cherry picked from commit 19e29960e92fdf68d647528f0b2f0740376e31b8) --- .pick_status.json | 2 +- src/panfrost/lib/pan_format.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index f9400b406f5..814428f92a8 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -175,7 +175,7 @@ "description": "panfrost: v7 does not support RGB32_UNORM textures", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "c6bdd976e6110fbf4ec1add9c11d0382e38236d3" }, diff --git a/src/panfrost/lib/pan_format.c b/src/panfrost/lib/pan_format.c index d3f645194da..213529aa585 100644 --- a/src/panfrost/lib/pan_format.c +++ b/src/panfrost/lib/pan_format.c @@ -334,7 +334,11 @@ const struct panfrost_format GENX(panfrost_pipe_format)[PIPE_FORMAT_COUNT] = { FMT(R32G32_UNORM, RG32_UNORM, RG01, L, VT__), FMT(R8G8B8_UNORM, RGB8_UNORM, RGB1, L, VTR_), FMT(R16G16B16_UNORM, RGB16_UNORM, RGB1, L, VT__), +#if PAN_ARCH <= 6 FMT(R32G32B32_UNORM, RGB32_UNORM, RGB1, L, VT__), +#else + FMT(R32G32B32_UNORM, RGB32_UNORM, RGB1, L, V___), +#endif FMT(R4G4B4A4_UNORM, RGBA4_UNORM, RGBA, L, VTR_), FMT(B4G4R4A4_UNORM, RGBA4_UNORM, BGRA, L, VTR_), FMT(R16G16B16A16_UNORM, RGBA16_UNORM, RGBA, L, VT__),