No longer specifying uniforms which are not referenced (and therefore probably
optimized out)