summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Morph2022-08-31 08:51:47 -0400
committerGravatar Morph2022-08-31 08:51:47 -0400
commit95333654861b62167b9a8052ff3faaa931930d17 (patch)
treef60aa1189c92caffa19db809bf00684be0f140ae /src
parent(shader/pipeline)_cache: Raise shader/pipeline cache version (diff)
downloadyuzu-95333654861b62167b9a8052ff3faaa931930d17.tar.gz
yuzu-95333654861b62167b9a8052ff3faaa931930d17.tar.xz
yuzu-95333654861b62167b9a8052ff3faaa931930d17.zip
style: General style changes to match with the rest of the codebase
Diffstat (limited to 'src')
-rw-r--r--src/shader_recompiler/ir_opt/texture_pass.cpp10
-rw-r--r--src/video_core/shader_environment.cpp7
2 files changed, 7 insertions, 10 deletions
diff --git a/src/shader_recompiler/ir_opt/texture_pass.cpp b/src/shader_recompiler/ir_opt/texture_pass.cpp
index 5cead5135..597112ba4 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) {
415 inst->SetFlags(flags); 415 inst->SetFlags(flags);
416 break; 416 break;
417 case IR::Opcode::ImageSampleImplicitLod: 417 case IR::Opcode::ImageSampleImplicitLod:
418 if (flags.type == TextureType::Color2D) { 418 if (flags.type != TextureType::Color2D) {
419 auto texture_type = ReadTextureType(env, cbuf); 419 break;
420 if (texture_type == TextureType::Color2DRect) { 420 }
421 PatchImageSampleImplicitLod(*texture_inst.block, *texture_inst.inst); 421 if (ReadTextureType(env, cbuf) == TextureType::Color2DRect) {
422 } 422 PatchImageSampleImplicitLod(*texture_inst.block, *texture_inst.inst);
423 } 423 }
424 break; 424 break;
425 case IR::Opcode::ImageFetch: 425 case IR::Opcode::ImageFetch:
diff --git a/src/video_core/shader_environment.cpp b/src/video_core/shader_environment.cpp
index 808d88eec..5f7625947 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) {
39 return Shader::TextureType::Color1D; 39 return Shader::TextureType::Color1D;
40 case Tegra::Texture::TextureType::Texture2D: 40 case Tegra::Texture::TextureType::Texture2D:
41 case Tegra::Texture::TextureType::Texture2DNoMipmap: 41 case Tegra::Texture::TextureType::Texture2DNoMipmap:
42 if (entry.normalized_coords) { 42 return entry.normalized_coords ? Shader::TextureType::Color2D
43 return Shader::TextureType::Color2D; 43 : Shader::TextureType::Color2DRect;
44 } else {
45 return Shader::TextureType::Color2DRect;
46 }
47 case Tegra::Texture::TextureType::Texture3D: 44 case Tegra::Texture::TextureType::Texture3D:
48 return Shader::TextureType::Color3D; 45 return Shader::TextureType::Color3D;
49 case Tegra::Texture::TextureType::TextureCubemap: 46 case Tegra::Texture::TextureType::TextureCubemap: