Skip to content

Restore pixel constants dirty state handling. #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ga2mer merged 2 commits into from
Jul 24, 2025
Merged

Restore pixel constants dirty state handling. #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c3bfc4
Restore pixel constants dirty state handling.
squidbus Jul 23, 2025
d0447d5
Replace BeginRingBig with D3DDevice_BeginShaderConstantF4.
squidbus Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions MarathonRecomp/gpu/video.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4313,8 +4313,8 @@ static void FlushRenderStateForMainThread(GuestDevice* device, LocalRenderComman
dirtyFlags = device->dirtyFlags[1].get();
if (dirtyFlags != 0)
{
int startRegister = std::min(56, std::countr_zero(dirtyFlags));
int endRegister = std::min(56, 64 - std::countl_zero(dirtyFlags));
int startRegister = std::countl_zero(dirtyFlags);
int endRegister = std::min(56, 64 - std::countr_zero(dirtyFlags));

uint32_t index = startRegister * 16;
uint32_t size = (endRegister - startRegister) * 64;
Expand Down Expand Up @@ -8066,18 +8066,31 @@ int D3DDevice_EndTiling(GuestDevice* device, uint32_t flags, Rect* pResolveRects
}

GUEST_FUNCTION_HOOK(sub_82559480, D3DDevice_EndTiling);
static uint32_t g_ringBuffer;
// It's actually easier to return a buffer here than to implement BeginShaderConstantF4, then BeginShaderConstantF4 will do all the work for us and it seems fast enough on modern hardware
uint32_t BeginRingBig(GuestDevice* device, int32_t count) {
if (!g_ringBuffer) {
g_ringBuffer = g_memory.MapVirtual(g_userHeap.AllocPhysical((size_t)0x1000, 16));

int D3DDevice_BeginShaderConstantF4(GuestDevice* device, uint32_t isPixelShader, uint32_t startRegister, be<uint32_t>* cachedConstantData, be<uint32_t>* writeCombinedConstantData, uint32_t vectorCount) {
uint32_t* constants;
be<uint64_t>* dirtyFlags;
if (isPixelShader) {
constants = &device->pixelShaderFloatConstants[startRegister * 4];
dirtyFlags = &device->dirtyFlags[1];
} else {
constants = &device->vertexShaderFloatConstants[startRegister * 4];
dirtyFlags = &device->dirtyFlags[0];
}
device->dirtyFlags[0] = ~0ull; // copy all
device->dirtyFlags[1] = ~0ull;
return g_ringBuffer;

const uint32_t addr = g_memory.MapVirtual(constants);
*cachedConstantData = addr;
*writeCombinedConstantData = addr;

const uint32_t startBit = startRegister >> 2;
const uint32_t endBit = (startRegister + vectorCount - 1) >> 2;
const uint64_t dirtyFlag = ~0ull << startBit >> startBit >> (63 - endBit) << (63 - endBit);
*dirtyFlags = dirtyFlags->get() | dirtyFlag;

return 0;
}

GUEST_FUNCTION_HOOK(sub_8253E260, BeginRingBig);
GUEST_FUNCTION_HOOK(sub_825466E8, D3DDevice_BeginShaderConstantF4);

GUEST_FUNCTION_STUB(sub_8254D598); // BeginConditional
GUEST_FUNCTION_STUB(sub_8254D7B0); // BeginConditional
Expand Down
Loading