diff --git a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp index 21a35bdb4d69..e1c7f6884650 100644 --- a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp +++ b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp @@ -8,6 +8,7 @@ #include "Emu/RSX/rsx_methods.h" #include "Emu/RSX/Overlays/Shaders/shader_loading_dialog.h" #include "Emu/RSX/Program/GLSLCommon.h" +#include "Emu/localized_string.h" namespace gl { @@ -17,7 +18,7 @@ namespace gl void shader_interpreter::create(rsx::shader_loading_dialog* dlg) { - dlg->create("Precompiling interpreter variants.\nPlease wait...", "Shader Compilation"); + dlg->create(get_localized_string(localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS), get_localized_string(localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_TITLE)); const auto variants = program_common::interpreter::get_interpreter_variants(); const u32 limit1 = ::size32(variants.base_pipelines); @@ -32,7 +33,7 @@ namespace gl { const auto completed = ctr.load(); const auto limit = stage ? limit2 : limit1; - const auto message = fmt::format("%s variant %u of %u...", stage ? "Linking" : "Building", ctr.load(), limit); + const auto message = get_localized_string(stage ? localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_OPENGL_LINK : localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_OPENGL_BUILD, "%u %s %u", ctr.load(), get_localized_string(localized_string_id::PROGRESS_DIALOG_OF), limit); dlg->update_msg(stage, message); dlg->set_value(stage, completed); }; diff --git a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp index 7c8adea22c91..a941702e61cd 100644 --- a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp +++ b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp @@ -6,10 +6,11 @@ #include "VKHelpers.h" #include "VKRenderPass.h" -#include "../Overlays/Shaders/shader_loading_dialog.h" -#include "../Program/GLSLCommon.h" -#include "../Program/ShaderInterpreter.h" -#include "../rsx_methods.h" +#include "Emu/RSX/Overlays/Shaders/shader_loading_dialog.h" +#include "Emu/RSX/Program/GLSLCommon.h" +#include "Emu/RSX/Program/ShaderInterpreter.h" +#include "Emu/RSX/rsx_methods.h" +#include "Emu/localized_string.h" #include @@ -719,7 +720,7 @@ namespace vk void shader_interpreter::preload(rsx::shader_loading_dialog* dlg) { - dlg->create("Precompiling interpreter variants.\nPlease wait...", "Shader Compilation"); + dlg->create(get_localized_string(localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS), get_localized_string(localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_TITLE)); // Create some basic pipelines that we'll use to seed the base pipeline queue std::vector pipe_properties; @@ -778,7 +779,7 @@ namespace vk std::this_thread::sleep_for(16ms); const auto completed = ctr.load(); - dlg->update_msg(0, fmt::format("Building base variant %u of %u...", completed, limit1)); + dlg->update_msg(0, get_localized_string(localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_VULKAN, "%u %s %u", completed, get_localized_string(localized_string_id::PROGRESS_DIALOG_OF), limit1)); dlg->set_value(0, completed); } while (ctr.load() < limit1); diff --git a/rpcs3/Emu/localized_string_id.h b/rpcs3/Emu/localized_string_id.h index 951fce2b5025..a16c3ddb74a3 100644 --- a/rpcs3/Emu/localized_string_id.h +++ b/rpcs3/Emu/localized_string_id.h @@ -10,6 +10,10 @@ enum class localized_string_id RSX_OVERLAYS_TROPHY_GOLD, RSX_OVERLAYS_TROPHY_PLATINUM, RSX_OVERLAYS_COMPILING_SHADERS, + RSX_OVERLAYS_COMPILING_SHADERS_TITLE, + RSX_OVERLAYS_COMPILING_SHADERS_VULKAN, + RSX_OVERLAYS_COMPILING_SHADERS_OPENGL_BUILD, + RSX_OVERLAYS_COMPILING_SHADERS_OPENGL_LINK, RSX_OVERLAYS_COMPILING_PPU_MODULES, RSX_OVERLAYS_MSG_DIALOG_YES, RSX_OVERLAYS_MSG_DIALOG_NO, diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp index 6a73ba4cb294..6516a366368a 100644 --- a/rpcs3/rpcs3qt/gui_application.cpp +++ b/rpcs3/rpcs3qt/gui_application.cpp @@ -629,10 +629,11 @@ std::unique_ptr gui_application::get_gs_frame() auto [w, h] = ::at32(g_video_out_resolution_map, g_cfg.video.resolution); const bool resize_game_window = m_gui_settings->GetValue(gui::gs_resize).toBool(); + const bool resize_manually = m_gui_settings->GetValue(gui::gs_resize_manual).toBool(); if (resize_game_window) { - if (m_gui_settings->GetValue(gui::gs_resize_manual).toBool()) + if (resize_manually) { w = m_gui_settings->GetValue(gui::gs_width).toInt(); h = m_gui_settings->GetValue(gui::gs_height).toInt(); @@ -700,6 +701,8 @@ std::unique_ptr gui_application::get_gs_frame() frame_geometry.setSize(QSize(w, h)); } + gui_log.notice("gui_application: game window geometry: x=%d, y=%d, w=%d, h=%d, screen=%d, resize=%d, manually=%d", frame_geometry.left(), frame_geometry.top(), frame_geometry.width(), frame_geometry.height(), screen_index, resize_game_window, resize_manually); + gs_frame* frame = nullptr; switch (g_cfg.video.renderer.get()) diff --git a/rpcs3/rpcs3qt/localized_emu.h b/rpcs3/rpcs3qt/localized_emu.h index 19e3b0a2889d..881b6007720c 100644 --- a/rpcs3/rpcs3qt/localized_emu.h +++ b/rpcs3/rpcs3qt/localized_emu.h @@ -43,7 +43,11 @@ class localized_emu : public QObject case localized_string_id::RSX_OVERLAYS_TROPHY_SILVER: return tr("You have earned a silver trophy.\n%0", "Trophy text").arg(std::forward(args)...); case localized_string_id::RSX_OVERLAYS_TROPHY_GOLD: return tr("You have earned a gold trophy.\n%0", "Trophy text").arg(std::forward(args)...); case localized_string_id::RSX_OVERLAYS_TROPHY_PLATINUM: return tr("You have earned a platinum trophy.\n%0", "Trophy text").arg(std::forward(args)...); - case localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS: return tr("Compiling shaders"); + case localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS: return tr("Precompiling shader interpreter variants.\nPlease wait..."); + case localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_TITLE: return tr("Shader Compilation"); + case localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_VULKAN: return tr("Building base variant %0...").arg(std::forward(args)...); + case localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_OPENGL_BUILD: return tr("Building variant %0...").arg(std::forward(args)...); + case localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_OPENGL_LINK: return tr("Linking variant %0...").arg(std::forward(args)...); case localized_string_id::RSX_OVERLAYS_COMPILING_PPU_MODULES: return tr("Compiling PPU Modules"); case localized_string_id::RSX_OVERLAYS_MSG_DIALOG_YES: return tr("Yes", "Message Dialog"); case localized_string_id::RSX_OVERLAYS_MSG_DIALOG_NO: return tr("No", "Message Dialog"); diff --git a/rpcs3/rpcs3qt/update_manager.h b/rpcs3/rpcs3qt/update_manager.h index c594fde5a906..75f495a2dc38 100644 --- a/rpcs3/rpcs3qt/update_manager.h +++ b/rpcs3/rpcs3qt/update_manager.h @@ -9,7 +9,7 @@ class downloader; class gui_settings; -class update_manager final : public QObject +class update_manager final : public QObject { Q_OBJECT