diff --git a/GPU/GPU.h b/GPU/GPU.h index 7ff35b1401..d9bbed5cee 100644 --- a/GPU/GPU.h +++ b/GPU/GPU.h @@ -100,7 +100,6 @@ struct GPUStatistics { msProcessingDisplayLists = 0; vertexGPUCycles = 0; otherGPUCycles = 0; - memset(gpuCommandsAtCallLevel, 0, sizeof(gpuCommandsAtCallLevel)); } // Per frame statistics @@ -131,7 +130,6 @@ struct GPUStatistics { double msProcessingDisplayLists; int vertexGPUCycles; int otherGPUCycles; - int gpuCommandsAtCallLevel[4]; // Flip count. Doesn't really belong here. int numFlips; diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp index ad01665155..a9c4b9318c 100644 --- a/GPU/GPUCommon.cpp +++ b/GPU/GPUCommon.cpp @@ -1300,11 +1300,6 @@ void GPUCommon::UpdatePC(u32 currentPC, u32 newPC) { cyclesExecuted += 2 * executed; cycleLastPC = newPC; - if (coreCollectDebugStats) { - gpuStats.otherGPUCycles += 2 * executed; - gpuStats.gpuCommandsAtCallLevel[std::min(currentList->stackptr, 3)] += executed; - } - // Exit the runloop and recalculate things. This happens a lot in some games. if (currentList) downcount = currentList->stall == 0 ? 0x0FFFFFFF : (currentList->stall - newPC) / 4; @@ -1399,6 +1394,10 @@ void GPUCommon::ProcessDLQueue() { currentList = nullptr; + if (coreCollectDebugStats) { + gpuStats.otherGPUCycles += cyclesExecuted; + } + drawCompleteTicks = startingTicks + cyclesExecuted; busyTicks = std::max(busyTicks, drawCompleteTicks); __GeTriggerSync(GPU_SYNC_DRAW, 1, drawCompleteTicks); @@ -3457,7 +3456,6 @@ size_t GPUCommon::FormatGPUStatsCommon(char *buffer, size_t size) { "DL processing time: %0.2f ms\n" "Draw calls: %d, flushes %d, clears %d (cached: %d)\n" "Num Tracked Vertex Arrays: %d\n" - "Commands per call level: %i %i %i %i\n" "Vertices: %d cached: %d uncached: %d\n" "FBOs active: %d (evaluations: %d)\n" "Textures: %d, dec: %d, invalidated: %d, hashed: %d kB\n" @@ -3470,7 +3468,6 @@ size_t GPUCommon::FormatGPUStatsCommon(char *buffer, size_t size) { gpuStats.numClears, gpuStats.numCachedDrawCalls, gpuStats.numTrackedVertexArrays, - gpuStats.gpuCommandsAtCallLevel[0], gpuStats.gpuCommandsAtCallLevel[1], gpuStats.gpuCommandsAtCallLevel[2], gpuStats.gpuCommandsAtCallLevel[3], gpuStats.numVertsSubmitted, gpuStats.numCachedVertsDrawn, gpuStats.numUncachedVertsDrawn,