mesa: bugfix update

Squashed this one as well, as mesa bugfixes tend to be very reliable.