Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Linux buildfix (a bit blind.)

Browse Source
This commit is contained in:
Unknown W. Brackets committed 2013-09-29 10:46:46 -07:00
1 parent b661ae6c41
commit a2d1fd5a79
2 files changed
+23 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Qt/debugger_displaylist.cpp
+20 -13
View File
@@ -1458,21 +1458,24 @@ void Debugger_DisplayList::on_displayList_itemClicked(QTreeWidgetItem *item, int
void Debugger_DisplayList::on_stepBtn_clicked()
{
host->SetGPUStep(true);
host->NextGPUStep();
QtHost *qthost = (QtHost *)host;
qthost->SetGPUStep(true);
qthost->NextGPUStep();
}
void Debugger_DisplayList::on_runBtn_clicked()
{
ui->displayList->clear();
ui->displayListData->clear();
host->SetGPUStep(false);
host->NextGPUStep();
QtHost *qthost = (QtHost *)host;
qthost->SetGPUStep(false);
qthost->NextGPUStep();
}
void Debugger_DisplayList::on_stopBtn_clicked()
{
host->SetGPUStep(true);
QtHost *qthost = (QtHost *)host;
qthost->SetGPUStep(true);
}
void Debugger_DisplayList::UpdateRenderBuffer()
@@ -1536,8 +1539,9 @@ void Debugger_DisplayList::UpdateRenderBufferGUI()
void Debugger_DisplayList::on_nextDrawBtn_clicked()
{
host->SetGPUStep(true, 1);
host->NextGPUStep();
QtHost *qthost = (QtHost *)host;
qthost->SetGPUStep(true, 1);
qthost->NextGPUStep();
}
void Debugger_DisplayList::on_gotoPCBtn_clicked()
@@ -1610,8 +1614,9 @@ void Debugger_DisplayList::on_fboList_itemClicked(QTreeWidgetItem *item, int col
void Debugger_DisplayList::on_nextDLBtn_clicked()
{
host->SetGPUStep(true,-1);
host->NextGPUStep();
QtHost *qthost = (QtHost *)host;
qthost->SetGPUStep(true,-1);
qthost->NextGPUStep();
}
void Debugger_DisplayList::setCurrentFBO(u32 addr)
@@ -1800,8 +1805,9 @@ void Debugger_DisplayList::on_displayListData_customContextMenuRequested(const Q
void Debugger_DisplayList::RunToDLPC()
{
u32 addr = displayListDataSelected->text(0).toUInt(0,16);
host->SetGPUStep(true, 2, addr);
host->NextGPUStep();
QtHost *qthost = (QtHost *)host;
qthost->SetGPUStep(true, 2, addr);
qthost->NextGPUStep();
}
void Debugger_DisplayList::on_texturesList_customContextMenuRequested(const QPoint &pos)
@@ -1823,6 +1829,7 @@ void Debugger_DisplayList::on_texturesList_customContextMenuRequested(const QPoi
void Debugger_DisplayList::RunToDrawTex()
{
u32 addr = textureDataSelected->text(0).toUInt(0,16);
host->SetGPUStep(true, 3, addr);
host->NextGPUStep();
QtHost *qthost = (QtHost *)host;
qthost->SetGPUStep(true, 3, addr);
qthost->NextGPUStep();
}
UI/DevScreens.cpp
+3 -1
View File
@@ -186,6 +186,7 @@ void JitCompareScreen::CreateViews() {
leftColumn->Add(new Choice(d->T("Back")))->OnClick.Handle<UIScreen>(this, &UIScreen::OnBack);
}
#ifdef ARM
std::vector<std::string> DisassembleArm2(const u8 *data, int size) {
std::vector<std::string> lines;
@@ -208,12 +209,13 @@ std::vector<std::string> DisassembleArm2(const u8 *data, int size) {
continue;
}
}
ArmDis((u32)codePtr, inst, temp, false);
ArmDis((u32)(intptr_t)codePtr, inst, temp, false);
std::string buf = temp;
lines.push_back(buf);
}
return lines;
}
#endif
void JitCompareScreen::UpdateDisasm() {
leftDisasm_->Clear();