mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-16 02:59:49 +01:00
Defer post-runGe actions
This commit is contained in:
1 parent
a616486369
commit
be8c543563
5 files changed
+61
-20
No files matched your search
+29
-14
@@ -145,7 +145,12 @@ public:
|
||||
|
||||
// Hm. This might be really tricky to get to behave the same in both modes. Here we are in __KernelReschedule, CoreTiming::Advance, ProcessEvents, GeExecuteInterrupt, ... .... __RunOnePendingInterrupt
|
||||
// But not sure how much it will matter. The test pause2 hits here.
|
||||
gpu->RunGe();
|
||||
// Although, not sure we ever really execute commands here?
|
||||
if (!gpu->GetDisplayLists().empty()) {
|
||||
DEBUG_LOG(Log::sceGe, "Display lists queued after interrupt handler");
|
||||
}
|
||||
DeferredAction action{};
|
||||
gpu->RunGe(action, true); // force to run directly
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -182,7 +187,8 @@ public:
|
||||
|
||||
gpu->InterruptEnd(intrdata.listid);
|
||||
// This is the last thing done here in the syscall (__KernelReturnFromInterrupt) so switching coreState should just work.
|
||||
gpu->RunGe();
|
||||
DeferredAction action{};
|
||||
gpu->RunGe(action);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -349,11 +355,13 @@ u32 sceGeListEnQueue(u32 listAddress, u32 stallAddress, int callbackId, u32 optP
|
||||
if ((int)listID >= 0)
|
||||
listID = LIST_ID_MAGIC ^ listID;
|
||||
if (runList) {
|
||||
gpu->RunGe();
|
||||
DeferredAction action{ 490 };
|
||||
action.forceCheck = true;
|
||||
gpu->RunGe(action);
|
||||
} else {
|
||||
hleEatCycles(490);
|
||||
CoreTiming::ForceCheck();
|
||||
}
|
||||
// The stuff here below must be deferred...
|
||||
hleEatCycles(490);
|
||||
CoreTiming::ForceCheck();
|
||||
return hleLogSuccessX(Log::sceGe, listID);
|
||||
}
|
||||
|
||||
@@ -368,17 +376,20 @@ u32 sceGeListEnQueueHead(u32 listAddress, u32 stallAddress, int callbackId, u32
|
||||
if ((int)listID >= 0)
|
||||
listID = LIST_ID_MAGIC ^ listID;
|
||||
if (runList) {
|
||||
gpu->RunGe();
|
||||
DeferredAction action{ 480 };
|
||||
action.forceCheck = true;
|
||||
gpu->RunGe(action);
|
||||
} else {
|
||||
hleEatCycles(480);
|
||||
CoreTiming::ForceCheck();
|
||||
}
|
||||
hleEatCycles(480);
|
||||
CoreTiming::ForceCheck();
|
||||
return hleLogSuccessX(Log::sceGe, listID);
|
||||
}
|
||||
|
||||
static int sceGeListDeQueue(u32 listID) {
|
||||
WARN_LOG(Log::sceGe, "sceGeListDeQueue(%08x)", listID);
|
||||
int result = gpu->DequeueList(LIST_ID_MAGIC ^ listID);
|
||||
hleReSchedule("dlist dequeued");
|
||||
hleReSchedule("ListDeQueue");
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -392,7 +403,8 @@ static int sceGeListUpdateStallAddr(u32 displayListID, u32 stallAddress) {
|
||||
bool runList;
|
||||
int retval = gpu->UpdateStall(LIST_ID_MAGIC ^ displayListID, stallAddress, &runList);
|
||||
if (runList) {
|
||||
gpu->RunGe();
|
||||
DeferredAction action{};
|
||||
gpu->RunGe(action);
|
||||
}
|
||||
return retval;
|
||||
}
|
||||
@@ -419,10 +431,13 @@ static int sceGeContinue() {
|
||||
bool runList;
|
||||
int ret = gpu->Continue(&runList);
|
||||
if (runList) {
|
||||
gpu->RunGe();
|
||||
DeferredAction action{ 220 };
|
||||
action.reschedule = true;
|
||||
gpu->RunGe(action);
|
||||
} else {
|
||||
hleEatCycles(220);
|
||||
hleReSchedule("GeContinue");
|
||||
}
|
||||
hleEatCycles(220);
|
||||
hleReSchedule("ge continue");
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
@@ -643,6 +643,7 @@ void PSP_RunLoopUntil(u64 globalticks) {
|
||||
break;
|
||||
case CORE_RUNNING_GE:
|
||||
gpu->ProcessDLQueue(true);
|
||||
gpu->RunDeferredAction();
|
||||
coreState = CORE_RUNNING_CPU;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -337,7 +337,8 @@ void DumpExecute::SyncStall() {
|
||||
bool runList;
|
||||
gpu->UpdateStall(execListID, execListPos, &runList);
|
||||
if (runList) {
|
||||
gpu->RunGe();
|
||||
DeferredAction action{};
|
||||
gpu->RunGe(action, true); // force to run directly
|
||||
}
|
||||
s64 listTicks = gpu->GetListTicks(execListID);
|
||||
if (listTicks != -1) {
|
||||
@@ -372,7 +373,8 @@ bool DumpExecute::SubmitCmds(const void *p, u32 sz) {
|
||||
bool runList;
|
||||
execListID = gpu->EnqueueList(execListBuf, execListPos, -1, optParam, false, &runList);
|
||||
if (runList) {
|
||||
gpu->RunGe();
|
||||
DeferredAction action{};
|
||||
gpu->RunGe(action, true); // force to run directly
|
||||
}
|
||||
gpu->EnableInterrupts(true);
|
||||
}
|
||||
|
||||
+17
-3
@@ -552,24 +552,38 @@ u32 GPUCommon::Continue(bool *runList) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
void GPUCommon::RunGe(bool forceRunDirect) {
|
||||
void GPUCommon::RunGe(DeferredAction action, bool forceRunDirect) {
|
||||
deferredAction_ = action;
|
||||
// Old method, although may make sense for performance if the ImDebugger isn't active.
|
||||
#if 1
|
||||
// Call ProcessDLQueue directly.
|
||||
ProcessDLQueue(false);
|
||||
RunDeferredAction();
|
||||
#else
|
||||
// No sense in switching core mode if there's nothing to do, just maybe some bookkeeping.
|
||||
if (dlQueue.empty() || forceRunDirect) {
|
||||
ProcessDLQueue(false);
|
||||
RunDeferredAction();
|
||||
} else {
|
||||
// New method, will allow ImDebugger to step the GPU.
|
||||
// ARGH, what makes this different appears to be what happens AFTER the call to
|
||||
// EnqueueList inside sceGeListEnqueue. Like the cycle eating and CoreTiming forcecheck.
|
||||
// Once done, Core will call RunDeferredAction.
|
||||
Core_SwitchToGe();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void GPUCommon::RunDeferredAction() {
|
||||
if (deferredAction_.eatCycles) {
|
||||
hleEatCycles(deferredAction_.eatCycles);
|
||||
}
|
||||
if (deferredAction_.forceCheck) {
|
||||
CoreTiming::ForceCheck();
|
||||
}
|
||||
if (deferredAction_.reschedule) {
|
||||
hleReSchedule("ge deferred action");
|
||||
}
|
||||
}
|
||||
|
||||
u32 GPUCommon::Break(int mode) {
|
||||
if (mode < 0 || mode > 1)
|
||||
return SCE_KERNEL_ERROR_INVALID_MODE;
|
||||
|
||||
+10
-1
@@ -203,6 +203,12 @@ inline bool IsTrianglePrim(GEPrimitiveType prim) {
|
||||
return prim > GE_PRIM_LINE_STRIP && prim != GE_PRIM_RECTANGLES;
|
||||
}
|
||||
|
||||
struct DeferredAction {
|
||||
int eatCycles;
|
||||
bool forceCheck;
|
||||
bool reschedule;
|
||||
};
|
||||
|
||||
class GPUCommon : public GPUDebugInterface {
|
||||
public:
|
||||
GPUCommon(GraphicsContext *gfxCtx, Draw::DrawContext *draw);
|
||||
@@ -266,7 +272,8 @@ public:
|
||||
virtual void DeviceLost() = 0;
|
||||
virtual void DeviceRestore(Draw::DrawContext *draw) = 0;
|
||||
|
||||
void RunGe(bool forceRunDirect = false);
|
||||
void RunGe(DeferredAction action, bool forceRunDirect = false);
|
||||
void RunDeferredAction();
|
||||
|
||||
void DrawImGuiDebugger();
|
||||
|
||||
@@ -507,6 +514,8 @@ protected:
|
||||
std::string reportingPrimaryInfo_;
|
||||
std::string reportingFullInfo_;
|
||||
|
||||
DeferredAction deferredAction_;
|
||||
|
||||
private:
|
||||
void DoExecuteCall(u32 target);
|
||||
void PopDLQueue();
|
||||
|
||||
Reference in new issue
Block a user