Merge pull request hrydgard#19731 from hrydgard/ge-debugger-refactor

GE debugger refactor: Have GPUCommon own more of the debugging data
EmulatorJS · Dec 15, 2024 · b608257 · b608257
2 parents 72ee027 + 4223bcf
commit b608257
Show file tree

Hide file tree

Showing 36 changed files with 430 additions and 404 deletions.
diff --git a/Core/Core.cpp b/Core/Core.cpp
@@ -187,7 +187,7 @@ void Core_RunLoopUntil(u64 globalticks) {
 		case CORE_RUNNING_GE:
 			switch (gpu->ProcessDLQueue()) {
 			case DLResult::DebugBreak:
-				GPUStepping::EnterStepping();
+				GPUStepping::EnterStepping(coreState);
 				break;
 			case DLResult::Error:
 				// We should elegantly report the error somehow, or I guess ignore it.

diff --git a/Core/Debugger/WebSocket/GPURecordSubscriber.cpp b/Core/Debugger/WebSocket/GPURecordSubscriber.cpp
@@ -21,6 +21,8 @@
 #include "Core/Debugger/WebSocket/WebSocketUtils.h"
 #include "Core/System.h"
 #include "GPU/Debugger/Record.h"
+#include "GPU/GPU.h"
+#include "GPU/Common/GPUDebugInterface.h"
 
 struct WebSocketGPURecordState : public DebuggerSubscriber {
 	~WebSocketGPURecordState();
@@ -44,7 +46,7 @@ DebuggerSubscriber *WebSocketGPURecordInit(DebuggerEventHandlerMap &map) {
 WebSocketGPURecordState::~WebSocketGPURecordState() {
 	// Clear the callback to hopefully avoid a crash.
 	if (pending_)
-		GPURecord::ClearCallback();
+		gpuDebug->GetRecorder()->ClearCallback();
 }
 
 // Begin recording (gpu.record.dump)
@@ -60,7 +62,7 @@ void WebSocketGPURecordState::Dump(DebuggerRequest &req) {
 		return req.Fail("CPU not started");
 	}
 
-	bool result = GPURecord::RecordNextFrame([=](const Path &filename) {
+	bool result = gpuDebug->GetRecorder()->RecordNextFrame([=](const Path &filename) {
 		lastFilename_ = filename;
 		pending_ = false;
 	});

diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp
@@ -676,7 +676,7 @@ void __DisplayFlip(int cyclesLate) {
 		// 4 here means 1 drawn, 4 skipped - so 12 fps minimum.
 		maxFrameskip = frameSkipNum;
 	}
-	if (numSkippedFrames >= maxFrameskip || GPURecord::IsActivePending()) {
+	if (numSkippedFrames >= maxFrameskip || gpuDebug->GetRecorder()->IsActivePending()) {
 		skipFrame = false;
 	}
 

diff --git a/GPU/Common/FramebufferManagerCommon.cpp b/GPU/Common/FramebufferManagerCommon.cpp
@@ -140,14 +140,14 @@ bool FramebufferManagerCommon::PresentedThisFrame() const {
 	return presentation_->PresentedThisFrame();
 }
 
-void FramebufferManagerCommon::SetDisplayFramebuffer(u32 framebuf, u32 stride, GEBufferFormat format) {
+void FramebufferManagerCommon::SetDisplayFramebuffer(u32 framebuf, u32 stride, GEBufferFormat format, GPURecord::Recorder *recorder) {
 	displayFramebufPtr_ = framebuf & 0x3FFFFFFF;
 	if (Memory::IsVRAMAddress(displayFramebufPtr_))
 		displayFramebufPtr_ = framebuf & 0x041FFFFF;
 	displayStride_ = stride;
 	displayFormat_ = format;
 	GPUDebug::NotifyDisplay(framebuf, stride, format);
-	GPURecord::NotifyDisplay(framebuf, stride, format);
+	recorder->NotifyDisplay(framebuf, stride, format);
 }
 
 VirtualFramebuffer *FramebufferManagerCommon::GetVFBAt(u32 addr) const {

diff --git a/GPU/Common/FramebufferManagerCommon.h b/GPU/Common/FramebufferManagerCommon.h
@@ -273,6 +273,10 @@ namespace Draw {
 class DrawContext;
 }
 
+namespace GPURecord {
+class Recorder;
+}
+
 struct DrawPixelsEntry {
 	Draw::Texture *tex;
 	uint64_t contentsHash;
@@ -302,7 +306,7 @@ class FramebufferManagerCommon {
 
 	void Init(int msaaLevel);
 	virtual void BeginFrame();
-	void SetDisplayFramebuffer(u32 framebuf, u32 stride, GEBufferFormat format);
+	void SetDisplayFramebuffer(u32 framebuf, u32 stride, GEBufferFormat format, GPURecord::Recorder *recorder);
 	void DestroyFramebuf(VirtualFramebuffer *v);
 
 	VirtualFramebuffer *DoSetRenderFrameBuffer(FramebufferHeuristicParams &params, u32 skipDrawReason);

diff --git a/GPU/Common/GPUDebugInterface.h b/GPU/Common/GPUDebugInterface.h
@@ -34,6 +34,11 @@ class TextureCacheCommon;
 struct VirtualFramebuffer;
 struct DisplayList;
 
+namespace GPURecord {
+class Recorder;
+}
+class GPUBreakpoints;
+
 struct GPUDebugOp {
 	u32 pc;
 	u8 cmd;
@@ -239,6 +244,9 @@ class GPUDebugInterface {
 	virtual const std::list<int> &GetDisplayListQueue() = 0;
 	virtual const DisplayList &GetDisplayList(int index) = 0;
 
+	virtual GPURecord::Recorder *GetRecorder() = 0;
+	virtual GPUBreakpoints *GetBreakpoints() = 0;
+
 	virtual bool GetCurrentSimpleVertices(int count, std::vector<GPUDebugVertex> &vertices, std::vector<u16> &indices) {
 		return false;
 	}

diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp
@@ -1310,7 +1310,7 @@ void TextureCacheCommon::NotifyWriteFormattedFromMemory(u32 addr, int size, int
 	videos_.push_back({ addr, (u32)size, gpuStats.numFlips });
 }
 
-void TextureCacheCommon::LoadClut(u32 clutAddr, u32 loadBytes) {
+void TextureCacheCommon::LoadClut(u32 clutAddr, u32 loadBytes, GPURecord::Recorder *recorder) {
 	if (loadBytes == 0) {
 		// Don't accidentally overwrite clutTotalBytes_ with a zero.
 		return;
@@ -1430,7 +1430,7 @@ void TextureCacheCommon::LoadClut(u32 clutAddr, u32 loadBytes) {
 	u32 bytes = Memory::ValidSize(clutAddr, loadBytes);
 	_assert_(bytes <= 2048);
 	bool performDownload = PSP_CoreParameter().compat.flags().AllowDownloadCLUT;
-	if (GPURecord::IsActive())
+	if (recorder->IsActive())
 		performDownload = true;
 	if (clutRenderAddress_ != 0xFFFFFFFF && performDownload) {
 		framebufferManager_->DownloadFramebufferForClut(clutRenderAddress_, clutRenderOffset_ + bytes);

diff --git a/GPU/Common/TextureCacheCommon.h b/GPU/Common/TextureCacheCommon.h
@@ -63,6 +63,10 @@ class DrawContext;
 class Texture;
 }
 
+namespace GPURecord {
+class Recorder;
+}
+
 // Used by D3D11 and Vulkan, could be used by modern GL
 struct SamplerCacheKey {
 	union {
@@ -334,7 +338,7 @@ class TextureCacheCommon {
 	TextureCacheCommon(Draw::DrawContext *draw, Draw2D *draw2D);
 	virtual ~TextureCacheCommon();
 
-	void LoadClut(u32 clutAddr, u32 loadBytes);
+	void LoadClut(u32 clutAddr, u32 loadBytes, GPURecord::Recorder *recorder);
 	bool GetCurrentClutBuffer(GPUDebugBuffer &buffer);
 
 	// This updates nextTexture_ / nextFramebufferTexture_, which is then used by ApplyTexture.

diff --git a/GPU/D3D11/DrawEngineD3D11.cpp b/GPU/D3D11/DrawEngineD3D11.cpp
@@ -485,7 +485,7 @@ void DrawEngineD3D11::DoFlush() {
 
 	ResetAfterDrawInline();
 	framebufferManager_->SetColorUpdated(gstate_c.skipDrawReason);
-	GPUDebug::NotifyDraw();
+	GPUDebug::NotifyFlush();
 }
 
 TessellationDataTransferD3D11::TessellationDataTransferD3D11(ID3D11DeviceContext *context, ID3D11Device *device)