notsoyuzu
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style: General style changes to match with the rest of the codebase

This commit is contained in:
Morph 2022-08-31 08:51:47 -04:00
parent 7e379207ec
commit 9533365486
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/shader_recompiler/ir_opt/texture_pass.cpp
View File

@ -415,11 +415,11 @@ void TexturePass(Environment& env, IR::Program& program) {
inst->SetFlags(flags); inst->SetFlags(flags);
break; break;
case IR::Opcode::ImageSampleImplicitLod: case IR::Opcode::ImageSampleImplicitLod:
if (flags.type == TextureType::Color2D) { if (flags.type != TextureType::Color2D) {
auto texture_type = ReadTextureType(env, cbuf); break;
if (texture_type == TextureType::Color2DRect) {
PatchImageSampleImplicitLod(*texture_inst.block, *texture_inst.inst);
} }
if (ReadTextureType(env, cbuf) == TextureType::Color2DRect) {
PatchImageSampleImplicitLod(*texture_inst.block, *texture_inst.inst);
} }
break; break;
case IR::Opcode::ImageFetch: case IR::Opcode::ImageFetch:

7
src/video_core/shader_environment.cpp
View File

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