Module: Mesa Branch: main Commit: bab84c62d5ac00d6a3b0209995cc2fd6cea68313 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bab84c62d5ac00d6a3b0209995cc2fd6cea68313
Author: Boris Brezillon <[email protected]> Date: Tue Sep 7 11:16:50 2021 +0200 panfrost: RGB10_A2_SNORM is not a valid texture format on v6+ Cc: mesa-stable Fixes: c6bdd976e611 ("panfrost: Split out v6/v7 format tables") Signed-off-by: Boris Brezillon <[email protected]> Reviewed-by: Alyssa Rosenzweig <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12508> --- src/panfrost/lib/pan_format.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/panfrost/lib/pan_format.c b/src/panfrost/lib/pan_format.c index 45d21195b8b..9483d94a5b2 100644 --- a/src/panfrost/lib/pan_format.c +++ b/src/panfrost/lib/pan_format.c @@ -236,9 +236,15 @@ const struct panfrost_format GENX(panfrost_pipe_format)[PIPE_FORMAT_COUNT] = { FMT(B10G10R10X2_UNORM, RGB10_A2_UNORM, BGR1, L, VTR_), FMT(R10G10B10A2_UNORM, RGB10_A2_UNORM, RGBA, L, VTR_), FMT(B10G10R10A2_UNORM, RGB10_A2_UNORM, BGRA, L, VTR_), +#if PAN_ARCH <= 5 FMT(R10G10B10X2_SNORM, RGB10_A2_SNORM, RGB1, L, VT__), FMT(R10G10B10A2_SNORM, RGB10_A2_SNORM, RGBA, L, VT__), FMT(B10G10R10A2_SNORM, RGB10_A2_SNORM, BGRA, L, VT__), +#else + FMT(R10G10B10X2_SNORM, RGB10_A2_SNORM, RGB1, L, V___), + FMT(R10G10B10A2_SNORM, RGB10_A2_SNORM, RGBA, L, V___), + FMT(B10G10R10A2_SNORM, RGB10_A2_SNORM, BGRA, L, V___), +#endif FMT(R10G10B10A2_UINT, RGB10_A2UI, RGBA, L, VTR_), FMT(B10G10R10A2_UINT, RGB10_A2UI, BGRA, L, VTR_), FMT(R10G10B10A2_USCALED, RGB10_A2UI, RGBA, L, VTR_),
