Merge branch 'shadps4-emu:main' into main

Author: ngoquang2708

src/core/devtools/layer.cpp

@@ -18,6 +18,8 @@ using namespace Core::Devtools;
 using L = Core::Devtools::Layer;
 
 static bool show_simple_fps = false;
+static float fps_scale = 1.0f;
+
 static bool show_advanced_debug = false;
 
 static int dump_frame_count = 1;
@@ -149,8 +151,9 @@ void L::SetupSettings() {
     };
     handler.ReadLineFn = [](ImGuiContext*, ImGuiSettingsHandler*, void*, const char* line) {
         int v;
-        if (sscanf(line, "show_simple_fps=%d", &v) == 1) {
-            show_simple_fps = v != 0;
+        float f;
+        if (sscanf(line, "fps_scale=%f", &f) == 1) {
+            fps_scale = f;
         } else if (sscanf(line, "show_advanced_debug=%d", &v) == 1) {
             show_advanced_debug = v != 0;
         } else if (sscanf(line, "show_frame_graph=%d", &v) == 1) {
@@ -161,7 +164,7 @@ void L::SetupSettings() {
     };
     handler.WriteAllFn = [](ImGuiContext*, ImGuiSettingsHandler* handler, ImGuiTextBuffer* buf) {
         buf->appendf("[%s][Data]\n", handler->TypeName);
-        buf->appendf("show_simple_fps=%d\n", show_simple_fps);
+        buf->appendf("fps_scale=%f\n", fps_scale);
         buf->appendf("show_advanced_debug=%d\n", show_advanced_debug);
         buf->appendf("show_frame_graph=%d\n", frame_graph.is_open);
         buf->appendf("dump_frame_count=%d\n", dump_frame_count);
@@ -193,11 +196,24 @@ void L::Draw() {
     }
 
     if (show_simple_fps) {
-        SetWindowPos("Video Info", {999999.0f, 0.0f}, ImGuiCond_FirstUseEver);
         if (Begin("Video Info", nullptr,
                   ImGuiWindowFlags_NoNav | ImGuiWindowFlags_NoDecoration |
                       ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoDocking)) {
+            SetWindowPos("Video Info", {999999.0f, 0.0f}, ImGuiCond_FirstUseEver);
+            if (BeginPopupContextWindow()) {
+#define M(label, value)                                                                            \
+    if (MenuItem(label, nullptr, fps_scale == value))                                              \
+    fps_scale = value
+                M("0.5x", 0.5f);
+                M("1.0x", 1.0f);
+                M("1.5x", 1.5f);
+                M("2.0x", 2.0f);
+                M("2.5x", 2.5f);
+                EndPopup();
+#undef M
+            }
             KeepWindowInside();
+            SetWindowFontScale(fps_scale);
             DrawSimple();
         }
         End();

src/imgui/renderer/imgui_core.cpp

@@ -35,6 +35,7 @@ std::deque<std::pair<bool, ImGui::Layer*>>& GetChangeLayers() {
 }
 
 static std::mutex change_layers_mutex{};
+static ImGuiID dock_id;
 
 namespace ImGui {
 
@@ -106,6 +107,14 @@ void Initialize(const ::Vulkan::Instance& instance, const Frontend::WindowSDL& w
     Vulkan::Init(vk_info);
 
     TextureManager::StartWorker();
+
+    char label[32];
+    ImFormatString(label, IM_ARRAYSIZE(label), "WindowOverViewport_%08X", GetMainViewport()->ID);
+    dock_id = ImHashStr(label);
+
+    if (const auto dpi = SDL_GetWindowDisplayScale(window.GetSdlWindow()); dpi > 0.0f) {
+        GetIO().FontGlobalScale = dpi;
+    }
 }
 
 void OnResize() {
@@ -147,8 +156,10 @@ bool ProcessEvent(SDL_Event* event) {
     case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
     case SDL_EVENT_GAMEPAD_AXIS_MOTION:
     case SDL_EVENT_GAMEPAD_TOUCHPAD_DOWN:
-    case SDL_EVENT_GAMEPAD_TOUCHPAD_MOTION:
-        return GetIO().NavActive;
+    case SDL_EVENT_GAMEPAD_TOUCHPAD_MOTION: {
+        const auto& io = GetIO();
+        return io.NavActive && io.Ctx->NavWindow != nullptr && io.Ctx->NavWindow->ID != dock_id;
+    }
     default:
         return false;
     }

src/video_core/buffer_cache/buffer_cache.cpp

@@ -105,6 +105,15 @@ bool BufferCache::BindVertexBuffers(const Shader::Info& vs_info) {
         if (instance.IsVertexInputDynamicState()) {
             const auto cmdbuf = scheduler.CommandBuffer();
             cmdbuf.setVertexInputEXT(bindings, attributes);
+        } else if (bindings.empty()) {
+            // Required to call bindVertexBuffers2EXT at least once in the current command buffer
+            // with non-null strides without a non-dynamic stride pipeline in between. Thus even
+            // when nothing is bound we still need to make a dummy call. Non-null strides in turn
+            // requires a count greater than 0.
+            const auto cmdbuf = scheduler.CommandBuffer();
+            const std::array null_buffers = {GetBuffer(NULL_BUFFER_ID).buffer.buffer};
+            constexpr std::array null_offsets = {static_cast<vk::DeviceSize>(0)};
+            cmdbuf.bindVertexBuffers2EXT(0, null_buffers, null_offsets, null_offsets, null_offsets);
         }
     };
 

src/video_core/renderer_vulkan/vk_instance.cpp

@@ -366,6 +366,9 @@ bool Instance::CreateDevice() {
         vk::PhysicalDeviceColorWriteEnableFeaturesEXT{
             .colorWriteEnable = true,
         },
+        vk::PhysicalDeviceExtendedDynamicStateFeaturesEXT{
+            .extendedDynamicState = true,
+        },
         vk::PhysicalDeviceExtendedDynamicState3FeaturesEXT{
             .extendedDynamicState3ColorWriteMask = true,
         },