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

Merge pull request #5241 from DanyalZia/patch-50

Browse source 
Properly show OSD information of resolution
This commit is contained in:
Henrik Rydgård 2014-01-27 01:01:13 -08:00
commit d055954a83
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
GPU/GLES/Framebuffer.cpp
View file

@ -1521,13 +1521,13 @@ void FramebufferManager::EndFrame() {
DestroyAllFBOs(); DestroyAllFBOs();
glstate.viewport.set(0, 0, PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight); glstate.viewport.set(0, 0, PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight);
int zoom = g_Config.iInternalResolution; int zoom = g_Config.iInternalResolution;
if (zoom != 0) if (zoom == 0) // auto mode
{ zoom = (PSP_CoreParameter().pixelWidth + 479) / 480;
PSP_CoreParameter().renderWidth = 480 * zoom;
PSP_CoreParameter().renderHeight = 272 * zoom; PSP_CoreParameter().renderWidth = 480 * zoom;
PSP_CoreParameter().outputWidth = 480 * zoom; PSP_CoreParameter().renderHeight = 272 * zoom;
PSP_CoreParameter().outputHeight = 272 * zoom; PSP_CoreParameter().outputWidth = 480 * zoom;
} PSP_CoreParameter().outputHeight = 272 * zoom;
resized_ = false; resized_ = false;
} }

11
Windows/WndMainWindow.cpp
View file

@ -225,13 +225,12 @@ namespace MainWindow
// Round up to a zoom factor for the render size. // Round up to a zoom factor for the render size.
int zoom = g_Config.iInternalResolution; int zoom = g_Config.iInternalResolution;
if (zoom == 0) // auto mode if (zoom == 0) // auto mode
{
zoom = (rc.right - rc.left + 479) / 480; zoom = (rc.right - rc.left + 479) / 480;
PSP_CoreParameter().renderWidth = 480 * zoom;
PSP_CoreParameter().renderHeight = 272 * zoom; PSP_CoreParameter().renderWidth = 480 * zoom;
PSP_CoreParameter().outputWidth = 480 * zoom; PSP_CoreParameter().renderHeight = 272 * zoom;
PSP_CoreParameter().outputHeight = 272 * zoom; PSP_CoreParameter().outputWidth = 480 * zoom;
} PSP_CoreParameter().outputHeight = 272 * zoom;
if (displayOSM) { if (displayOSM) {
I18NCategory *g = GetI18NCategory("Graphics"); I18NCategory *g = GetI18NCategory("Graphics");