Browse Source

Android: add FRAME_SKIPPING and FRAME_INTERPOLATION

xbzk/frame-skipping+interpolation-experiments
Pavel Barabanov 1 year ago
committed by xbzk
parent
commit
f9f3fd0f3e
  1. 5
      src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt
  2. 16
      src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
  3. 2
      src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
  4. 3
      src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
  5. 4
      src/android/app/src/main/res/values/strings.xml
  6. 4
      src/common/settings.h
  7. 13
      src/video_core/renderer_vulkan/renderer_vulkan.cpp

5
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt

@ -89,11 +89,10 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
GPU_LOG_MEMORY_TRACKING("gpu_log_memory_tracking"),
GPU_LOG_DRIVER_DEBUG("gpu_log_driver_debug"),
ENABLE_FRAME_INTERPOLATION("enable_frame_interpolation"),
ENABLE_FRAME_SKIPPING("enable_frame_skipping"),
ENABLE_QUICK_SETTINGS("enable_quick_settings");
// external fun isFrameSkippingEnabled(): Boolean
external fun isFrameInterpolationEnabled(): Boolean
override fun getBoolean(needsGlobal: Boolean): Boolean =
NativeConfig.getBoolean(key, needsGlobal)

16
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt

@ -238,6 +238,22 @@ abstract class SettingsItem(
override fun reset() = BooleanSetting.USE_DOCKED_MODE.reset()
}
put(
SwitchSetting(
BooleanSetting.ENABLE_FRAME_INTERPOLATION,
titleId = R.string.enable_frame_interpolation,
descriptionId = R.string.enable_frame_interpolation_description
)
)
put(
SwitchSetting(
BooleanSetting.ENABLE_FRAME_SKIPPING,
titleId = R.string.enable_frame_skipping,
descriptionId = R.string.enable_frame_skipping_description
)
)
put(
SwitchSetting(
dockedModeSetting,

2
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt

@ -271,6 +271,8 @@ class SettingsFragmentPresenter(
sl.apply {
// add(IntSetting.RENDERER_NVDEC_EMULATION.key)
add(BooleanSetting.ENABLE_FRAME_INTERPOLATION.key)
add(BooleanSetting.ENABLE_FRAME_SKIPPING.key)
add(IntSetting.RENDERER_RESOLUTION.key)
add(IntSetting.RENDERER_VSYNC.key)
add(IntSetting.RENDERER_SCALING_FILTER.key)

3
src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt

@ -1509,6 +1509,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
if (BooleanSetting.SHOW_FPS.getBoolean(needsGlobal)) {
var fpsText = String.format("FPS: %.1f", actualFps)
if (BooleanSetting.ENABLE_FRAME_INTERPOLATION.getBoolean(needsGlobal)) {
fpsText += String.format(" (Generated: %.1f)", actualFps * 2)
}
sb.append(fpsText)
}

4
src/android/app/src/main/res/values/strings.xml

@ -465,6 +465,10 @@
<string name="network">Network</string>
<!-- Graphics settings strings -->
<string name="enable_frame_skipping">Enable Frame Skipping</string>
<string name="enable_frame_skipping_description">Toggle frame skipping to improve performance by reducing the number of rendered frames.</string>
<string name="enable_frame_interpolation">Enable Frame Interpolation</string>
<string name="enable_frame_interpolation_description">Toggle frame interpolation to improve visual smoothness by generating intermediate frames.</string>
<string name="renderer_resolution">Resolution (Handheld/Docked)</string>
<string name="renderer_vsync">VSync mode</string>
<string name="renderer_scaling_filter">Window adapting filter</string>

4
src/common/settings.h

@ -337,6 +337,10 @@ struct Values {
#endif
"backend", Category::Renderer};
SwitchableSetting<int> vulkan_device{linkage, 0, "vulkan_device", Category::Renderer, Specialization::RuntimeList};
SwitchableSetting<bool> enable_frame_interpolation{linkage, true, "enable_frame_interpolation",
Category::Renderer};
SwitchableSetting<bool> enable_frame_skipping{linkage, true, "enable_frame_skipping",
Category::Renderer};
// Graphics Settings
ResolutionScalingInfo resolution_info{};

13
src/video_core/renderer_vulkan/renderer_vulkan.cpp

@ -38,9 +38,6 @@
#include "video_core/vulkan_common/vulkan_memory_allocator.h"
#include "video_core/vulkan_common/vulkan_surface.h"
#include "video_core/vulkan_common/vulkan_wrapper.h"
#ifdef __ANDROID__
#include <jni.h>
#endif
namespace Vulkan {
namespace {
@ -175,6 +172,16 @@ RendererVulkan::~RendererVulkan() {
}
void RendererVulkan::Composite(std::span<const Tegra::FramebufferConfig> framebuffers) {
#ifdef __ANDROID__
static u64 frame_counter = 0;
if (Settings::values.enable_frame_skipping.GetValue()) {
++frame_counter;
if ((frame_counter % 2) != 0) {
return;
}
}
#endif
SCOPE_EXIT {
render_window.OnFrameDisplayed();
};

Loading…
Cancel
Save