VERY experimental Nintendo Switch 2 emulator
C++
style: General style changes to match with the rest of the codebase
Morph649c49525d53
diff --git a/src/shader_recompiler/ir_opt/texture_pass.cpp b/src/shader_recompiler/ir_opt/texture_pass.cppindex 5cead5135e..597112ba47 100644--- a/src/shader_recompiler/ir_opt/texture_pass.cpp+++ b/src/shader_recompiler/ir_opt/texture_pass.cpp@@ -415,11 +415,11 @@ void TexturePass(Environment& env, IR::Program& program) {inst->SetFlags(flags);break;case IR::Opcode::ImageSampleImplicitLod:- if (flags.type == TextureType::Color2D) {- auto texture_type = ReadTextureType(env, cbuf);- if (texture_type == TextureType::Color2DRect) {- PatchImageSampleImplicitLod(*texture_inst.block, *texture_inst.inst);- }+ if (flags.type != TextureType::Color2D) {+ break;+ }+ if (ReadTextureType(env, cbuf) == TextureType::Color2DRect) {+ PatchImageSampleImplicitLod(*texture_inst.block, *texture_inst.inst);}break;case IR::Opcode::ImageFetch:diff --git a/src/video_core/shader_environment.cpp b/src/video_core/shader_environment.cppindex 808d88eec8..5f76259470 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: