Merged the D3D9 debugger into VideoCommon/VideoUICommon:

Separated UI from debugger functionality. Generally cleaned up that stuff.
Most functionality needs to be reimplemented now, but will be available to D3D9, D3D11 as well as OpenGL then.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6523 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/VideoCommon/CMakeLists.txt

@@ -3,6 +3,7 @@ set(SRCS	Src/BPMemory.cpp
 			Src/BPStructs.cpp
 			Src/CommandProcessor.cpp
 			Src/CPMemory.cpp
+			Src/Debugger.cpp
 			Src/DLCache.cpp
 			Src/Fifo.cpp
 			Src/FramebufferManagerBase.cpp

Source/Core/VideoCommon/Src/Debugger.cpp

@@ -0,0 +1,173 @@
+// Copyright (C) 2003 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+
+#include "IniFile.h"
+#include "Debugger.h"
+#include "FileUtil.h"
+
+#include "VideoConfig.h"
+#include "TextureCacheBase.h"
+#include "PixelShaderGen.h"
+#include "VertexShaderGen.h"
+#include "NativeVertexFormat.h"
+
+GFXDebuggerBase *g_pdebugger = NULL;
+volatile bool GFXDebuggerPauseFlag = false;
+volatile PauseEvent GFXDebuggerToPauseAtNext = NOT_PAUSE;
+volatile int GFXDebuggerEventToPauseCount = 0;
+
+void UpdateFPSDisplay(const char *text);
+extern NativeVertexFormat *g_nativeVertexFmt;
+
+void GFXDebuggerUpdateScreen()
+{
+	// TODO: Implement this in a plugin-independent way
+/*	// update screen
+	if (D3D::bFrameInProgress)
+	{
+		D3D::dev->SetRenderTarget(0, D3D::GetBackBufferSurface());
+		D3D::dev->SetDepthStencilSurface(NULL);
+
+		D3D::dev->StretchRect(FramebufferManager::GetEFBColorRTSurface(), NULL,
+			D3D::GetBackBufferSurface(), NULL,
+			D3DTEXF_LINEAR);
+
+		D3D::dev->EndScene();
+		D3D::dev->Present(NULL, NULL, NULL, NULL);
+
+		D3D::dev->SetRenderTarget(0, FramebufferManager::GetEFBColorRTSurface());
+		D3D::dev->SetDepthStencilSurface(FramebufferManager::GetEFBDepthRTSurface());
+		D3D::dev->BeginScene();
+	}
+	else
+	{
+		D3D::dev->EndScene();
+		D3D::dev->Present(NULL, NULL, NULL, NULL);
+		D3D::dev->BeginScene();
+	}*/
+}
+
+void GFXDebuggerCheckAndPause(bool update)
+{
+	if (GFXDebuggerPauseFlag)
+	{
+		g_pdebugger->OnPause();
+		while( GFXDebuggerPauseFlag )
+		{
+			UpdateFPSDisplay("Paused by Video Debugger");
+
+			if (update)	GFXDebuggerUpdateScreen();
+			Sleep(5);
+		}
+		g_pdebugger->OnContinue();
+	}
+}
+
+void GFXDebuggerToPause(bool update)
+{
+	GFXDebuggerToPauseAtNext = NOT_PAUSE;
+	GFXDebuggerPauseFlag = true;
+	GFXDebuggerCheckAndPause(update);
+}
+
+void ContinueGFXDebugger()
+{
+	GFXDebuggerPauseFlag = false;
+}
+
+
+void GFXDebuggerBase::DumpPixelShader(const char* path)
+{
+	char filename[MAX_PATH];
+	sprintf(filename, "%s/dump_ps.txt", path);
+
+	std::string output;
+	bool useDstAlpha = bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate && bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;
+	if (!useDstAlpha)
+	{
+		output = "Destination alpha disabled:\n";
+		output += GeneratePixelShaderCode(DSTALPHA_NONE, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
+	}
+	else
+	{
+		if(g_ActiveConfig.backend_info.bSupportsDualSourceBlend)
+		{
+			output = "Using dual source blending for destination alpha:\n";
+			output += GeneratePixelShaderCode(DSTALPHA_DUAL_SOURCE_BLEND, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
+		}
+		else
+		{
+			output = "Using two passes for emulating destination alpha:\n";
+			output += GeneratePixelShaderCode(DSTALPHA_NONE, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
+			output += "\n\nDestination alpha pass shader:\n";
+			output += GeneratePixelShaderCode(DSTALPHA_ALPHA_PASS, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
+		}
+	}
+
+	File::CreateEmptyFile(filename);
+	File::WriteStringToFile(true, output.c_str(), filename);
+}
+
+void GFXDebuggerBase::DumpVertexShader(const char* path)
+{
+	char filename[MAX_PATH];
+	sprintf(filename, "%s/dump_vs_consts.txt", path);
+
+	File::CreateEmptyFile(filename);
+	File::WriteStringToFile(true, GenerateVertexShaderCode(g_nativeVertexFmt->m_components, g_ActiveConfig.backend_info.APIType), filename);
+}
+
+void GFXDebuggerBase::DumpPixelShaderConstants(const char* path)
+{
+	// TODO
+}
+
+void GFXDebuggerBase::DumpVertexShaderConstants(const char* path)
+{
+	// TODO
+}
+
+void GFXDebuggerBase::DumpTextures(const char* path)
+{
+	// TODO
+}
+
+void GFXDebuggerBase::DumpFrameBuffer(const char* path)
+{
+	// TODO
+}
+
+void GFXDebuggerBase::DumpGeometry(const char* path)
+{
+	// TODO
+}
+
+void GFXDebuggerBase::DumpVertexDecl(const char* path)
+{
+	// TODO
+}
+
+void GFXDebuggerBase::DumpMatrices(const char* path)
+{
+	// TODO
+}
+
+void GFXDebuggerBase::DumpStats(const char* path)
+{
+	// TODO
+}

Source/Core/VideoCommon/Src/Debugger.h

@@ -0,0 +1,90 @@
+// Copyright (C) 2003 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#ifndef _GFX_DEBUGGER_H_
+#define _GFX_DEBUGGER_H_
+
+class GFXDebuggerBase
+{
+public:
+	// if paused, debugging functions can be enabled
+	virtual void OnPause() {};
+	virtual void OnContinue() {};
+
+	void DumpPixelShader(const char* path);
+	void DumpVertexShader(const char* path);
+	void DumpPixelShaderConstants(const char* path);
+	void DumpVertexShaderConstants(const char* path);
+	void DumpTextures(const char* path);
+	void DumpFrameBuffer(const char* path);
+	void DumpGeometry(const char* path);
+	void DumpVertexDecl(const char* path);
+	void DumpMatrices(const char* path);
+	void DumpStats(const char* path);
+};
+
+enum PauseEvent {
+	NOT_PAUSE	=	0,
+	NEXT_FRAME	=	1<<0,
+	NEXT_FLUSH	=	1<<1,
+
+	NEXT_PIXEL_SHADER_CHANGE	=	1<<2,
+	NEXT_VERTEX_SHADER_CHANGE	=	1<<3,
+	NEXT_TEXTURE_CHANGE	=	1<<4,
+	NEXT_NEW_TEXTURE	=	1<<5,
+
+	NEXT_XFB_CMD	=	1<<6, // TODO
+	NEXT_EFB_CMD	=	1<<7, // TODO
+
+	NEXT_MATRIX_CMD	=	1<<8, // TODO
+	NEXT_VERTEX_CMD	=	1<<9, // TODO
+	NEXT_TEXTURE_CMD	=	1<<10, // TODO
+	NEXT_LIGHT_CMD	=	1<<11, // TODO
+	NEXT_FOG_CMD	=	1<<12, // TODO
+
+	NEXT_SET_TLUT	=	1<<13, // TODO
+
+	NEXT_ERROR	=	1<<14, // TODO
+};
+
+extern GFXDebuggerBase *g_pdebugger;
+extern volatile bool GFXDebuggerPauseFlag;
+extern volatile PauseEvent GFXDebuggerToPauseAtNext;
+extern volatile int GFXDebuggerEventToPauseCount;
+void ContinueGFXDebugger();
+void GFXDebuggerCheckAndPause(bool update);
+void GFXDebuggerToPause(bool update);
+void GFXDebuggerUpdateScreen();
+
+#undef ENABLE_GFX_DEBUGGER
+#if defined(_DEBUG) || defined(DEBUGFAST)
+#define ENABLE_GFX_DEBUGGER
+#endif
+
+#ifdef ENABLE_GFX_DEBUGGER
+#define GFX_DEBUGGER_PAUSE_AT(event,update) {if (((GFXDebuggerToPauseAtNext & event) && --GFXDebuggerEventToPauseCount<=0) || GFXDebuggerPauseFlag) GFXDebuggerToPause(update);}
+#define GFX_DEBUGGER_PAUSE_LOG_AT(event,update,dumpfunc) {if (((GFXDebuggerToPauseAtNext & event) && --GFXDebuggerEventToPauseCount<=0) || GFXDebuggerPauseFlag) {{dumpfunc};GFXDebuggerToPause(update);}}
+#define GFX_DEBUGGER_LOG_AT(event,dumpfunc) {if (( GFXDebuggerToPauseAtNext & event ) ) {{dumpfunc};}}
+#else
+// Disable debugging calls in Release build
+#define GFX_DEBUGGER_PAUSE_AT(event,update)
+#define GFX_DEBUGGER_PAUSE_LOG_AT(event,update,dumpfunc)
+#define GFX_DEBUGGER_LOG_AT(event,dumpfunc)
+#endif ENABLE_GFX_DEBUGGER
+
+
+#endif // _GFX_DEBUGGER_H_

Source/Core/VideoCommon/Src/SConscript

@@ -8,6 +8,7 @@ files = [
 	'BPStructs.cpp',
 	'CPMemory.cpp',
 	'CommandProcessor.cpp',
+	'DebuggerPanel.cpp',
 	'DLCache.cpp',
 	'Fifo.cpp',
 	'FramebufferManagerBase.cpp',

Source/Core/VideoCommon/Src/TextureCacheBase.cpp

@@ -11,6 +11,7 @@
 #include "PluginSpecs.h"
 
 #include "TextureCacheBase.h"
+#include "Debugger.h"
 
 // ugly
 extern int frameCount;
@@ -261,7 +262,6 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage,
 			hash_value = 0;
 		}
 
-		// TODO: Is the mipLevels check needed?
 		if (((entry->isRenderTarget || entry->isDynamic) && hash_value == entry->hash && address == entry->addr) 
 			|| ((address == entry->addr) && (hash_value == entry->hash) && full_format == entry->format && entry->mipLevels == maxlevel))
 		{
@@ -275,7 +275,6 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage,
 			// Might speed up movie playback very, very slightly.
 			texture_is_dynamic = (entry->isRenderTarget || entry->isDynamic) && !g_ActiveConfig.bCopyEFBToTexture;
 
-			// TODO: Is the mipLevels check needed?
 			if (!entry->isRenderTarget &&
 				((!entry->isDynamic && width == entry->realW && height == entry->realH && full_format == entry->format && entry->mipLevels == maxlevel)
 				|| (entry->isDynamic && entry->realW == width && entry->realH == height)))
@@ -331,6 +330,8 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage,
 		// e.g. if our texture cache entry got too many mipmap levels we can limit the number of used levels by setting the appropriate render states
 		// Thus, we don't update this member for every Load, but just whenever the texture gets recreated
 		entry->mipLevels = maxlevel;
+
+		GFX_DEBUGGER_PAUSE_AT(NEXT_NEW_TEXTURE, true);
 	}
 
 	entry->addr = address;
@@ -412,6 +413,8 @@ return_entry:
 	entry->frameCount = frameCount;
 	entry->Bind(stage);
 
+	GFX_DEBUGGER_PAUSE_AT(NEXT_TEXTURE_CHANGE, true);
+
 	return entry;
 }
 

Source/Core/VideoCommon/Src/VideoConfig.h

@@ -158,6 +158,7 @@ struct VideoConfig
 		bool bSupportsRealXFB;
 		bool bSupports3DVision;
 		bool bAllowSignedBytes; // D3D9 doesn't support signed bytes (?)
+		bool bSupportsDualSourceBlend; // only supported by D3D11 and OpenGL
 	} backend_info;
 };
 

Source/Core/VideoCommon/VideoCommon.vcproj

@@ -734,6 +734,14 @@
 		<Filter
 			Name="Base"
 			>
+			<File
+				RelativePath=".\Src\Debugger.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Debugger.h"
+				>
+			</File>
 			<File
 				RelativePath=".\Src\FramebufferManagerBase.cpp"
 				>

Source/Core/VideoUICommon/CMakeLists.txt

@@ -1,4 +1,5 @@
-set(SRCS	Src/VideoConfigDiag.cpp)
+set(SRCS	Src/VideoConfigDiag.cpp
+		Src/DebuggerPanel.cpp)
 
 add_library(videouicommon STATIC ${SRCS})
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")

Source/Core/VideoUICommon/Src/DebuggerPanel.cpp

@@ -0,0 +1,341 @@
+// Copyright (C) 2003 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+
+#include "IniFile.h"
+#include "DebuggerPanel.h"
+#include "FileUtil.h"
+
+#include "VideoConfig.h"
+#include "TextureCacheBase.h"
+#include "PixelShaderGen.h"
+#include "VertexShaderGen.h"
+#include "NativeVertexFormat.h"
+
+extern PLUGIN_GLOBALS* globals;
+
+BEGIN_EVENT_TABLE(GFXDebuggerPanel, wxPanel)
+	EVT_CLOSE(GFXDebuggerPanel::OnClose)
+	EVT_BUTTON(ID_PAUSE,GFXDebuggerPanel::OnPauseButton)
+	EVT_BUTTON(ID_PAUSE_AT_NEXT,GFXDebuggerPanel::OnPauseAtNextButton)
+	EVT_BUTTON(ID_PAUSE_AT_NEXT_FRAME,GFXDebuggerPanel::OnPauseAtNextFrameButton)
+	EVT_BUTTON(ID_CONT,GFXDebuggerPanel::OnContButton)
+	EVT_BUTTON(ID_DUMP,GFXDebuggerPanel::OnDumpButton)
+	EVT_BUTTON(ID_UPDATE_SCREEN,GFXDebuggerPanel::OnUpdateScreenButton)
+	EVT_BUTTON(ID_CLEAR_SCREEN,GFXDebuggerPanel::OnClearScreenButton)
+	EVT_BUTTON(ID_CLEAR_TEXTURE_CACHE,GFXDebuggerPanel::OnClearTextureCacheButton)
+	EVT_BUTTON(ID_CLEAR_VERTEX_SHADER_CACHE,GFXDebuggerPanel::OnClearVertexShaderCacheButton)
+	EVT_BUTTON(ID_CLEAR_PIXEL_SHADER_CACHE,GFXDebuggerPanel::OnClearPixelShaderCacheButton)
+END_EVENT_TABLE()
+
+
+GFXDebuggerPanel::GFXDebuggerPanel(wxWindow *parent, wxWindowID id, const wxPoint &position,
+									const wxSize& size, long style, const wxString &title)
+	: wxPanel(parent, id, position, size, style, title)
+{
+	CreateGUIControls();
+
+	LoadSettings();
+}
+
+GFXDebuggerPanel::~GFXDebuggerPanel()
+{
+	SaveSettings();
+}
+
+void GFXDebuggerPanel::OnClose(wxCloseEvent& event)
+{
+	// save the window position when we hide the window
+	SaveSettings();
+
+	event.Skip(); // This means wxDialog's Destroy is used
+}
+
+void GFXDebuggerPanel::SaveSettings() const
+{
+	IniFile file;
+	file.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
+
+	// TODO: make this work when we close the entire program too, currently on total close we get
+	// weird values, perhaps because of some conflict with the rendering window
+	// TODO: get the screen resolution and make limits from that
+	if (GetPosition().x < 1000 && GetPosition().y < 1000
+		                       && GetSize().GetWidth() < 1000 
+							   && GetSize().GetHeight() < 1000)
+	{
+		file.Set("VideoWindow", "x", GetPosition().x);
+		file.Set("VideoWindow", "y", GetPosition().y);
+		file.Set("VideoWindow", "w", GetSize().GetWidth());
+		file.Set("VideoWindow", "h", GetSize().GetHeight());
+	}
+
+	file.Save(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
+}
+
+void GFXDebuggerPanel::LoadSettings()
+{
+	IniFile file;
+	file.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
+
+	int x = 100, y = 100, w = 100, h = 100;
+	file.Get("VideoWindow", "x", &x, GetPosition().x);
+	file.Get("VideoWindow", "y", &y, GetPosition().y);
+	file.Get("VideoWindow", "w", &w, GetSize().GetWidth());
+	file.Get("VideoWindow", "h", &h, GetSize().GetHeight());
+	SetSize(x, y, w, h);
+}
+
+struct PauseEventMap
+{
+	PauseEvent event;
+	const wxString ListStr;
+};
+
+static PauseEventMap pauseEventMap[] = {
+	{NEXT_FRAME,				wxT("Frame")},
+	{NEXT_FLUSH,				wxT("Flush")},
+
+	{NEXT_PIXEL_SHADER_CHANGE,	wxT("Pixel Shader")},
+	{NEXT_VERTEX_SHADER_CHANGE,	wxT("Vertex Shader")},
+	{NEXT_TEXTURE_CHANGE,		wxT("Texture")},
+	{NEXT_NEW_TEXTURE,			wxT("New Texture")},
+
+	{NEXT_XFB_CMD,				wxT("XFB Cmd")},
+	{NEXT_EFB_CMD,				wxT("EFB Cmd")},
+
+	{NEXT_MATRIX_CMD,			wxT("Matrix Cmd")},
+	{NEXT_VERTEX_CMD,			wxT("Vertex Cmd")},
+	{NEXT_TEXTURE_CMD,			wxT("Texture Cmd")},
+	{NEXT_LIGHT_CMD,			wxT("Light Cmd")},
+	{NEXT_FOG_CMD,				wxT("Fog Cmd")},
+
+	{NEXT_SET_TLUT,				wxT("TLUT Cmd")},
+
+	{NEXT_ERROR,				wxT("Error")}
+};
+static const int numPauseEventMap = sizeof(pauseEventMap)/sizeof(PauseEventMap);
+
+void GFXDebuggerPanel::CreateGUIControls()
+{
+	g_pdebugger = this;
+
+	// Basic settings
+	CenterOnParent();
+
+	// MainPanel
+	m_MainPanel = new wxPanel(this, ID_MAINPANEL, wxDefaultPosition, wxDefaultSize);
+
+	m_pButtonPause = new wxButton(m_MainPanel, ID_PAUSE, wxT("Pause"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Pause"));
+	m_pButtonPauseAtNext = new wxButton(m_MainPanel, ID_PAUSE_AT_NEXT, wxT("Pause At Next"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Pause At Next"));
+	m_pButtonPauseAtNextFrame = new wxButton(m_MainPanel, ID_PAUSE_AT_NEXT_FRAME, wxT("Next Frame"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Next Frame"));
+	m_pButtonCont = new wxButton(m_MainPanel, ID_CONT, wxT("Continue"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Continue"));
+
+	m_pPauseAtList = new wxChoice(m_MainPanel, ID_PAUSE_AT_LIST, wxDefaultPosition, wxSize(100,25), 0, NULL,0,wxDefaultValidator, wxT("PauseAtList"));
+	for (int i=0; i<numPauseEventMap; i++)
+	{
+		m_pPauseAtList->Append(pauseEventMap[i].ListStr);
+	}
+
+	m_pPauseAtList->SetSelection(0);
+
+	m_pButtonDump = new wxButton(m_MainPanel, ID_DUMP, wxT("Dump"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Dump"));
+	m_pButtonUpdateScreen = new wxButton(m_MainPanel, ID_UPDATE_SCREEN, wxT("Update Screen"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Update Screen"));
+	m_pButtonClearScreen = new wxButton(m_MainPanel, ID_CLEAR_SCREEN, wxT("Clear Screen"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Clear Screen"));
+	m_pButtonClearTextureCache = new wxButton(m_MainPanel, ID_CLEAR_TEXTURE_CACHE, wxT("Clear Textures"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Clear Textures"));
+	m_pButtonClearVertexShaderCache = new wxButton(m_MainPanel, ID_CLEAR_VERTEX_SHADER_CACHE, wxT("Clear V Shaders"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Clear V Shaders"));
+	m_pButtonClearPixelShaderCache = new wxButton(m_MainPanel, ID_CLEAR_PIXEL_SHADER_CACHE, wxT("Clear P Shaders"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Clear P Shaders"));
+	m_pCount = new wxTextCtrl(m_MainPanel, ID_COUNT, wxT("1"), wxDefaultPosition, wxSize(50,25), 0, wxDefaultValidator, wxT("Count"));
+
+	m_pDumpList = new wxChoice(m_MainPanel, ID_DUMP_LIST, wxDefaultPosition, wxSize(120,25), 0, NULL,0,wxDefaultValidator, wxT("DumpList"));
+	m_pDumpList->Insert(wxT("Pixel Shader"),0);
+	m_pDumpList->Append(wxT("Vertex Shader"));
+	m_pDumpList->Append(wxT("Pixel Shader Constants"));
+	m_pDumpList->Append(wxT("Vertex Shader Constants"));
+	m_pDumpList->Append(wxT("Textures"));
+	m_pDumpList->Append(wxT("Frame Buffer"));
+	m_pDumpList->Append(wxT("Geometry data"));
+	m_pDumpList->Append(wxT("Vertex Description"));
+	m_pDumpList->Append(wxT("Vertex Matrices"));
+	m_pDumpList->Append(wxT("Statistics"));
+	m_pDumpList->SetSelection(0);
+
+	// Layout everything on m_MainPanel
+	wxBoxSizer *sMain = new wxBoxSizer(wxVERTICAL);
+
+	sMain->Add(m_pButtonPause, 0, 0, 5);
+	sMain->Add(m_pButtonPauseAtNext, 0, 0, 5);
+	sMain->Add(m_pCount,0,0,5);
+	sMain->Add(m_pPauseAtList, 0, 0, 5);
+	sMain->Add(m_pButtonDump, 0, 0, 5);
+	sMain->Add(m_pDumpList, 0, 0, 5);
+	sMain->Add(m_pButtonUpdateScreen, 0, 0, 5);
+	sMain->Add(m_pButtonClearScreen, 0, 0, 5);
+	sMain->Add(m_pButtonClearTextureCache, 0, 0, 5);
+	sMain->Add(m_pButtonClearVertexShaderCache, 0, 0, 5);
+	sMain->Add(m_pButtonClearPixelShaderCache, 0, 0, 5);
+	sMain->Add(m_pButtonPauseAtNextFrame, 0, 0, 5);
+	sMain->Add(m_pButtonCont, 0, 0, 5);
+	m_MainPanel->SetSizerAndFit(sMain);
+	Fit();
+
+	OnContinue();
+}
+
+void GFXDebuggerPanel::OnPause()
+{
+	m_pButtonDump->Enable(true);
+	m_pButtonUpdateScreen->Enable(true);
+	m_pButtonClearScreen->Enable(true);
+	m_pButtonClearTextureCache->Enable(true);
+	m_pButtonClearVertexShaderCache->Enable(true);
+	m_pButtonClearPixelShaderCache->Enable(true);
+}
+
+void GFXDebuggerPanel::OnContinue()
+{
+	m_pButtonDump->Enable(false);
+	m_pButtonUpdateScreen->Enable(false);
+	m_pButtonClearScreen->Enable(false);
+	m_pButtonClearTextureCache->Enable(false);
+	m_pButtonClearVertexShaderCache->Enable(false);
+	m_pButtonClearPixelShaderCache->Enable(false);
+}
+
+
+// General settings
+void GFXDebuggerPanel::GeneralSettings(wxCommandEvent& event)
+{
+	SaveSettings();
+}
+
+void GFXDebuggerPanel::OnPauseButton(wxCommandEvent& event)
+{
+	GFXDebuggerPauseFlag = true;
+}
+
+void GFXDebuggerPanel::OnPauseAtNextButton(wxCommandEvent& event)
+{
+	GFXDebuggerPauseFlag = false;
+	GFXDebuggerToPauseAtNext = pauseEventMap[m_pPauseAtList->GetSelection()].event;
+	wxString val = m_pCount->GetValue();
+	long value;
+	if (val.ToLong(&value))
+		GFXDebuggerEventToPauseCount = value;
+	else
+		GFXDebuggerEventToPauseCount = 1;
+}
+
+void GFXDebuggerPanel::OnPauseAtNextFrameButton(wxCommandEvent& event)
+{
+	GFXDebuggerPauseFlag = false;
+	GFXDebuggerToPauseAtNext = NEXT_FRAME;
+	GFXDebuggerEventToPauseCount = 1;
+}
+
+void GFXDebuggerPanel::OnDumpButton(wxCommandEvent& event)
+{
+	char dump_path[MAX_PATH];
+	sprintf(dump_path, "%sDebug/%s", File::GetUserPath(D_DUMP_IDX), globals->unique_id);
+	if (!File::Exists(dump_path) || !File::IsDirectory(dump_path))
+		if (!File::CreateDir(dump_path))
+			return;
+
+	switch (m_pDumpList->GetSelection())
+	{
+		case 0: // Pixel Shader
+			DumpPixelShader(dump_path);
+			break;
+
+		case 1: // Vertex Shader
+			DumpVertexShader(dump_path);
+			break;
+
+		case 2: // Pixel Shader Constants
+			DumpPixelShaderConstants(dump_path);
+			wxMessageBox(wxT("Not implemented"), wxT("Error"), wxOK);
+			break;
+
+		case 3: // Vertex Shader Constants
+			DumpVertexShaderConstants(dump_path);
+			wxMessageBox(wxT("Not implemented"), wxT("Error"), wxOK);
+			break;
+
+		case 4: // Textures
+			DumpTextures(dump_path);
+			wxMessageBox(wxT("Not implemented"), wxT("Error"), wxOK);
+			break;
+
+		case 5: // Frame Buffer
+			DumpFrameBuffer(dump_path);
+			wxMessageBox(wxT("Not implemented"), wxT("Error"), wxOK);
+			break;
+
+		case 6: // Geometry
+			DumpGeometry(dump_path);
+			wxMessageBox(wxT("Not implemented"), wxT("Error"), wxOK);
+			break;
+
+		case 7: // Vertex Description
+			DumpVertexDecl(dump_path);
+			wxMessageBox(wxT("Not implemented"), wxT("Error"), wxOK);
+			break;
+
+		case 8: // Vertex Matrices
+			DumpMatrices(dump_path);
+			wxMessageBox(wxT("Not implemented"), wxT("Error"), wxOK);
+			break;
+
+		case 9: // Statistics
+			DumpStats(dump_path);
+			wxMessageBox(wxT("Not implemented"), wxT("Error"), wxOK);
+			break;
+	}
+}
+
+void GFXDebuggerPanel::OnContButton(wxCommandEvent& event)
+{
+	GFXDebuggerToPauseAtNext = NOT_PAUSE;
+	GFXDebuggerPauseFlag = false;
+}
+
+void GFXDebuggerPanel::OnClearScreenButton(wxCommandEvent& event)
+{
+	// TODO
+	wxMessageBox(wxT("Not implemented"), wxT("Error"), wxOK);
+}
+
+void GFXDebuggerPanel::OnClearTextureCacheButton(wxCommandEvent& event)
+{
+	TextureCache::Invalidate(false);
+}
+
+void GFXDebuggerPanel::OnClearVertexShaderCacheButton(wxCommandEvent& event)
+{
+	// TODO
+	wxMessageBox(wxT("Not implemented"), wxT("Error"), wxOK);
+}
+
+void GFXDebuggerPanel::OnClearPixelShaderCacheButton(wxCommandEvent& event)
+{
+	// TODO
+	wxMessageBox(wxT("Not implemented"), wxT("Error"), wxOK);
+}
+
+void GFXDebuggerPanel::OnUpdateScreenButton(wxCommandEvent& event)
+{
+	GFXDebuggerUpdateScreen();
+}

Source/Core/VideoUICommon/Src/DebuggerPanel.h

@@ -0,0 +1,105 @@
+// Copyright (C) 2003 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#ifndef _GFX_DEBUGGER_PANEL_H_
+#define _GFX_DEBUGGER_PANEL_H_
+
+#include <wx/wx.h>
+#include <wx/notebook.h>
+#include "Debugger.h"
+
+class GFXDebuggerPanel : public wxPanel, public GFXDebuggerBase
+{
+public:
+	GFXDebuggerPanel(wxWindow *parent,
+		wxWindowID id = wxID_ANY,
+		const wxPoint& pos = wxDefaultPosition,
+		const wxSize& size = wxDefaultSize,
+		long style = wxTAB_TRAVERSAL,
+		const wxString &title = wxT("GFX Debugger"));
+
+	virtual ~GFXDebuggerPanel();
+
+	void SaveSettings() const;
+	void LoadSettings();
+
+	bool bInfoLog;
+	bool bPrimLog;
+	bool bSaveTextures;
+	bool bSaveTargets;
+	bool bSaveShaders;
+
+	void OnPause();
+	void OnContinue();
+
+private:
+	DECLARE_EVENT_TABLE();
+
+	wxPanel *m_MainPanel;
+
+	wxButton	*m_pButtonPause;
+	wxButton	*m_pButtonPauseAtNext;
+	wxButton	*m_pButtonPauseAtNextFrame;
+	wxButton	*m_pButtonCont;
+	wxChoice	*m_pPauseAtList;
+	wxButton	*m_pButtonDump;
+	wxChoice	*m_pDumpList;
+	wxButton	*m_pButtonUpdateScreen;
+	wxButton	*m_pButtonClearScreen;
+	wxButton	*m_pButtonClearTextureCache;
+	wxButton	*m_pButtonClearVertexShaderCache;
+	wxButton	*m_pButtonClearPixelShaderCache;
+	wxTextCtrl	*m_pCount;
+
+
+	// TODO: Prefix with GFX_
+	enum
+	{
+		ID_MAINPANEL = 3900,
+		ID_CONT,
+		ID_PAUSE,
+		ID_PAUSE_AT_NEXT,
+		ID_PAUSE_AT_NEXT_FRAME,
+		ID_PAUSE_AT_LIST,
+		ID_DUMP,
+		ID_DUMP_LIST,
+		ID_UPDATE_SCREEN,
+		ID_CLEAR_SCREEN,
+		ID_CLEAR_TEXTURE_CACHE,
+		ID_CLEAR_VERTEX_SHADER_CACHE,
+		ID_CLEAR_PIXEL_SHADER_CACHE,
+		ID_COUNT
+	};
+
+	void OnClose(wxCloseEvent& event);		
+	void CreateGUIControls();
+
+	void GeneralSettings(wxCommandEvent& event);
+	void OnPauseButton(wxCommandEvent& event);
+	void OnPauseAtNextButton(wxCommandEvent& event);
+	void OnPauseAtNextFrameButton(wxCommandEvent& event);
+	void OnDumpButton(wxCommandEvent& event);
+	void OnContButton(wxCommandEvent& event);
+	void OnUpdateScreenButton(wxCommandEvent& event);
+	void OnClearScreenButton(wxCommandEvent& event);
+	void OnClearTextureCacheButton(wxCommandEvent& event);
+	void OnClearVertexShaderCacheButton(wxCommandEvent& event);
+	void OnClearPixelShaderCacheButton(wxCommandEvent& event);
+	void OnCountEnter(wxCommandEvent& event);
+};
+
+#endif // _GFX_DEBUGGER_PANEL_H_

Source/Core/VideoUICommon/Src/SConscript

@@ -7,6 +7,7 @@ if not env['HAVE_WX']:
 
 files = [
 	'VideoConfigDiag.cpp',
+	'DebuggerPanel.cpp',
 	]
 
 env.StaticLibrary(env['local_libs'] + 'videouicommon', files)

Source/Core/VideoUICommon/VideoUICommon.vcproj

@@ -404,6 +404,14 @@
 	<References>
 	</References>
 	<Files>
+		<File
+			RelativePath=".\Src\DebuggerPanel.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\DebuggerPanel.h"
+			>
+		</File>
 		<File
 			RelativePath=".\Src\VideoConfigDiag.cpp"
 			>