Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-07 22:37:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add option to use the Android hardware scaler by setting a low resolution

Browse Source
This commit is contained in:
Henrik Rydgard 2014-07-18 21:49:54 +02:00
parent d3dce422a8
commit 76bdd84e43
6 changed files with 71 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Core/Config.cpp
View File

@ -368,6 +368,7 @@ static ConfigSetting graphicsSettings[] = {
ReportedConfigSetting("SoftwareSkinning", &g_Config.bSoftwareSkinning, true),
ReportedConfigSetting("TextureFiltering", &g_Config.iTexFiltering, 1),
ReportedConfigSetting("InternalResolution", &g_Config.iInternalResolution, &DefaultInternalResolution),
ReportedConfigSetting("AndroidHwScale", &g_Config.iAndroidHwScale, 0),
ReportedConfigSetting("FrameSkip", &g_Config.iFrameSkip, 0),
ReportedConfigSetting("AutoFrameSkip", &g_Config.bAutoFrameSkip, false),
ReportedConfigSetting("FrameRate", &g_Config.iFpsLimit, 0),

3
Core/Config.h
View File

@ -258,6 +258,9 @@ public:
bool bDisableAlphaTest; // Helps PowerVR immensely, breaks some graphics
// End GLES hacks.
// Use the hardware scaler to scale up the image to save fillrate. Similar to Windows' window size, really.
int iAndroidHwScale; // 0 = device resolution. 1 = 480x272 (extended to correct aspect), 2 = 960x544 etc.
// Risky JIT optimizations
bool bDiscardRegsOnJRRA;

13
UI/GameSettingsScreen.cpp
View File

@ -137,10 +137,16 @@ void GameSettingsScreen::CreateViews() {
static const char *internalResolutions[] = {"Auto (1:1)", "1x PSP", "2x PSP", "3x PSP", "4x PSP", "5x PSP" };
#endif
resolutionChoice_ = graphicsSettings->Add(new PopupMultiChoice(&g_Config.iInternalResolution, gs->T("Rendering Resolution"), internalResolutions, 0, ARRAY_SIZE(internalResolutions), gs, screenManager()));
resolutionChoice_->OnClick.Handle(this, &GameSettingsScreen::OnResolutionChange);
resolutionChoice_->OnChoice.Handle(this, &GameSettingsScreen::OnResolutionChange);
resolutionEnable_ = !g_Config.bSoftwareRendering && (g_Config.iRenderingMode != FB_NON_BUFFERED_MODE);
resolutionChoice_->SetEnabledPtr(&resolutionEnable_);
#ifdef ANDROID
static const char *deviceResolutions[] = { "Native", "1x PSP", "2x PSP", "3x PSP", "4x PSP", "5x PSP" };
UI::PopupMultiChoice *hwscale = graphicsSettings->Add(new PopupMultiChoice(&g_Config.iAndroidHwScale, gs->T("Device Resolution (HW scaler)"), deviceResolutions, 0, ARRAY_SIZE(deviceResolutions), gs, screenManager()));
hwscale->OnChoice.Handle(this, &GameSettingsScreen::OnHwScaleChange); // To refresh the display mode
#endif
#ifdef _WIN32
graphicsSettings->Add(new CheckBox(&g_Config.bVSync, gs->T("VSync")));
#endif
@ -491,6 +497,11 @@ UI::EventReturn GameSettingsScreen::OnResolutionChange(UI::EventParams &e) {
return UI::EVENT_DONE;
}
UI::EventReturn GameSettingsScreen::OnHwScaleChange(UI::EventParams &e) {
System_SendMessage("recreate", "");
return UI::EVENT_DONE;
}
UI::EventReturn GameSettingsScreen::OnShaderChange(UI::EventParams &e) {
if (gpu) {
gpu->ClearShaderCache();

1
UI/GameSettingsScreen.h
View File

@ -69,6 +69,7 @@ private:
UI::EventReturn OnClearRecents(UI::EventParams &e);
UI::EventReturn OnFullscreenChange(UI::EventParams &e);
UI::EventReturn OnResolutionChange(UI::EventParams &e);
UI::EventReturn OnHwScaleChange(UI::EventParams &e);
UI::EventReturn OnFrameSkipChange(UI::EventParams &e);
UI::EventReturn OnShaderChange(UI::EventParams &e);
UI::EventReturn OnRestoreDefaultSettings(UI::EventParams &e);

13
UI/NativeApp.cpp
View File

@ -193,14 +193,17 @@ void QtHost::ShutdownSound() { g_mixer = 0; }
#endif
std::string NativeQueryConfig(std::string query) {
char temp[128];
if (query == "screenRotation") {
char temp[128];
sprintf(temp, "%i", g_Config.iScreenRotation);
return temp;
return std::string(temp);
} else if (query == "immersiveMode") {
return g_Config.bImmersiveMode ? "1" : "0";
return std::string(g_Config.bImmersiveMode ? "1" : "0");
} else if (query == "hwScale") {
sprintf(temp, "%i", g_Config.iAndroidHwScale);
return std::string(temp);
} else {
return "";
return std::string("");
}
}
@ -541,8 +544,6 @@ void NativeInitGraphics() {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glstate.viewport.set(0, 0, pixel_xres, pixel_yres);
#ifdef _WIN32
DSound::DSound_StartSound(MainWindow::GetHWND(), &Win32Mix);
#endif

48
android/src/org/ppsspp/ppsspp/PpssppActivity.java
View File

@ -1,8 +1,11 @@
package org.ppsspp.ppsspp;
import android.graphics.Point;
import android.os.Bundle;
import android.util.Log;
import com.henrikrydgard.libnative.NativeActivity;
import com.henrikrydgard.libnative.NativeApp;
import com.google.analytics.tracking.android.EasyTracker;
public class PpssppActivity extends NativeActivity {
@ -12,7 +15,9 @@ public class PpssppActivity extends NativeActivity {
// Key used by shortcut.
public static final String SHORTCUT_EXTRA_KEY = "org.ppsspp.ppsspp.Shortcuts";
public static final String TAG = "PpssppActivity";
public PpssppActivity() {
super();
}
@ -38,4 +43,45 @@ public class PpssppActivity extends NativeActivity {
super.onStop();
EasyTracker.getInstance(this).activityStop(this);
}
@Override
public void getDesiredBackbufferSize(Point sz) {
GetScreenSize(sz);
String config = NativeApp.queryConfig("hwScale");
int scale;
try {
scale = Integer.parseInt(config);
if (scale == 0) {
sz.x = 0;
sz.y = 0;
return;
}
}
catch (NumberFormatException e) {
sz.x = 0;
sz.y = 0;
return;
}
float ratio = (float)sz.x / (float)sz.y;
//Log.i(TAG, "GetScreenSize returned: " + sz.x + "x" + sz.y + "=" + ratio);
float targetRatio;
if (sz.x > sz.y) {
targetRatio = 480.0f / 272.0f;
sz.x = 480 * scale;
sz.y = 272 * scale;
} else {
targetRatio = 272.0f / 480.0f;
sz.x = 272 * scale;
sz.y = 480 * scale;
}
//Log.i(TAG, "Target ratio: " + targetRatio + " ratio: " + ratio);
float correction = targetRatio / ratio;
if (ratio < targetRatio) {
sz.y *= correction;
} else {
sz.x *= correction;
}
//Log.i(TAG, "Corrected ratio: " + sz.x + " x " + sz.y);
}
}