More work on shader loading