Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add a separate button to step by op/cmd.

Browse source
This commit is contained in:
Unknown W. Brackets 2013-09-27 23:45:15 -07:00
parent ba289c1e73
commit 6f6013a6f8
3 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Windows/GEDebugger/GEDebugger.cpp
View file

@ -155,11 +155,15 @@ void CGEDebugger::UpdatePreviews() {
ERROR_LOG(COMMON, "Unable to get texture."); ERROR_LOG(COMMON, "Unable to get texture.");
texWindow->Clear(); texWindow->Clear();
} }
DisplayList list;
if (gpuDebug->GetCurrentDisplayList(list)) {
CtrlDisplayListView *displayList = CtrlDisplayListView::getFrom(GetDlgItem(m_hDlg, IDC_GEDBG_CURRENTDISPLAYLIST));
displayList->setDisplayList(list);
}
} }
BOOL CGEDebugger::DlgProc(UINT message, WPARAM wParam, LPARAM lParam) { BOOL CGEDebugger::DlgProc(UINT message, WPARAM wParam, LPARAM lParam) {
CtrlDisplayListView* displayList = CtrlDisplayListView::getFrom(GetDlgItem(m_hDlg,IDC_GEDBG_CURRENTDISPLAYLIST));
switch (message) { switch (message) {
case WM_INITDIALOG: case WM_INITDIALOG:
return TRUE; return TRUE;
@ -178,28 +182,29 @@ BOOL CGEDebugger::DlgProc(UINT message, WPARAM wParam, LPARAM lParam) {
case WM_COMMAND: case WM_COMMAND:
switch (LOWORD(wParam)) { switch (LOWORD(wParam)) {
case IDC_GEDBG_BREAK: case IDC_GEDBG_STEPDRAW:
attached = true; attached = true;
SetupPreviews(); SetupPreviews();
DisplayList list;
// todo: for some reason this sometimes fails when hitting break
// when the core is running. then only works when stepping through
// in the debugger or when the core is already paused
if (gpuDebug->GetCurrentDisplayList(list)) {
displayList->setDisplayList(list);
}
//breakNextOp = true;
pauseWait.notify_one(); pauseWait.notify_one();
breakNextOp = false;
breakNextDraw = true; breakNextDraw = true;
// TODO break;
case IDC_GEDBG_STEP:
attached = true;
SetupPreviews();
pauseWait.notify_one();
breakNextOp = true;
breakNextDraw = false;
break; break;
case IDC_GEDBG_RESUME: case IDC_GEDBG_RESUME:
frameWindow->Clear(); frameWindow->Clear();
texWindow->Clear(); texWindow->Clear();
// TODO: detach? Should probably have separate UI, or just on activate? // TODO: detach? Should probably have separate UI, or just on activate?
//breakNextOp = false; breakNextOp = false;
breakNextDraw = false; breakNextDraw = false;
pauseWait.notify_one(); pauseWait.notify_one();
break; break;

5
Windows/ppsspp.rc
View file

@ -169,8 +169,9 @@ EXSTYLE WS_EX_ACCEPTFILES | WS_EX_TOOLWINDOW
CAPTION "GE" CAPTION "GE"
FONT 8, "MS Shell Dlg", 0, 0, 0x1 FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN BEGIN
PUSHBUTTON "Break",IDC_GEDBG_BREAK,0,0,48,14 PUSHBUTTON "Step Draw",IDC_GEDBG_STEPDRAW,0,0,48,14
PUSHBUTTON "Resume",IDC_GEDBG_RESUME,52,0,48,14 PUSHBUTTON "Step Into",IDC_GEDBG_STEP,52,0,48,14
PUSHBUTTON "Resume",IDC_GEDBG_RESUME,104,0,48,14
CONTROL "",IDC_GEDBG_TEX,"SimpleGLWindow",WS_CHILD | WS_VISIBLE,10,20,128,128 CONTROL "",IDC_GEDBG_TEX,"SimpleGLWindow",WS_CHILD | WS_VISIBLE,10,20,128,128
CONTROL "",IDC_GEDBG_FRAME,"SimpleGLWindow",WS_CHILD | WS_VISIBLE,148,20,256,136 CONTROL "",IDC_GEDBG_FRAME,"SimpleGLWindow",WS_CHILD | WS_VISIBLE,148,20,256,136
CONTROL "",IDC_GEDBG_CURRENTDISPLAYLIST,"CtrlDisplayListView",WS_BORDER | WS_VISIBLE,10,195,456,200 CONTROL "",IDC_GEDBG_CURRENTDISPLAYLIST,"CtrlDisplayListView",WS_BORDER | WS_VISIBLE,10,195,456,200

5
Windows/resource.h
View file

@ -259,11 +259,12 @@
#define ID_OPTIONS_SCREEN9X 40114 #define ID_OPTIONS_SCREEN9X 40114
#define ID_OPTIONS_SCREEN10X 40115 #define ID_OPTIONS_SCREEN10X 40115
#define ID_DEBUG_GEDEBUGGER 40116 #define ID_DEBUG_GEDEBUGGER 40116
#define IDC_GEDBG_BREAK 40117 #define IDC_GEDBG_STEPDRAW 40117
#define IDC_GEDBG_RESUME 40118 #define IDC_GEDBG_RESUME 40118
#define IDC_GEDBG_FRAME 40119 #define IDC_GEDBG_FRAME 40119
#define IDC_GEDBG_CURRENTDISPLAYLIST 40120 #define IDC_GEDBG_CURRENTDISPLAYLIST 40120
#define IDC_GEDBG_TEX 40121 #define IDC_GEDBG_TEX 40121
#define IDC_GEDBG_STEP 40122
// Dummy option to let the buffered rendering hotkey cycle through all the options. // Dummy option to let the buffered rendering hotkey cycle through all the options.
#define ID_OPTIONS_BUFFEREDRENDERINGDUMMY 40500 #define ID_OPTIONS_BUFFEREDRENDERINGDUMMY 40500
@ -276,7 +277,7 @@
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 251 #define _APS_NEXT_RESOURCE_VALUE 251
#define _APS_NEXT_COMMAND_VALUE 40122 #define _APS_NEXT_COMMAND_VALUE 40123
#define _APS_NEXT_CONTROL_VALUE 1181 #define _APS_NEXT_CONTROL_VALUE 1181
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif