The patch just hit Mesa master: https://cgit.freedesktop.org/mesa/mesa/commit/?id=02675622b02742960678c438f1b239321c075f50