Merge branch 'master' into tessssst

Author: Megamouse

Utilities/date_time.h

@@ -47,7 +47,7 @@ namespace date_time
 
 		std::string parse_buf;
 
-		if constexpr(separator != 0)
+		if constexpr (separator != 0)
 			parse_buf = std::string("%Y") + separator + "%m" + separator + "%d" + separator + "%H" + separator + "%M" + separator + "%S";
 		else
 			parse_buf = "%Y%m%d%H%M%S";

rpcs3/Emu/NP/rpcn_client.cpp

@@ -163,6 +163,7 @@ void fmt_class_string<rpcn::CommandType>::format(std::string& out, u64 arg)
 			case rpcn::CommandType::SearchJoinRoomGUI: return "SearchJoinRoomGUI";
 			case rpcn::CommandType::UnlockTrophy: return "UnlockTrophy";
 			case rpcn::CommandType::SyncTrophies: return "SyncTrophies";
+			case rpcn::CommandType::DeleteTrophies: return "DeleteTrophies";
 			}
 
 			return unknown;
@@ -259,7 +260,7 @@ namespace rpcn
 		rpcn_log.notice("online: %s, pr_com_id: %s, pr_title: %s, pr_status: %s, pr_comment: %s, pr_data: %s", online ? "true" : "false", pr_com_id.data, pr_title, pr_status, pr_comment, fmt::buf_to_hexstring(pr_data.data(), pr_data.size()));
 	}
 
-	constexpr u32 RPCN_PROTOCOL_VERSION = 31;
+	constexpr u32 RPCN_PROTOCOL_VERSION = 32;
 	constexpr usz RPCN_HEADER_SIZE = 15;
 
 	const char* error_to_explanation(rpcn::ErrorType error)
@@ -676,7 +677,7 @@ namespace rpcn
 				command == CommandType::SendMessage || command == CommandType::SendToken ||
 				command == CommandType::SendResetToken || command == CommandType::ResetPassword ||
 				command == CommandType::GetNetworkTime || command == CommandType::SetPresence || command == CommandType::Terminate ||
-				command == CommandType::SyncTrophies)
+				command == CommandType::SyncTrophies || command == CommandType::DeleteTrophies)
 			{
 				std::lock_guard lock(mutex_replies_sync);
 				replies_sync.insert(std::make_pair(packet_id, std::make_pair(command, std::move(data))));
@@ -1482,6 +1483,37 @@ namespace rpcn
 		return error;
 	}
 
+	ErrorType rpcn_client::delete_trophies(std::string_view communication_id)
+	{
+		std::vector<u8> data;
+		std::copy(communication_id.begin(), communication_id.end(), std::back_inserter(data));
+		data.push_back(0);
+
+		std::vector<u8> packet_data;
+
+		if (!forge_send_reply(CommandType::DeleteTrophies, rpcn_request_counter.fetch_add(1), data, packet_data))
+		{
+			return ErrorType::Malformed;
+		}
+
+		vec_stream reply(packet_data);
+		const auto error = static_cast<ErrorType>(reply.get<u8>());
+
+		if (error == rpcn::ErrorType::NoError)
+		{
+			if (communication_id.empty())
+			{
+				rpcn_log.success("RPCN trophies were successfully deleted!");
+			}
+			else
+			{
+				rpcn_log.success("RPCN trophies for %s were successfully deleted!", communication_id);
+			}
+		}
+
+		return error;
+	}
+
 	std::optional<ErrorType> rpcn_client::add_friend(std::string_view friend_username)
 	{
 		std::vector<u8> data;

rpcs3/Emu/NP/rpcn_client.h

@@ -301,6 +301,7 @@ namespace rpcn
 		ErrorType send_reset_token(std::string_view npid, std::string_view email);
 		ErrorType reset_password(std::string_view npid, std::string_view token, std::string_view password);
 		ErrorType delete_account();
+		ErrorType delete_trophies(std::string_view communication_id = {});
 		std::optional<ErrorType> add_friend(std::string_view friend_username);
 		bool remove_friend(std::string_view friend_username);
 

rpcs3/Emu/NP/rpcn_types.h

@@ -71,6 +71,7 @@ namespace rpcn
 		GetRoomMemberDataExternalList,
 		UnlockTrophy,
 		SyncTrophies,
+		DeleteTrophies,
 	};
 
 	enum class NotificationType : u16

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);
 		};

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 <thread>
 
@@ -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;
@@ -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);

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,

rpcs3/rpcs3qt/gs_frame.cpp

@@ -722,7 +722,7 @@ void gs_frame::show()
 		{
 			setVisibility(FullScreen);
 		}
-		else if (const QVariant var = m_gui_settings->GetValue(gui::gs_visibility); var.canConvert<QString>())
+		else if (const QVariant var = m_gui_settings->GetValue(gui::gs_visibility); var.canConvert<QString>() && !m_gui_settings->GetValue(gui::gs_resize).toBool())
 		{
 			// Restore saved visibility from last time. Make sure not to hide the window, or the user can't access it anymore.
 			if (const Visibility visibility = gui::string_to_visibility(var.value<QString>()); visibility != Visibility::Hidden)

rpcs3/rpcs3qt/gui_application.cpp

@@ -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();
@@ -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())

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>(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");