Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-12 17:48:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove obsolete outputWidth/outputHeight

Browse Source
This commit is contained in:
Henrik Rydgard 2014-02-10 11:06:58 +01:00
parent 32f637f259
commit 8b6b491820
7 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Core/Config.cpp
View File

@ -697,22 +697,25 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) {
// MIGRATION: For users who had the old static touch layout, aren't I nice?
if (fDpadX > 1.0 || fDpadY > 1.0) { // Likely the rest are too!
fActionButtonCenterX /= dp_xres;
fActionButtonCenterY /= dp_yres;
fDpadX /= dp_xres;
fDpadY /= dp_yres;
fStartKeyX /= dp_xres;
fStartKeyY /= dp_yres;
fSelectKeyX /= dp_xres;
fSelectKeyY /= dp_yres;
fUnthrottleKeyX /= dp_xres;
fUnthrottleKeyY /= dp_yres;
fLKeyX /= dp_xres;
fLKeyY /= dp_yres;
fRKeyX /= dp_xres;
fRKeyY /= dp_yres;
fAnalogStickX /= dp_xres;
fAnalogStickY /= dp_yres;
float screen_width = dp_xres;
float screen_height = dp_yres;
fActionButtonCenterX /= screen_width;
fActionButtonCenterY /= screen_height;
fDpadX /= screen_width;
fDpadY /= screen_height;
fStartKeyX /= screen_width;
fStartKeyY /= screen_height;
fSelectKeyX /= screen_width;
fSelectKeyY /= screen_height;
fUnthrottleKeyX /= screen_width;
fUnthrottleKeyY /= screen_height;
fLKeyX /= screen_width;
fLKeyY /= screen_height;
fRKeyX /= screen_width;
fRKeyY /= screen_height;
fAnalogStickX /= screen_width;
fAnalogStickY /= screen_height;
}
if (dismissedVersion == upgradeVersion) {

3
Core/Core.cpp
View File

@ -110,8 +110,7 @@ void UpdateScreenScale() {
g_dpi = 72;
g_dpi_scale = 1.0f;
#ifdef _WIN32
if (pixel_xres < 480 + 80)
{
if (pixel_xres < 480 + 80) {
dp_xres *= 2;
dp_yres *= 2;
g_dpi_scale = 2.0f;

4
Core/CoreParameter.h
View File

@ -51,10 +51,6 @@ struct CoreParameter {
int renderWidth;
int renderHeight;
// Virtual (dpi-adjusted) output resolution
int outputWidth;
int outputHeight;
// Actual pixel output resolution (for use by glViewport and the like)
int pixelWidth;
int pixelHeight;

2
GPU/GLES/Framebuffer.cpp
View File

@ -1526,8 +1526,6 @@ void FramebufferManager::EndFrame() {
PSP_CoreParameter().renderWidth = 480 * zoom;
PSP_CoreParameter().renderHeight = 272 * zoom;
PSP_CoreParameter().outputWidth = 480 * zoom;
PSP_CoreParameter().outputHeight = 272 * zoom;
resized_ = false;
}

4
UI/EmuScreen.cpp
View File

@ -102,8 +102,6 @@ void EmuScreen::bootGame(const std::string &filename) {
coreParam.renderHeight = 272 * g_Config.iInternalResolution;
}
coreParam.outputWidth = dp_xres;
coreParam.outputHeight = dp_yres;
coreParam.pixelWidth = pixel_xres;
coreParam.pixelHeight = pixel_yres;
@ -474,8 +472,6 @@ void EmuScreen::update(InputState &input) {
UIScreen::update(input);
// Simply forcibily update to the current screen size every frame. Doesn't cost much.
PSP_CoreParameter().outputWidth = dp_xres;
PSP_CoreParameter().outputHeight = dp_yres;
PSP_CoreParameter().pixelWidth = pixel_xres;
PSP_CoreParameter().pixelHeight = pixel_yres;

2
Windows/WndMainWindow.cpp
View File

@ -229,8 +229,6 @@ namespace MainWindow
PSP_CoreParameter().renderWidth = 480 * zoom;
PSP_CoreParameter().renderHeight = 272 * zoom;
PSP_CoreParameter().outputWidth = 480 * zoom;
PSP_CoreParameter().outputHeight = 272 * zoom;
if (displayOSM) {
I18NCategory *g = GetI18NCategory("Graphics");

2
headless/Headless.cpp
View File

@ -311,8 +311,6 @@ int main(int argc, const char* argv[])
coreParameter.headLess = true;
coreParameter.renderWidth = 480;
coreParameter.renderHeight = 272;
coreParameter.outputWidth = 480;
coreParameter.outputHeight = 272;
coreParameter.pixelWidth = 480;
coreParameter.pixelHeight = 272;
coreParameter.unthrottle = true;