Just reposting the 3 patches, I've cleaned up the TBO and merged eg and r600 patches together, I'll push this tomorrow unless someone objects, the fix for the shader and ubo patches are also in here for reference. Dave.