diff options
| author | Fernando S <fsahmkow27@gmail.com> | 2022-03-15 00:08:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-15 00:08:22 +0100 |
| commit | cd07a43724d55617988ad75085847345a837a372 (patch) | |
| tree | 4ce6cd7a8c7effca909fd6573f1bd87fa379c990 | |
| parent | Merge pull request #8000 from liamwhite/hagi (diff) | |
| parent | rescaling_pass: Fix rescaling Color2DArray ImageFetch offsets (diff) | |
| download | yuzu-cd07a43724d55617988ad75085847345a837a372.tar yuzu-cd07a43724d55617988ad75085847345a837a372.tar.gz yuzu-cd07a43724d55617988ad75085847345a837a372.tar.bz2 yuzu-cd07a43724d55617988ad75085847345a837a372.tar.lz yuzu-cd07a43724d55617988ad75085847345a837a372.tar.xz yuzu-cd07a43724d55617988ad75085847345a837a372.tar.zst yuzu-cd07a43724d55617988ad75085847345a837a372.zip | |
| -rw-r--r-- | src/shader_recompiler/ir_opt/rescaling_pass.cpp | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/src/shader_recompiler/ir_opt/rescaling_pass.cpp b/src/shader_recompiler/ir_opt/rescaling_pass.cpp index c28500dd1..496d4667e 100644 --- a/src/shader_recompiler/ir_opt/rescaling_pass.cpp +++ b/src/shader_recompiler/ir_opt/rescaling_pass.cpp @@ -183,6 +183,31 @@ void ScaleIntegerComposite(IR::IREmitter& ir, IR::Inst& inst, const IR::U1& is_s } } +void ScaleIntegerOffsetComposite(IR::IREmitter& ir, IR::Inst& inst, const IR::U1& is_scaled, + size_t index) { + const IR::Value composite{inst.Arg(index)}; + if (composite.IsEmpty()) { + return; + } + const auto info{inst.Flags<IR::TextureInstInfo>()}; + const IR::U32 x{Scale(ir, is_scaled, IR::U32{ir.CompositeExtract(composite, 0)})}; + const IR::U32 y{Scale(ir, is_scaled, IR::U32{ir.CompositeExtract(composite, 1)})}; + switch (info.type) { + case TextureType::ColorArray2D: + case TextureType::Color2D: + inst.SetArg(index, ir.CompositeConstruct(x, y)); + break; + case TextureType::Color1D: + case TextureType::ColorArray1D: + case TextureType::Color3D: + case TextureType::ColorCube: + case TextureType::ColorArrayCube: + case TextureType::Buffer: + // Nothing to patch here + break; + } +} + void SubScaleCoord(IR::IREmitter& ir, IR::Inst& inst, const IR::U1& is_scaled) { const auto info{inst.Flags<IR::TextureInstInfo>()}; const IR::Value coord{inst.Arg(1)}; @@ -220,7 +245,7 @@ void SubScaleImageFetch(IR::Block& block, IR::Inst& inst) { const IR::U1 is_scaled{ir.IsTextureScaled(ir.Imm32(info.descriptor_index))}; SubScaleCoord(ir, inst, is_scaled); // Scale ImageFetch offset - ScaleIntegerComposite(ir, inst, is_scaled, 2); + ScaleIntegerOffsetComposite(ir, inst, is_scaled, 2); } void SubScaleImageRead(IR::Block& block, IR::Inst& inst) { @@ -242,7 +267,7 @@ void PatchImageFetch(IR::Block& block, IR::Inst& inst) { const IR::U1 is_scaled{ir.IsTextureScaled(ir.Imm32(info.descriptor_index))}; ScaleIntegerComposite(ir, inst, is_scaled, 1); // Scale ImageFetch offset - ScaleIntegerComposite(ir, inst, is_scaled, 2); + ScaleIntegerOffsetComposite(ir, inst, is_scaled, 2); } void PatchImageRead(IR::Block& block, IR::Inst& inst) { |