Module: Mesa Branch: main Commit: 2132f95de0b0f291b116a67149793eaac2e2b5bf URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2132f95de0b0f291b116a67149793eaac2e2b5bf
Author: Rob Clark <[email protected]> Date: Fri Dec 8 11:30:44 2023 -0800 freedreno/a6xx: Fix NV12+UBWC import Treat R8_G8B8_420_UNORM and NV12 the same, because dri2 frontend doesn't understand or care about the difference from the sampler PoV. Fixes: 1e820ac12850 ("freedreno: Rework supported-modifiers handling") Signed-off-by: Rob Clark <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26601> --- src/gallium/drivers/freedreno/a6xx/fd6_resource.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc b/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc index 539aa707321..b0a8b40a1b7 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc @@ -55,6 +55,13 @@ ok_ubwc_format(struct pipe_screen *pscreen, enum pipe_format pfmt) return info->a6xx.has_z24uint_s8uint; case PIPE_FORMAT_R8_G8B8_420_UNORM: + /* The difference between NV12 and R8_G8B8_420_UNORM is only where the + * conversion to RGB happens, with the latter it happens _after_ the + * texture samp instruction. But dri2_get_mapping_by_fourcc() doesn't + * know this, so it asks for NV12 when it really meant to ask for + * R8_G8B8_420_UNORM. Just treat them the same here to work around it: + */ + case PIPE_FORMAT_NV12: return true; default:
