Merge pull request #6741 from stenzek/more-implicit-conversions TextureConversionShader: Fix more implicit conversion errors
