debuggerx/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2026-08-14 04:24:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert the Auto policy

Browse Source
This commit is contained in:
CamilleLaVey
2026-08-13 20:42:49 -04:00
parent 9b20c6c609
commit 59384de777
11 changed files with 12 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt
-6
View File
@@ -222,12 +222,6 @@ object NativeLibrary {
external fun getDebugKnobAt(index: Int): Boolean
/**
* Publishes the refresh rate of the display the emulation surface lives on, in hertz.
* Frame generation uses it to cap the multiplier to what the display can actually present.
*/
external fun setDisplayRefreshRate(rate: Float)
/**
* Set the current speed limit to the configured turbo speed.
*/
src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
-6
View File
@@ -245,7 +245,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
override fun onResume() {
super.onResume()
publishDisplayRefreshRate()
nfcReader.startScanning()
startMotionSensorListener()
InputHandler.updateControllerData()
@@ -254,11 +253,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
buildPictureInPictureParams()
}
private fun publishDisplayRefreshRate() {
val rate = display?.mode?.refreshRate ?: display?.refreshRate ?: 0f
NativeLibrary.setDisplayRefreshRate(rate)
}
override fun onPause() {
nfcReader.stopScanning()
stopMotionSensorListener()
src/android/app/src/main/jni/emu_window/emu_window.cpp
+1 -60
View File
@@ -10,7 +10,6 @@
#include <array>
#include <cmath>
#include <cstdint>
#include <limits>
#include <dlfcn.h>
#include "common/android/id_cache.h"
@@ -34,12 +33,8 @@ void EmuWindow_Android::OnSurfaceChanged(ANativeWindow* surface) {
m_pending_frame_rate_hint = -1.0f;
m_pending_frame_rate_hint_votes = 0;
m_smoothed_present_rate = 0.0f;
m_peak_guest_frame_rate = 0.0f;
m_published_guest_frame_rate = 0.0f;
Settings::values.guest_frame_rate = 0.0f;
m_last_frame_display_time = {};
m_pending_frame_rate_since = {};
m_guest_frame_rate_since = {};
return;
}
@@ -69,28 +64,8 @@ void EmuWindow_Android::OnTouchReleased(int id) {
EmulationSession::GetInstance().GetInputSubsystem().GetTouchScreen()->TouchReleased(id);
}
namespace {
constexpr std::array GUEST_FRAME_RATE_LADDER{20.0f, 30.0f, 60.0f};
[[nodiscard]] float SnapToGuestFrameRateLadder(float rate) {
float snapped = GUEST_FRAME_RATE_LADDER.front();
float best_distance = std::numeric_limits<float>::max();
for (const float step : GUEST_FRAME_RATE_LADDER) {
const float distance = std::fabs(step - rate);
if (distance <= best_distance) {
best_distance = distance;
snapped = step;
}
}
return snapped;
}
} // Anonymous namespace
void EmuWindow_Android::OnFrameDisplayed() {
UpdateObservedFrameRate();
UpdateGuestFrameRate();
UpdateFrameRateHint();
if (!m_first_frame) {
@@ -122,40 +97,6 @@ void EmuWindow_Android::UpdateObservedFrameRate() {
m_last_frame_display_time = now;
}
void EmuWindow_Android::UpdateGuestFrameRate() {
const float measured = GetFrameTimeVerifiedHint();
if (measured <= 0.0f) {
return;
}
constexpr float PeakDecayFactor = 0.0015f;
m_peak_guest_frame_rate =
measured > m_peak_guest_frame_rate
? measured
: m_peak_guest_frame_rate + (measured - m_peak_guest_frame_rate) * PeakDecayFactor;
const float candidate = SnapToGuestFrameRateLadder(m_peak_guest_frame_rate);
if (candidate == m_published_guest_frame_rate) {
m_guest_frame_rate_since = {};
return;
}
const auto now = Clock::now();
if (m_guest_frame_rate_since.time_since_epoch().count() == 0) {
m_guest_frame_rate_since = now;
return;
}
constexpr auto SettleDuration = std::chrono::seconds(3);
if (now - m_guest_frame_rate_since < SettleDuration) {
return;
}
m_published_guest_frame_rate = candidate;
Settings::values.guest_frame_rate = candidate;
m_guest_frame_rate_since = {};
}
float EmuWindow_Android::QuantizeFrameRateHint(float frame_rate) {
if (!std::isfinite(frame_rate) || frame_rate <= 0.0f) {
return 0.0f;
@@ -187,7 +128,7 @@ float EmuWindow_Android::GetPresentedFrameMultiplier() {
if (!Settings::values.frame_gen.GetValue()) {
return 1.0f;
}
return static_cast<float>(Settings::FrameGenMultiplier());
return static_cast<float>(std::clamp<u32>(Settings::values.frame_gen_multiplier.GetValue(), 2, 4));
}
float EmuWindow_Android::GetFrameRateHint() const {
src/android/app/src/main/jni/emu_window/emu_window.h
-4
View File
@@ -59,7 +59,6 @@ private:
void UpdateFrameRateHint();
void UpdateObservedFrameRate();
void UpdateGuestFrameRate();
[[nodiscard]] float GetFrameRateHint() const;
[[nodiscard]] float GetFrameTimeVerifiedHint() const;
[[nodiscard]] static float GetPresentedFrameMultiplier();
@@ -74,10 +73,7 @@ private:
float m_last_frame_rate_hint = -1.0f;
float m_pending_frame_rate_hint = -1.0f;
float m_smoothed_present_rate = 0.0f;
float m_peak_guest_frame_rate = 0.0f;
float m_published_guest_frame_rate = 0.0f;
Clock::time_point m_last_frame_display_time{};
Clock::time_point m_pending_frame_rate_since{};
Clock::time_point m_guest_frame_rate_since{};
std::uint32_t m_pending_frame_rate_hint_votes = 0;
};
src/android/app/src/main/jni/native.cpp
-5
View File
@@ -1229,11 +1229,6 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_getDebugKnobAt(JNIEnv* env, jobje
return static_cast<jboolean>(Settings::getDebugKnobAt(static_cast<u8>(index)));
}
void Java_org_yuzu_yuzu_1emu_NativeLibrary_setDisplayRefreshRate(JNIEnv* env, jobject jobj,
jfloat rate) {
Settings::values.display_refresh_rate = static_cast<float>(rate);
}
void Java_org_yuzu_yuzu_1emu_NativeLibrary_setTurboSpeedLimit(JNIEnv *env, jobject jobj, jboolean enabled) {
if (enabled) {
Settings::values.use_speed_limit.SetValue(true);
src/android/app/src/main/res/values/arrays.xml
-2
View File
@@ -163,14 +163,12 @@
</string-array>
<string-array name="frameGenMultiplierNames">
<item>@string/frame_gen_multiplier_auto</item>
<item>@string/frame_gen_multiplier_2x</item>
<item>@string/frame_gen_multiplier_3x</item>
<item>@string/frame_gen_multiplier_4x</item>
</string-array>
<integer-array name="frameGenMultiplierValues">
<item>0</item>
<item>2</item>
<item>3</item>
<item>4</item>
src/android/app/src/main/res/values/strings.xml
+1 -2
View File
@@ -302,8 +302,7 @@
<string name="frame_gen_submenu_description">Manage and configure frame generation</string>
<string name="frame_gen_description">Insert interpolated frames between rendered ones using Lossless Scaling. Forces FIFO presentation while enabled.</string>
<string name="frame_gen_multiplier">Frame multiplier</string>
<string name="frame_gen_multiplier_description">How many frames to display for each rendered frame. Higher values cost proportionally more GPU time. Capped to what your display can present at the game\'s frame rate.</string>
<string name="frame_gen_multiplier_auto">Auto</string>
<string name="frame_gen_multiplier_description">How many frames to display for each rendered frame. Higher values cost proportionally more GPU time. Asking for more than your display can present will slow emulation down.</string>
<string name="frame_gen_multiplier_2x">2x</string>
<string name="frame_gen_multiplier_3x">3x</string>
<string name="frame_gen_multiplier_4x">4x</string>
src/common/settings.cpp
+2 -27
View File
@@ -380,34 +380,9 @@ void UpdateRescalingInfo() {
TranslateResolutionInfo(setup, info);
}
u32 FrameGenMultiplierCeiling() {
const u32 configured = values.frame_gen_multiplier.GetValue();
if (configured == AUTO_FRAME_GEN_MULTIPLIER) {
return MAX_FRAME_GEN_MULTIPLIER;
}
return std::clamp(configured, MIN_FRAME_GEN_MULTIPLIER, MAX_FRAME_GEN_MULTIPLIER);
}
u32 FrameGenMultiplier() {
const u32 ceiling = FrameGenMultiplierCeiling();
const float refresh = values.display_refresh_rate;
if (refresh <= 1.0f) {
return ceiling;
}
constexpr float UNMEASURED_GUEST_FRAME_RATE = 60.0f;
float base = values.guest_frame_rate > 1.0f ? values.guest_frame_rate
: UNMEASURED_GUEST_FRAME_RATE;
if (values.use_speed_limit.GetValue()) {
const u16 limit = std::min<u16>(SpeedLimit(), 100);
if (limit > 0) {
base *= static_cast<float>(limit) / 100.0f;
}
}
const u32 presentable = static_cast<u32>(refresh / std::max(base, 1.0f));
return std::min(ceiling, std::max(presentable, 1u));
return std::clamp(values.frame_gen_multiplier.GetValue(), MIN_FRAME_GEN_MULTIPLIER,
MAX_FRAME_GEN_MULTIPLIER);
}
size_t FrameGenGenerations() {
src/common/settings.h
+2 -8
View File
@@ -392,8 +392,8 @@ struct Values {
Specialization::Default, true, false};
SwitchableSetting<u32, true> frame_gen_multiplier{linkage,
0,
0,
2,
2,
4,
"frame_gen_multiplier",
Category::Renderer,
@@ -914,19 +914,13 @@ struct Values {
// Per-game overrides
bool use_squashed_iterated_blend;
// Rates published by the frontend, in hertz. Zero means not measured yet.
float display_refresh_rate;
float guest_frame_rate;
};
extern Values values;
constexpr u32 AUTO_FRAME_GEN_MULTIPLIER = 0;
constexpr u32 MIN_FRAME_GEN_MULTIPLIER = 2;
constexpr u32 MAX_FRAME_GEN_MULTIPLIER = 4;
[[nodiscard]] u32 FrameGenMultiplierCeiling();
[[nodiscard]] u32 FrameGenMultiplier();
[[nodiscard]] size_t FrameGenGenerations();
src/video_core/renderer_vulkan/present/frame_gen.cpp
+5 -1
View File
@@ -183,7 +183,11 @@ FrameGen::~FrameGen() = default;
void FrameGen::Process(const Device& device, Frame* frame, VkFormat format, bool generate) {
generated = false;
if (unavailable || !Settings::values.frame_gen.GetValue()) {
if (unavailable || ConfiguredGenerations() == 0) {
if (chain) {
scheduler.Finish();
chain.reset();
}
return;
}
src/video_core/renderer_vulkan/vk_present_manager.cpp
+1 -3
View File
@@ -351,9 +351,7 @@ void PresentManager::SetImageCount() {
// We cannot have more than 7 images in flight at any given time.
// FRAMES_IN_FLIGHT is 8, and the cache TICKS_TO_DESTROY is 8.
// Mali drivers will give us 6.
const size_t generations = Settings::values.frame_gen.GetValue()
? Settings::FrameGenMultiplierCeiling() - 1
: 0;
const size_t generations = Settings::FrameGenGenerations();
const size_t queued_composites = Settings::values.frame_gen_queue_target.GetValue() + 1;
image_count =
std::clamp<size_t>((generations + 1) * queued_composites, swapchain.GetImageCount(),