RSX : Reapply fmt::merge change & VFS change

This fixes broken shader previously in commit https://github.com/DHrpcs3/rpcs3/pull/905