pr-13222-08f6f1 vs. 2412-31 / ogl-lin-mesa / tp-skin

pr-13222-08f6f1 (08f6f1d4) Diff 2412-31 (ada646a7)
Failure 1138c41cdbd4eddfcfbc2a6c32624a8128b93cf7
Failure 4a7c26b9069f562c54efd06979dd452bc630f392
Failure 9d2c8875301a3d516edbe69f0b1e7e2181ee70e2