thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Make GPU events more consistent.

Browse source
This commit is contained in:
Unknown W. Brackets 2017-04-27 20:03:50 -07:00
parent 7613fd97aa
commit 661b2a3aa8
6 changed files with 17 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Qt/mainwindow.cpp
View file

@ -8,6 +8,7 @@
#include <QMessageBox> #include <QMessageBox>
#include "base/display.h" #include "base/display.h"
#include "base/NativeApp.h"
#include "Core/MIPS/MIPSDebugInterface.h" #include "Core/MIPS/MIPSDebugInterface.h"
#include "Core/Debugger/SymbolMap.h" #include "Core/Debugger/SymbolMap.h"
#include "Core/SaveState.h" #include "Core/SaveState.h"
@ -94,8 +95,7 @@ void MainWindow::updateMenus()
foreach(QAction * action, displayLayoutGroup->actions()) { foreach(QAction * action, displayLayoutGroup->actions()) {
if (g_Config.iSmallDisplayZoomType == action->data().toInt()) { if (g_Config.iSmallDisplayZoomType == action->data().toInt()) {
if (gpu) NativeMessageReceived("gpu_resized", "");
gpu->Resized();
action->setChecked(true); action->setChecked(true);
break; break;
@ -379,8 +379,7 @@ void MainWindow::fullscrAct()
showFullScreen(); showFullScreen();
if (gpu) NativeMessageReceived("gpu_resized", "");
gpu->Resized();
InitPadLayout(dp_xres, dp_yres); InitPadLayout(dp_xres, dp_yres);
if (GetUIState() == UISTATE_INGAME && !g_Config.bShowTouchControls) if (GetUIState() == UISTATE_INGAME && !g_Config.bShowTouchControls)
QApplication::setOverrideCursor(QCursor(Qt::BlankCursor)); QApplication::setOverrideCursor(QCursor(Qt::BlankCursor));

10
UI/GameSettingsScreen.cpp
View file

@ -1051,9 +1051,8 @@ void GameSettingsScreen::onFinish(DialogResult result) {
KeyMap::UpdateNativeMenuKeys(); KeyMap::UpdateNativeMenuKeys();
// Wipe some caches after potentially changing settings. // Wipe some caches after potentially changing settings.
if (gpu) NativeMessageReceived("gpu_resized", "");
gpu->Resized(); NativeMessageReceived("gpu_clearCache", "");
Reporting::UpdateConfig();
} }
/* /*
@ -1169,10 +1168,7 @@ UI::EventReturn GameSettingsScreen::OnPostProcShader(UI::EventParams &e) {
} }
UI::EventReturn GameSettingsScreen::OnPostProcShaderChange(UI::EventParams &e) { UI::EventReturn GameSettingsScreen::OnPostProcShaderChange(UI::EventParams &e) {
if (gpu) { NativeMessageReceived("gpu_resized", "");
gpu->Resized();
}
Reporting::UpdateConfig();
return UI::EVENT_DONE; return UI::EVENT_DONE;
} }

4
UI/NativeApp.cpp
View file

@ -836,7 +836,7 @@ void NativeRender(GraphicsContext *graphicsContext) {
if (GetGPUBackend() == GPUBackend::OPENGL) { if (GetGPUBackend() == GPUBackend::OPENGL) {
PSP_CoreParameter().pixelWidth = pixel_xres; PSP_CoreParameter().pixelWidth = pixel_xres;
PSP_CoreParameter().pixelHeight = pixel_yres; PSP_CoreParameter().pixelHeight = pixel_yres;
NativeMessageReceived("gpu resized", ""); NativeMessageReceived("gpu_resized", "");
} }
#endif #endif
} }
@ -868,7 +868,7 @@ void HandleGlobalMessage(const std::string &msg, const std::string &value) {
// Show for the same duration as the preview. // Show for the same duration as the preview.
osm.Show(msg, 2.0f, 0xFFFFFF, -1, true, "savestate_slot"); osm.Show(msg, 2.0f, 0xFFFFFF, -1, true, "savestate_slot");
} }
if (msg == "gpu resized" || msg == "gpu clear cache") { if (msg == "gpu_resized" || msg == "gpu_clearCache") {
if (gpu) { if (gpu) {
gpu->ClearCacheNextFrame(); gpu->ClearCacheNextFrame();
gpu->Resized(); gpu->Resized();

4
Windows/MainWindow.cpp
View file

@ -224,7 +224,7 @@ namespace MainWindow
if (g_Config.iTexScalingLevel == TEXSCALING_AUTO) if (g_Config.iTexScalingLevel == TEXSCALING_AUTO)
setTexScalingMultiplier(0); setTexScalingMultiplier(0);
NativeMessageReceived("gpu resized", ""); NativeMessageReceived("gpu_resized", "");
} }
void CorrectCursor() { void CorrectCursor() {
@ -279,7 +279,7 @@ namespace MainWindow
INFO_LOG(SYSTEM, "Pixel width/height: %dx%d", PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight); INFO_LOG(SYSTEM, "Pixel width/height: %dx%d", PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight);
if (UpdateScreenScale(width, height)) { if (UpdateScreenScale(width, height)) {
NativeMessageReceived("gpu resized", ""); NativeMessageReceived("gpu_resized", "");
} }
if (screenManager) { if (screenManager) {

12
Windows/MainWindowMenu.cpp
View file

@ -484,7 +484,7 @@ namespace MainWindow {
// not static // not static
void setTexScalingMultiplier(int level) { void setTexScalingMultiplier(int level) {
g_Config.iTexScalingLevel = level; g_Config.iTexScalingLevel = level;
NativeMessageReceived("gpu clear cache", ""); NativeMessageReceived("gpu_clearCache", "");
} }
static void setTexFiltering(int type) { static void setTexFiltering(int type) {
@ -497,7 +497,7 @@ namespace MainWindow {
static void setTexScalingType(int type) { static void setTexScalingType(int type) {
g_Config.iTexScalingType = type; g_Config.iTexScalingType = type;
NativeMessageReceived("gpu clear cache", ""); NativeMessageReceived("gpu_clearCache", "");
} }
static void setRenderingMode(int mode) { static void setRenderingMode(int mode) {
@ -529,7 +529,7 @@ namespace MainWindow {
break; break;
} }
NativeMessageReceived("gpu resized", ""); NativeMessageReceived("gpu_resized", "");
} }
static void setFpsLimit(int fps) { static void setFpsLimit(int fps) {
@ -563,7 +563,7 @@ namespace MainWindow {
static void setDisplayOptions(int options) { static void setDisplayOptions(int options) {
g_Config.iSmallDisplayZoomType = options; g_Config.iSmallDisplayZoomType = options;
NativeMessageReceived("gpu resized", ""); NativeMessageReceived("gpu_resized", "");
} }
void MainWindowMenu_Process(HWND hWnd, WPARAM wParam) { void MainWindowMenu_Process(HWND hWnd, WPARAM wParam) {
@ -765,7 +765,7 @@ namespace MainWindow {
case ID_TEXTURESCALING_DEPOSTERIZE: case ID_TEXTURESCALING_DEPOSTERIZE:
g_Config.bTexDeposterize = !g_Config.bTexDeposterize; g_Config.bTexDeposterize = !g_Config.bTexDeposterize;
NativeMessageReceived("gpu clear cache", ""); NativeMessageReceived("gpu_clearCache", "");
break; break;
case ID_OPTIONS_DIRECT3D9: case ID_OPTIONS_DIRECT3D9:
@ -1029,7 +1029,7 @@ namespace MainWindow {
if (index < availableShaders.size()) { if (index < availableShaders.size()) {
g_Config.sPostShaderName = availableShaders[index]; g_Config.sPostShaderName = availableShaders[index];
NativeMessageReceived("gpu resized", ""); NativeMessageReceived("gpu_resized", "");
break; break;
} }

2
ext/native/base/QtMain.cpp
View file

@ -218,7 +218,7 @@ QString MainUI::InputBoxGetQString(QString title, QString defaultValue)
void MainUI::resizeGL(int w, int h) void MainUI::resizeGL(int w, int h)
{ {
if (UpdateScreenScale(w, h)) { if (UpdateScreenScale(w, h)) {
NativeMessageReceived("gpu resized", ""); NativeMessageReceived("gpu_resized", "");
} }
xscale = w / this->width(); xscale = w / this->width();
yscale = h / this->height(); yscale = h / this->height();