Should be fixed on master by https://gitlab.freedesktop.org/mesa/mesa/commit/4583f09caa5aef719a1eec282f24a86c789cbba6. Can you test and confirm?