Another Baldness Workaround shadps4-emu#2025

Author: diegolix29

src/shader_recompiler/ir/passes/resource_tracking_pass.cpp

@@ -545,18 +545,9 @@ void PatchTextureBufferArgs(IR::Block& block, IR::Inst& inst, Info& info) {
     ASSERT(!buffer.swizzle_enable && !buffer.add_tid_enable);
     IR::IREmitter ir{block, IR::Block::InstructionList::s_iterator_to(inst)};
 
-    if (inst.GetOpcode() == IR::Opcode::StoreBufferFormatF32) {
-        const auto swizzled = ApplySwizzle(ir, inst.Arg(2), buffer.DstSelect());
-        const auto converted =
-            ApplyWriteNumberConversionVec4(ir, swizzled, buffer.GetNumberConversion());
-        inst.SetArg(2, converted);
-    } else if (inst.GetOpcode() == IR::Opcode::LoadBufferFormatF32) {
+    if (inst.GetOpcode() == IR::Opcode::LoadBufferFormatF32) {
         const auto inst_info = inst.Flags<IR::BufferInstInfo>();
         const auto texel = ir.LoadBufferFormat(inst.Arg(0), inst.Arg(1), inst_info);
-        const auto swizzled = ApplySwizzle(ir, texel, buffer.DstSelect());
-        const auto converted =
-            ApplyReadNumberConversionVec4(ir, swizzled, buffer.GetNumberConversion());
-        inst.ReplaceUsesWith(converted);
     }
 }
 
@@ -825,7 +816,6 @@ void PatchImageArgs(IR::Block& block, IR::Inst& inst, Info& info) {
         auto texel = ir.ImageRead(handle, coords, lod, ms, inst_info);
         if (is_storage) {
             // Storage image requires shader swizzle.
-            texel = ApplySwizzle(ir, texel, image.DstSelect());
         }
         const auto converted =
             ApplyReadNumberConversionVec4(ir, texel, image.GetNumberConversion());
@@ -839,7 +829,6 @@ void PatchImageArgs(IR::Block& block, IR::Inst& inst, Info& info) {
             auto texel = inst.Arg(4);
             if (is_storage) {
                 // Storage image requires shader swizzle.
-                texel = ApplySwizzle(ir, texel, image.DstSelect());
             }
             const auto converted =
                 ApplyWriteNumberConversionVec4(ir, texel, image.GetNumberConversion());
@@ -882,4 +871,4 @@ void ResourceTrackingPass(IR::Program& program) {
     }
 }
 
-} // namespace Shader::Optimization
+} // namespace Shader::Optimization