Skip to content

Commit

Permalink
Sync native
Browse files Browse the repository at this point in the history
Put gui command in the gui thread.
  • Loading branch information
Xele02 committed Feb 17, 2013
1 parent ec8d323 commit 20597e4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
10 changes: 8 additions & 2 deletions Qt/debugger_displaylist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Debugger_DisplayList::Debugger_DisplayList(DebugInterface *_cpu, MainWindow* mai

QObject::connect(this, SIGNAL(updateDisplayList_()), this, SLOT(UpdateDisplayListGUI()));
QObject::connect(this, SIGNAL(updateRenderBufferList_()), this, SLOT(UpdateRenderBufferListGUI()));
QObject::connect(this, SIGNAL(updateRenderBuffer_()), this, SLOT(UpdateRenderBufferGUI()));

}

Expand Down Expand Up @@ -1498,6 +1499,11 @@ void Debugger_DisplayList::on_stopBtn_clicked()
}

void Debugger_DisplayList::UpdateRenderBuffer()
{
emit updateRenderBuffer_();
}

void Debugger_DisplayList::UpdateRenderBufferGUI()
{
EmuThread_LockDraw(true);

Expand Down Expand Up @@ -1580,7 +1586,7 @@ void Debugger_DisplayList::on_texturesList_itemDoubleClicked(QTreeWidgetItem *it
void Debugger_DisplayList::on_comboBox_currentIndexChanged(int index)
{
currentRenderFrameDisplay = index;
UpdateRenderBuffer();
UpdateRenderBufferGUI();
}

void Debugger_DisplayList::UpdateRenderBufferList()
Expand Down Expand Up @@ -1622,7 +1628,7 @@ void Debugger_DisplayList::on_fboList_itemClicked(QTreeWidgetItem *item, int col
u64 addr = item->data(0,Qt::UserRole).toULongLong();
FBO* fbo = (FBO*)addr;
currentTextureDisplay = fbo;
UpdateRenderBuffer();
UpdateRenderBufferGUI();
}

void Debugger_DisplayList::on_nextDLBtn_clicked()
Expand Down
2 changes: 2 additions & 0 deletions Qt/debugger_displaylist.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@ class Debugger_DisplayList : public QDialog
signals:
void updateDisplayList_();
void updateRenderBufferList_();
void updateRenderBuffer_();

private slots:
void UpdateDisplayListGUI();
void UpdateRenderBufferListGUI();
void UpdateRenderBufferGUI();
void releaseLock();

void on_displayList_itemClicked(QTreeWidgetItem *item, int column);
Expand Down
2 changes: 1 addition & 1 deletion native
Submodule native updated 1 files
+3 −1 base/mutex.h

0 comments on commit 20597e4

Please sign in to comment.