b47407269d
this is a squashed version of a previously-reviewed series ref https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7193 Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7801>