Merge branch 'master' into mipmap

This commit is contained in:
Feng Chen 2022-09-20 11:56:43 +08:00 committed by GitHub
commit c864cb5772
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
185 changed files with 3156 additions and 1821 deletions

View file

@ -39,11 +39,8 @@ static Shader::TextureType ConvertType(const Tegra::Texture::TICEntry& entry) {
return Shader::TextureType::Color1D;
case Tegra::Texture::TextureType::Texture2D:
case Tegra::Texture::TextureType::Texture2DNoMipmap:
if (entry.normalized_coords) {
return Shader::TextureType::Color2D;
} else {
return Shader::TextureType::Color2DRect;
}
return entry.normalized_coords ? Shader::TextureType::Color2D
: Shader::TextureType::Color2DRect;
case Tegra::Texture::TextureType::Texture3D:
return Shader::TextureType::Color3D;
case Tegra::Texture::TextureType::TextureCubemap: