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

Buildfix Qt Linux.

Browse source
This commit is contained in:
Sacha 2013-10-15 00:40:25 +10:00
parent ffbac62f01
commit 7927b889b3
5 changed files with 7 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Core/Core.cpp
View file

@ -209,7 +209,11 @@ reswitch:
return;
}
Core_RunLoop();
#if defined(USING_QT_UI) && !defined(USING_GLES2)
return;
#else
continue;
#endif
}
switch (coreState)

2
Qt/PPSSPP.pro
View file

@ -44,7 +44,7 @@ linux {
# Main
SOURCES += ../native/base/QtMain.cpp
HEADERS += ../native/base/QtMain.h
#HEADERS += ../native/base/QtMain.h
# UI
SOURCES += ../UI/*Screen.cpp \

21
Qt/mainwindow.cpp
View file

@ -131,7 +131,6 @@ void MainWindow::UpdateMenus()
ui->action_OptionsBufferedRendering->setChecked(g_Config.iRenderingMode == 1);
ui->action_OptionsLinearFiltering->setChecked(3 == g_Config.iTexFiltering);
ui->action_Simple_2xAA->setChecked(g_Config.bFXAA);
ui->action_OptionsScreen1x->setChecked(0 == (g_Config.iInternalResolution - 1));
ui->action_OptionsScreen2x->setChecked(1 == (g_Config.iInternalResolution - 1));
@ -483,12 +482,6 @@ void MainWindow::on_action_OptionsLinearFiltering_triggered()
UpdateMenus();
}
void MainWindow::on_action_Simple_2xAA_triggered()
{
g_Config.bFXAA = !g_Config.bFXAA;
UpdateMenus();
}
void MainWindow::on_action_OptionsScreen1x_triggered()
{
SetZoom(1);
@ -573,11 +566,8 @@ void MainWindow::on_action_OptionsFullScreen_triggered()
PSP_CoreParameter().pixelHeight = height;
PSP_CoreParameter().outputWidth = width;
PSP_CoreParameter().outputHeight = height;
int antialias = 1;
if (g_Config.bFXAA) antialias = 2;
PSP_CoreParameter().renderWidth = width * antialias;
PSP_CoreParameter().renderHeight = height * antialias;
PSP_CoreParameter().renderWidth = width;
PSP_CoreParameter().renderHeight = height;
pixel_xres = width;
pixel_yres = height;
@ -722,13 +712,6 @@ void MainWindow::SetZoom(float zoom) {
PSP_CoreParameter().outputWidth = pixel_xres;
PSP_CoreParameter().outputHeight = pixel_yres;
if (g_Config.bFXAA)
{
zoom *= 2;
PSP_CoreParameter().renderWidth = 480 * zoom;
PSP_CoreParameter().renderHeight = 272 * zoom;
}
if (gpu)
gpu->Resized();
}

1
Qt/mainwindow.h
View file

@ -87,7 +87,6 @@ private slots:
void on_action_OptionsBufferedRendering_triggered();
void on_action_OptionsLinearFiltering_triggered();
void on_action_Simple_2xAA_triggered();
void on_action_OptionsScreen1x_triggered();
void on_action_OptionsScreen2x_triggered();

8
Qt/mainwindow.ui
View file

@ -590,14 +590,6 @@
<string>DisplayList...</string>
</property>
</action>
<action name="action_Simple_2xAA">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Simple 2xAA</string>
</property>
</action>
<action name="action_AFOff">
<property name="checkable">
<bool>true</bool>