From de92db5dd31e8db4e65811c46df74800775f53d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Miko=C5=82ajczyk?= Date: Sat, 6 Apr 2013 11:09:05 +0200 Subject: [PATCH] Fix PSP_GE_DL_* in Qt debuggers --- Qt/QtHost.cpp | 1 + Qt/debugger_disasm.cpp | 31 +++++++++++++++---------------- Qt/debugger_displaylist.cpp | 18 +++++++++--------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Qt/QtHost.cpp b/Qt/QtHost.cpp index 1003a7c110..e875d29c70 100644 --- a/Qt/QtHost.cpp +++ b/Qt/QtHost.cpp @@ -18,6 +18,7 @@ std::string boot_filename = ""; Texture *uiTexture; +UIContext *uiContext; ScreenManager *screenManager; std::string config_filename; diff --git a/Qt/debugger_disasm.cpp b/Qt/debugger_disasm.cpp index 342f4aede0..abe9c43376 100644 --- a/Qt/debugger_disasm.cpp +++ b/Qt/debugger_disasm.cpp @@ -543,7 +543,7 @@ void Debugger_Disasm::UpdateDisplayListGUI() ui->displayList->clear(); EmuThread_LockDraw(true); - const std::deque& dlQueue = gpu->GetDisplayLists(); + const std::list& dlQueue = gpu->GetDisplayLists(); DisplayList* dl = gpu->GetCurrentDisplayList(); if(dl) @@ -551,14 +551,13 @@ void Debugger_Disasm::UpdateDisplayListGUI() QTreeWidgetItem* item = new QTreeWidgetItem(); item->setText(0,QString::number(dl->id)); item->setData(0, Qt::UserRole, dl->id); - switch(dl->status) + switch(dl->state) { - case PSP_GE_LIST_DONE: item->setText(1,"Done"); break; - case PSP_GE_LIST_QUEUED: item->setText(1,"Queued"); break; - case PSP_GE_LIST_DRAWING: item->setText(1,"Drawing"); break; - case PSP_GE_LIST_STALL_REACHED: item->setText(1,"Stall Reached"); break; - case PSP_GE_LIST_END_REACHED: item->setText(1,"End Reached"); break; - case PSP_GE_LIST_CANCEL_DONE: item->setText(1,"Cancel Done"); break; + case PSP_GE_DL_STATE_NONE: item->setText(1,"None"); break; + case PSP_GE_DL_STATE_QUEUED: item->setText(1,"Queued"); break; + case PSP_GE_DL_STATE_RUNNING: item->setText(1,"Running"); break; + case PSP_GE_DL_STATE_COMPLETED: item->setText(1,"Completed"); break; + case PSP_GE_DL_STATE_PAUSED: item->setText(1,"Paused"); break; default: break; } item->setText(2,QString("%1").arg(dl->startpc,8,16,QChar('0'))); @@ -573,21 +572,21 @@ void Debugger_Disasm::UpdateDisplayListGUI() } } - for(auto it = dlQueue.begin(); it != dlQueue.end(); ++it) + for(auto listIdIt = dlQueue.begin(); listIdIt != dlQueue.end(); ++listIdIt) { + DisplayList *it = gpu->getList(*listIdIt); if(dl && it->id == dl->id) continue; QTreeWidgetItem* item = new QTreeWidgetItem(); item->setText(0,QString::number(it->id)); item->setData(0, Qt::UserRole, it->id); - switch(it->status) + switch(it->state) { - case PSP_GE_LIST_DONE: item->setText(1,"Done"); break; - case PSP_GE_LIST_QUEUED: item->setText(1,"Queued"); break; - case PSP_GE_LIST_DRAWING: item->setText(1,"Drawing"); break; - case PSP_GE_LIST_STALL_REACHED: item->setText(1,"Stall Reached"); break; - case PSP_GE_LIST_END_REACHED: item->setText(1,"End Reached"); break; - case PSP_GE_LIST_CANCEL_DONE: item->setText(1,"Cancel Done"); break; + case PSP_GE_DL_STATE_NONE: item->setText(1,"None"); break; + case PSP_GE_DL_STATE_QUEUED: item->setText(1,"Queued"); break; + case PSP_GE_DL_STATE_RUNNING: item->setText(1,"Running"); break; + case PSP_GE_DL_STATE_COMPLETED: item->setText(1,"Completed"); break; + case PSP_GE_DL_STATE_PAUSED: item->setText(1,"Paused"); break; default: break; } item->setText(2,QString("%1").arg(it->startpc,8,16,QChar('0'))); diff --git a/Qt/debugger_displaylist.cpp b/Qt/debugger_displaylist.cpp index cfbc13b7e3..c2be4a0f6a 100644 --- a/Qt/debugger_displaylist.cpp +++ b/Qt/debugger_displaylist.cpp @@ -75,21 +75,21 @@ void Debugger_DisplayList::UpdateDisplayListGUI() ui->displayListData->clear(); EmuThread_LockDraw(true); - const std::deque& dlQueue = gpu->GetDisplayLists(); + const std::list& dlQueue = gpu->GetDisplayLists(); - for(auto it = dlQueue.begin(); it != dlQueue.end(); ++it) + for(auto listIdIt = dlQueue.begin(); listIdIt != dlQueue.end(); ++listIdIt) { + DisplayList *it = gpu->getList(*listIdIt); QTreeWidgetItem* item = new QTreeWidgetItem(); item->setText(0,QString::number(it->id)); item->setData(0, Qt::UserRole, it->id); - switch(it->status) + switch(it->state) { - case PSP_GE_LIST_DONE: item->setText(1,"Done"); break; - case PSP_GE_LIST_QUEUED: item->setText(1,"Queued"); break; - case PSP_GE_LIST_DRAWING: item->setText(1,"Drawing"); break; - case PSP_GE_LIST_STALL_REACHED: item->setText(1,"Stall Reached"); break; - case PSP_GE_LIST_END_REACHED: item->setText(1,"End Reached"); break; - case PSP_GE_LIST_CANCEL_DONE: item->setText(1,"Cancel Done"); break; + case PSP_GE_DL_STATE_NONE: item->setText(1,"None"); break; + case PSP_GE_DL_STATE_QUEUED: item->setText(1,"Queued"); break; + case PSP_GE_DL_STATE_RUNNING: item->setText(1,"Running"); break; + case PSP_GE_DL_STATE_COMPLETED: item->setText(1,"Completed"); break; + case PSP_GE_DL_STATE_PAUSED: item->setText(1,"Paused"); break; default: break; } item->setText(2,QString("%1").arg(it->startpc,8,16,QChar('0')));