Sorry for the unnecessary bump. I did not notice that a patch is already in the staging/18.1 branch: https://github.com/mesa3d/mesa/commit/d68f2d7edeedebf2db58b28a9ac6befb7757afb7