mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-04 08:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix after rebase + squash

Browse Source
This commit is contained in:
Frodo Baggins 2024-10-11 12:17:19 -07:00
parent c4300dd9ac
commit e69881033e
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/shader_recompiler/ir/passes/resource_tracking_pass.cpp
View File

@ -420,18 +420,16 @@ void PatchImageSampleInstruction(IR::Block& block, IR::Inst& inst, Info& info,
if (handle.IsImmediate()) { if (handle.IsImmediate()) {
LOG_WARNING(Render_Vulkan, "Inline sampler detected"); LOG_WARNING(Render_Vulkan, "Inline sampler detected");
return descriptors.Add(SamplerResource{ return descriptors.Add(SamplerResource{
.sgpr_base = std::numeric_limits<u32>::max(), .sharp_idx = std::numeric_limits<u32>::max(),
.dword_offset = 0,
.inline_sampler = AmdGpu::Sampler{.raw0 = handle.U32()}, .inline_sampler = AmdGpu::Sampler{.raw0 = handle.U32()},
}); });
} }
// Normal sampler resource. // Normal sampler resource.
const auto ssharp_handle = handle.InstRecursive(); const auto ssharp_handle = handle.InstRecursive();
const auto& [ssharp_ud, disable_aniso] = TryDisableAnisoLod0(ssharp_handle); const auto& [ssharp_ud, disable_aniso] = TryDisableAnisoLod0(ssharp_handle);
const auto ssharp = TrackSharp(ssharp_ud); const auto ssharp = TrackSharp(ssharp_ud, info);
return descriptors.Add(SamplerResource{ return descriptors.Add(SamplerResource{
.sgpr_base = ssharp.sgpr_base, .sharp_idx = ssharp,
.dword_offset = ssharp.dword_offset,
.associated_image = image_binding, .associated_image = image_binding,
.disable_aniso = disable_aniso, .disable_aniso = disable_aniso,
}); });
@ -594,8 +592,7 @@ void PatchImageSampleInstruction(IR::Block& block, IR::Inst& inst, Info& info,
inst.ReplaceUsesWith(new_inst); inst.ReplaceUsesWith(new_inst);
} }
void PatchImageInstruction(IR::Block& block, IR::Inst& inst, Info& info, Descriptors& descriptors, void PatchImageInstruction(IR::Block& block, IR::Inst& inst, Info& info, Descriptors& descriptors) {
Shader::FlatSharpBuffer sharp_buf) {
const auto pred = [](const IR::Inst* inst) -> std::optional<const IR::Inst*> { const auto pred = [](const IR::Inst* inst) -> std::optional<const IR::Inst*> {
const auto opcode = inst->GetOpcode(); const auto opcode = inst->GetOpcode();
if (opcode == IR::Opcode::CompositeConstructU32x2 || // IMAGE_SAMPLE (image+sampler) if (opcode == IR::Opcode::CompositeConstructU32x2 || // IMAGE_SAMPLE (image+sampler)