diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml
index 08ca53ad81..274326d495 100644
--- a/src/android/app/src/main/res/values/arrays.xml
+++ b/src/android/app/src/main/res/values/arrays.xml
@@ -180,6 +180,7 @@
- @string/resolution_half
- @string/resolution_three_quarter
- @string/resolution_one
+ - @string/resolution_five_quarter
- @string/resolution_three_half
- @string/resolution_two
- @string/resolution_three
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index 1545576ea8..a084603835 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -972,6 +972,7 @@
0.5X (360p/540p)
0.75X (540p/810p)
1X (720p/1080p)
+ 1.25X (900p/1350p)
1.5X (1080p/1620p)
2X (1440p/2160p) (Slow)
3X (2160p/3240p) (Slow)
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index b41f4c75f5..b849d7cb6a 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -301,6 +301,10 @@ void TranslateResolutionInfo(ResolutionSetup setup, ResolutionScalingInfo& info)
info.up_scale = 3;
info.down_shift = 1;
break;
+ case ResolutionSetup::Res5_4X:
+ info.up_scale = 5;
+ info.down_shift = 2;
+ break;
case ResolutionSetup::Res2X:
info.up_scale = 2;
info.down_shift = 0;
diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h
index ebfa4ceb9e..ecf2bbcea2 100644
--- a/src/common/settings_enums.h
+++ b/src/common/settings_enums.h
@@ -157,6 +157,7 @@ ENUM(ResolutionSetup,
Res1_2X,
Res3_4X,
Res1X,
+ Res5_4X,
Res3_2X,
Res2X,
Res3X,
diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp
index 7dbedea650..e8ccd483ab 100644
--- a/src/core/hle/service/acc/acc.cpp
+++ b/src/core/hle/service/acc/acc.cpp
@@ -694,7 +694,7 @@ private:
LOG_WARNING(Service_ACC, "(STUBBED) called");
std::vector token_data(0x100);
- std::fill(token_data.begin(), token_data.end(), 0);
+ std::fill(token_data.begin(), token_data.end(), u8(0));
ctx.WriteBuffer(token_data, 0);
diff --git a/src/dynarmic/CMakeLists.txt b/src/dynarmic/CMakeLists.txt
index 331f42afba..6b3308fb54 100644
--- a/src/dynarmic/CMakeLists.txt
+++ b/src/dynarmic/CMakeLists.txt
@@ -18,11 +18,7 @@ endif()
# Dynarmic project options
option(DYNARMIC_ENABLE_CPU_FEATURE_DETECTION "Turning this off causes dynarmic to assume the host CPU doesn't support anything later than SSE3" ON)
-if (PLATFORM_OPENBSD)
- option(DYNARMIC_ENABLE_NO_EXECUTE_SUPPORT "Enables support for systems that require W^X" ON)
-else()
- option(DYNARMIC_ENABLE_NO_EXECUTE_SUPPORT "Enables support for systems that require W^X" OFF)
-endif()
+option(DYNARMIC_ENABLE_NO_EXECUTE_SUPPORT "Enables support for systems that require W^X" ${PLATFORM_OPENBSD})
option(DYNARMIC_FATAL_ERRORS "Errors are fatal" OFF)
option(DYNARMIC_IGNORE_ASSERTS "Ignore asserts" OFF)
diff --git a/src/qt_common/shared_translation.cpp b/src/qt_common/shared_translation.cpp
index 4254253c2f..7375473710 100644
--- a/src/qt_common/shared_translation.cpp
+++ b/src/qt_common/shared_translation.cpp
@@ -296,9 +296,7 @@ std::unique_ptr InitializeTranslations(QObject* parent)
INSERT(Settings,
use_asynchronous_shaders,
tr("Use asynchronous shader building (Hack)"),
- tr("Enables asynchronous shader compilation, which may reduce shader stutter.\nThis "
- "feature "
- "is experimental."));
+ tr("Enables asynchronous shader compilation, which may reduce shader stutter."));
INSERT(Settings, use_fast_gpu_time, QString(), QString());
INSERT(Settings,
fast_gpu_time,
@@ -558,6 +556,7 @@ std::unique_ptr ComboboxEnumeration(QObject* parent)
PAIR(ResolutionSetup, Res1_2X, tr("0.5X (360p/540p) [EXPERIMENTAL]")),
PAIR(ResolutionSetup, Res3_4X, tr("0.75X (540p/810p) [EXPERIMENTAL]")),
PAIR(ResolutionSetup, Res1X, tr("1X (720p/1080p)")),
+ PAIR(ResolutionSetup, Res5_4X, tr("1.25X (900p/1350p) [EXPERIMENTAL]")),
PAIR(ResolutionSetup, Res3_2X, tr("1.5X (1080p/1620p) [EXPERIMENTAL]")),
PAIR(ResolutionSetup, Res2X, tr("2X (1440p/2160p)")),
PAIR(ResolutionSetup, Res3X, tr("3X (2160p/3240p)")),
diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
index f5594450c2..745389213e 100644
--- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
+++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
@@ -896,11 +896,6 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {
.pName = "main",
.pSpecializationInfo = nullptr,
});
- /*
- if (program[stage]->entries.uses_warps && device.IsGuestWarpSizeSupported(stage_ci.stage)) {
- stage_ci.pNext = &subgroup_size_ci;
- }
- */
}
VkPipelineCreateFlags flags{};
if (device.IsKhrPipelineExecutablePropertiesEnabled() && Settings::values.renderer_debug.GetValue()) {