Work around Intel's failings with with buffer_storage