raphiaura/KytyPS5
1
0
Fork 0
mirror of https://github.com/KytyPS5/KytyPS5.git synced 2026-10-28 13:56:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

shader: clear unused sampler bits after constant folding

Browse Source 
Co-authored-by: Çağatay Güçlü <33038942+defektu@users.noreply.github.com>
This commit is contained in:
nmzik
2026-10-04 22:29:05 +04:00
parent b0bbaef1eb
commit b7d3c572c1
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphics/shader/recompiler/ir/passes/ResourceTracking.cpp
+2
View File
@@ -77,6 +77,8 @@ Value CanonicalizeSampleAdjustDword3(Value value) {
value = value.Resolve(); value = value.Resolve();
const auto* inst = value.TryInstruction(); const auto* inst = value.TryInstruction();
if (inst == nullptr || inst->GetOpcode() != ValueOpcode::BitwiseOr32) { if (inst == nullptr || inst->GetOpcode() != ValueOpcode::BitwiseOr32) {
if ((PossibleU32Bits(value) & ~SamplerDword3ReservedMask) == 0)
return Value(0u);
return value; return value;
} }
const auto left = inst->Arg(0).Resolve(); const auto left = inst->Arg(0).Resolve();
tests/ResourceTrackingTests.cpp
+13
View File
@@ -1890,6 +1890,13 @@ void TestSampleAdjustSamplerScratch() {
fixture.Emit(ValueOpcode::ImageSampleRaw, fixture.Emit(ValueOpcode::ImageSampleRaw,
{image, sampler, fixture.ImageAddress()}, {image, sampler, fixture.ImageAddress()},
fixture.AddMemory(memory, 0x1ec)); fixture.AddMemory(memory, 0x1ec));
// PPSA24156's zero border payload leaves the reserved scratch shift as
// the entire DWORD after the frontend folds its OR with zero.
const auto shift_sampler = fixture.Sampler(
{Value(0x36u), Value(0xfff000u), Value(0x02500000u), scratch}, 0x200);
fixture.Emit(ValueOpcode::ImageSampleRaw,
{image, shift_sampler, fixture.ImageAddress()},
fixture.AddMemory(memory, 0x200));
fixture.PlanAndTrack(); fixture.PlanAndTrack();
const auto source = fixture.program.info.samplers[0].source; const auto source = fixture.program.info.samplers[0].source;
@@ -1905,6 +1912,12 @@ void TestSampleAdjustSamplerScratch() {
Check(SrtWalker(fixture.program, runtime).EvaluateDescriptor(source, descriptor) && Check(SrtWalker(fixture.program, runtime).EvaluateDescriptor(source, descriptor) &&
descriptor.dwords[3] == 0x80000abcu, descriptor.dwords[3] == 0x80000abcu,
"SampleAdjust canonicalization lost sampler border fields"); "SampleAdjust canonicalization lost sampler border fields");
const auto shift_source = fixture.program.info.samplers[
shift_sampler.Instruction()->Flags<uint32_t>()].source;
Check(SrtWalker(fixture.program, runtime).EvaluateDescriptor(shift_source, descriptor) &&
std::ranges::equal(std::span(descriptor.dwords).first(4),
std::array{0x36u, 0xfff000u, 0x02500000u, 0u}),
"SampleAdjust shift-only scratch was not reduced to its zero border payload");
const auto CheckRejected = [](uint32_t flags, uint32_t shift, const auto CheckRejected = [](uint32_t flags, uint32_t shift,
const char *message) { const char *message) {