diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro index 580fe90a56..e48303bc72 100755 --- a/Qt/PPSSPP.pro +++ b/Qt/PPSSPP.pro @@ -26,7 +26,7 @@ win32 { LIBS += -lCore -lCommon -lNative -lwinmm -lws2_32 } linux { - LIBS += -L. -lCore -lCommon -lNative -ldl + LIBS += -L. -lCore -lCommon -lNative -ldl -lz PRE_TARGETDEPS += ./libCommon.a ./libCore.a ./libNative.a !mobile_platform { CONFIG += link_pkgconfig diff --git a/Qt/debugger_displaylist.cpp b/Qt/debugger_displaylist.cpp index 1e33051831..9bd297308c 100644 --- a/Qt/debugger_displaylist.cpp +++ b/Qt/debugger_displaylist.cpp @@ -1486,7 +1486,7 @@ void Debugger_DisplayList::UpdateRenderBufferGUI() { EmuThread_LockDraw(true); - gpu->Flush(); + //gpu->Flush(); int FRAME_WIDTH; int FRAME_HEIGHT; diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp index 002fc4766a..1564705e4d 100644 --- a/Qt/mainwindow.cpp +++ b/Qt/mainwindow.cpp @@ -154,7 +154,6 @@ void MainWindow::UpdateMenus() ui->action_Stretch_to_display->setChecked(g_Config.bStretchToDisplay); ui->action_OptionsHardwareTransform->setChecked(g_Config.bHardwareTransform); - ui->action_OptionsUseVBO->setChecked(g_Config.bUseVBO); ui->action_OptionsVertexCache->setChecked(g_Config.bVertexCache); ui->actionFrameskip->setChecked(g_Config.iFrameSkip != 0); @@ -547,12 +546,6 @@ void MainWindow::on_action_OptionsHardwareTransform_triggered() UpdateMenus(); } -void MainWindow::on_action_OptionsUseVBO_triggered() -{ - g_Config.bUseVBO = !g_Config.bUseVBO; - UpdateMenus(); -} - void MainWindow::on_action_OptionsVertexCache_triggered() { g_Config.bVertexCache = !g_Config.bVertexCache; diff --git a/Qt/mainwindow.h b/Qt/mainwindow.h index ebc31ed7ad..ed02e88670 100644 --- a/Qt/mainwindow.h +++ b/Qt/mainwindow.h @@ -100,7 +100,6 @@ private slots: void on_action_Stretch_to_display_triggered(); void on_action_OptionsHardwareTransform_triggered(); - void on_action_OptionsUseVBO_triggered(); void on_action_OptionsVertexCache_triggered(); void on_actionFrameskip_triggered(); diff --git a/Qt/mainwindow.ui b/Qt/mainwindow.ui index 3aaf6e39c5..0ee43cc45c 100644 --- a/Qt/mainwindow.ui +++ b/Qt/mainwindow.ui @@ -174,7 +174,6 @@ - @@ -479,14 +478,6 @@ &About PPSSPP... - - - true - - - &Use VBO - - true