cleanup ugliness in mesa and use the new mir types for surface and display