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

Add controller/gamepad support to Blackberry 10 (update native). Buildfix for Qt.

Browse source
This commit is contained in:
Sacha 2013-05-22 01:35:22 +10:00
parent 9ae2bedeab
commit dde85e581e
4 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Qt/mainwindow.cpp
View file

@ -152,7 +152,6 @@ void MainWindow::UpdateMenus()
ui->action_OptionsHardwareTransform->setChecked(g_Config.bHardwareTransform); ui->action_OptionsHardwareTransform->setChecked(g_Config.bHardwareTransform);
ui->action_OptionsUseVBO->setChecked(g_Config.bUseVBO); ui->action_OptionsUseVBO->setChecked(g_Config.bUseVBO);
ui->action_OptionsVertexCache->setChecked(g_Config.bVertexCache); ui->action_OptionsVertexCache->setChecked(g_Config.bVertexCache);
ui->action_OptionsWireframe->setChecked(g_Config.bDrawWireframe);
ui->action_OptionsDisplayRawFramebuffer->setChecked(g_Config.bDisplayFramebuffer); ui->action_OptionsDisplayRawFramebuffer->setChecked(g_Config.bDisplayFramebuffer);
ui->actionFrameskip->setChecked(g_Config.iFrameSkip != 0); ui->actionFrameskip->setChecked(g_Config.iFrameSkip != 0);
@ -569,12 +568,6 @@ void MainWindow::on_action_OptionsVertexCache_triggered()
UpdateMenus(); UpdateMenus();
} }
void MainWindow::on_action_OptionsWireframe_triggered()
{
g_Config.bDrawWireframe = !g_Config.bDrawWireframe;
UpdateMenus();
}
void MainWindow::on_action_OptionsDisplayRawFramebuffer_triggered() void MainWindow::on_action_OptionsDisplayRawFramebuffer_triggered()
{ {
g_Config.bDisplayFramebuffer = !g_Config.bDisplayFramebuffer; g_Config.bDisplayFramebuffer = !g_Config.bDisplayFramebuffer;

1
Qt/mainwindow.h
View file

@ -105,7 +105,6 @@ private slots:
void on_action_OptionsHardwareTransform_triggered(); void on_action_OptionsHardwareTransform_triggered();
void on_action_OptionsUseVBO_triggered(); void on_action_OptionsUseVBO_triggered();
void on_action_OptionsVertexCache_triggered(); void on_action_OptionsVertexCache_triggered();
void on_action_OptionsWireframe_triggered();
void on_action_OptionsDisplayRawFramebuffer_triggered(); void on_action_OptionsDisplayRawFramebuffer_triggered();
void on_actionFrameskip_triggered(); void on_actionFrameskip_triggered();

9
Qt/mainwindow.ui
View file

@ -176,7 +176,6 @@
<addaction name="action_OptionsHardwareTransform"/> <addaction name="action_OptionsHardwareTransform"/>
<addaction name="action_OptionsUseVBO"/> <addaction name="action_OptionsUseVBO"/>
<addaction name="action_OptionsVertexCache"/> <addaction name="action_OptionsVertexCache"/>
<addaction name="action_OptionsWireframe"/>
<addaction name="action_OptionsDisplayRawFramebuffer"/> <addaction name="action_OptionsDisplayRawFramebuffer"/>
<addaction name="actionFrameskip"/> <addaction name="actionFrameskip"/>
</widget> </widget>
@ -404,14 +403,6 @@
<string>&amp;Linear Filtering</string> <string>&amp;Linear Filtering</string>
</property> </property>
</action> </action>
<action name="action_OptionsWireframe">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>&amp;Wireframe (experimental)</string>
</property>
</action>
<action name="action_OptionsDisplayRawFramebuffer"> <action name="action_OptionsDisplayRawFramebuffer">
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>

2
native

@ -1 +1 @@
Subproject commit a6dc54e67872a5783d23dbe82d96a2dae6949ae1 Subproject commit cc80e0292f4c8479d4d143fe4cdc7f00bf73111e