diff options
| author | Feng Chen <VonChenPlus@gmail.com> | 2022-09-20 11:56:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-20 11:56:43 +0800 |
| commit | c864cb57726e76e9dc4558036f3212168bec825d (patch) | |
| tree | ca79c4397f40990488a7b5691e15c0fcfec507b6 /src/video_core/shader_environment.cpp | |
| parent | 9a95c7fa14bdfc14aacea92896c8ae8533918fe8 (diff) | |
| parent | 8d4458ef24e473e57b9931d7a9d1442b51fb0b1a (diff) | |
Merge branch 'master' into mipmap
Diffstat (limited to 'src/video_core/shader_environment.cpp')
| -rw-r--r-- | src/video_core/shader_environment.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/video_core/shader_environment.cpp b/src/video_core/shader_environment.cpp index 3ead06dd65..c903975fc2 100644 --- a/src/video_core/shader_environment.cpp +++ b/src/video_core/shader_environment.cpp @@ -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: |