This one should compile (I forgot to adapt a few things after I moved it up in my patch series): https://github.com/jobermayr/mesa/commit/7e31d65