3.11.2, drop cirrus patches causing swrast to crash too often