Skip to content

overlays: localize shader compilation dialogs #19375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Megamouse merged 2 commits into from
Sep 1, 2026
+24 −11
Merged

overlays: localize shader compilation dialogs #19375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ec14ca
overlays: localize shader compilation dialogs
Megamouse Sep 1, 2026
5f2f143
Qt: log some game window settings
Megamouse Sep 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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);
Expand All @@ -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);
};
Expand Down
13 changes: 7 additions & 6 deletions rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <thread>

Expand Down Expand Up @@ -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<vk::pipeline_props> pipe_properties;
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 4 additions & 0 deletions rpcs3/Emu/localized_string_id.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 4 additions & 1 deletion rpcs3/rpcs3qt/gui_application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,10 +629,11 @@ std::unique_ptr<gs_frame> 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();
Expand Down Expand Up @@ -700,6 +701,8 @@ std::unique_ptr<gs_frame> 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())
Expand Down
6 changes: 5 additions & 1 deletion rpcs3/rpcs3qt/localized_emu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>(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>(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>(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>(args)...);
case localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_OPENGL_BUILD: return tr("Building variant %0...").arg(std::forward<Args>(args)...);
case localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_OPENGL_LINK: return tr("Linking variant %0...").arg(std::forward<Args>(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");
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/rpcs3qt/update_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
class downloader;
class gui_settings;

class update_manager final : public QObject
class update_manager final : public QObject
{
Q_OBJECT

Expand Down
Loading