Not sure but this might help for your issue. https://cgit.freedesktop.org/mesa/mesa/commit/?id=7751ed39e40e08e5aa0633d018c9f25ad17f9bb0 Let me know if you get a chance to try.