pr-13222-08f6f1 vs. 2412-31 / ogl-lin-mesa / nsmbw-intro

pr-13222-08f6f1 (08f6f1d4) Diff 2412-31 (ada646a7)
Failure 09c82a432c10e165850f7d631d6dbfb1b1d14aef
Failure f37e6a917d484170c3766cddaf9967032b5d1d19
Failure fdc23037878e512428370bc3d72874f232e1526a