This contains backpors of - https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38160 - https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38200
rebased onto d8a7e09d849b88c1490fad5d84c3798cbe6a2662
Pull-Request has been merged by jannau
This contains backpors of
- https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38160
- https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38200