Added ATI/Nvidia distinction
Re-added last barrier