Merge branch 'master' into nastys-patch-17

rpcs3/Emu/CPU/CPUTranslator.h

@@ -4007,7 +4007,7 @@ llvm::CallInst* llvm_asm(
 	const std::string& constraints,
 	llvm::LLVMContext& context)
 {
-	llvm::ArrayRef<llvm::Type*> types_ref = std::nullopt;
+	llvm::ArrayRef<llvm::Type*> types_ref {};
 	std::vector<llvm::Type*> types;
 	types.reserve(args.size());
 

rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp

@@ -199,7 +199,7 @@ namespace rsx
 			if (!is_compiled())
 			{
 				auto renderer = get_font();
-				const auto [caret_x, caret_y] = renderer->get_char_offset(text.c_str(), caret_position, clip_text ? w : -1, wrap_text);
+				const auto& [caret_x, caret_y] = renderer->get_char_offset(text.c_str(), caret_position, clip_text ? w : -1, wrap_text);
 
 				overlay_element caret;
 				caret.set_pos(static_cast<u16>(caret_x) + padding_left + x, static_cast<u16>(caret_y) + padding_top + y);

rpcs3/Emu/RSX/VK/VKCompute.cpp

@@ -111,12 +111,6 @@ namespace vk
 			m_shader.create(::glsl::program_domain::glsl_compute_program, m_src);
 			auto handle = m_shader.compile();
 
-			VkPipelineShaderStageCreateInfo shader_stage{};
-			shader_stage.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
-			shader_stage.stage = VK_SHADER_STAGE_COMPUTE_BIT;
-			shader_stage.module = handle;
-			shader_stage.pName = "main";
-
 			VkComputePipelineCreateInfo create_info
 			{
 				.sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO,

rpcs3/rpcs3qt/elf_memory_dumping_dialog.cpp

@@ -1,8 +1,9 @@
 #include "elf_memory_dumping_dialog.h"
-#include "Emu/Cell/SPUThread.h"
-
+#include "gui_settings.h"
 #include "qt_utils.h"
 
+#include "Emu/Cell/SPUThread.h"
+
 #include <QFileDialog>
 #include <QCoreApplication>
 #include <QFontDatabase>

rpcs3/rpcs3qt/elf_memory_dumping_dialog.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "util/types.hpp"
-#include "gui_settings.h"
 
 #include <QListWidget>
 #include <QLineEdit>
@@ -9,6 +8,8 @@
 
 #include <memory>
 
+class gui_settings;
+
 class elf_memory_dumping_dialog : public QDialog
 {
 	Q_OBJECT

rpcs3/rpcs3qt/qt_camera_video_sink.cpp

@@ -71,7 +71,14 @@ bool qt_camera_video_sink::present(const QVideoFrame& frame)
 		// Flip image if necessary
 		if (flip_horizontally || flip_vertically)
 		{
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+			Qt::Orientations orientation {};
+			orientation.setFlag(Qt::Orientation::Horizontal, flip_horizontally);
+			orientation.setFlag(Qt::Orientation::Vertical, flip_vertically);
+			image.flip(orientation);
+#else
 			image.mirror(flip_horizontally, flip_vertically);
+#endif
 		}
 
 		if (image.format() != QImage::Format_RGBA8888)

rpcs3/rpcs3qt/rsx_debugger.cpp

@@ -1252,8 +1252,8 @@ void rsx_debugger::GetVertexProgram() const
 		rsx::method_registers.clip_planes_mask()
 	};
 
-	vp_blob.resize(vp_blob.size() + vp.data.size());
-	std::copy(vp.data.begin(), vp.data.end(), vp_blob.begin() + 14);
+	vp_blob.reserve(vp_blob.size() + vp.data.size());
+	vp_blob.insert(vp_blob.end(), vp.data.begin(), vp.data.end());
 
 	std::span<u32> vp_binary(vp_blob);
 	CgBinaryDisasm vp_disasm(vp_binary);

rpcs3/rpcs3qt/shortcut_dialog.cpp

@@ -1,6 +1,7 @@
 #include "shortcut_dialog.h"
 #include "ui_shortcut_dialog.h"
 #include "shortcut_settings.h"
+#include "gui_settings.h"
 
 #include <QDialogButtonBox>
 #include <QPushButton>

rpcs3/rpcs3qt/shortcut_dialog.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "gui_settings.h"
-
 #include <QDialog>
 
+class gui_settings;
+
 namespace Ui
 {
 	class shortcut_dialog;

rpcs3/rpcs3qt/shortcut_handler.cpp

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "shortcut_handler.h"
+#include "gui_settings.h"
 
 LOG_CHANNEL(shortcut_log, "Shortcuts");
 

rpcs3/rpcs3qt/shortcut_handler.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "gui_settings.h"
 #include "shortcut_settings.h"
 
 #include <QShortcut>
@@ -8,6 +7,8 @@
 
 #include <map>
 
+class gui_settings;
+
 class shortcut_handler : public QObject
 {
 	Q_OBJECT

rpcs3/rpcs3qt/shortcut_settings.cpp

@@ -1,4 +1,5 @@
 #include "shortcut_settings.h"
+#include "gui_settings.h"
 
 using namespace gui::shortcuts;
 

rpcs3/rpcs3qt/shortcut_settings.h

@@ -1,9 +1,11 @@
 #pragma once
 
-#include "gui_settings.h"
+#include "gui_save.h"
 
 #include <QKeySequence>
 
+class gui_settings;
+
 namespace gui
 {
 	namespace shortcuts

rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp

@@ -1,4 +1,5 @@
 #include "vfs_dialog_path_widget.h"
+#include "gui_settings.h"
 
 #include <QFileDialog>
 #include <QCoreApplication>

rpcs3/rpcs3qt/vfs_dialog_path_widget.h

@@ -1,12 +1,14 @@
 #pragma once
 
-#include "gui_settings.h"
+#include "gui_save.h"
 
 #include <QListWidget>
 #include <QLabel>
 
 #include <memory>
 
+class gui_settings;
+
 namespace cfg
 {
 	class string;

rpcs3/rpcs3qt/vfs_dialog_tab.cpp

@@ -1,4 +1,5 @@
 #include "vfs_dialog_tab.h"
+#include "gui_settings.h"
 #include "Utilities/Config.h"
 
 vfs_dialog_tab::vfs_dialog_tab(const QString& name, gui_save list_location, cfg::string* cfg_node, std::shared_ptr<gui_settings> _gui_settings, QWidget* parent)

rpcs3/rpcs3qt/vfs_dialog_usb_tab.cpp

@@ -1,6 +1,7 @@
 #include "vfs_dialog_usb_tab.h"
 #include "vfs_dialog_usb_input.h"
 #include "table_item_delegate.h"
+#include "gui_settings.h"
 #include "Utilities/Config.h"
 
 #include <QVBoxLayout>

rpcs3/rpcs3qt/vfs_dialog_usb_tab.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "gui_settings.h"
-
 #include <QTableWidget>
 #include <QLabel>
 
 #include <memory>
 
+class gui_settings;
+
 namespace cfg
 {
 	class device_entry;

rpcs3/util/sysinfo.cpp

@@ -71,9 +71,10 @@ namespace Darwin_ProcessInfo
 }
 #endif
 
+#ifdef _WIN32
+#if !defined(ARCH_X64)
 namespace utils
 {
-#ifdef _WIN32
 	// Some helpers for sanity
 	const auto read_reg_dword = [](HKEY hKey, std::string_view value_name) -> std::pair<bool, DWORD>
 	{
@@ -110,7 +111,6 @@ namespace utils
 		return { true, sz };
 	};
 
-#if !defined(ARCH_X64)
 	// Alternative way to read OS version using the registry.
 	static std::string get_fallback_windows_version()
 	{
@@ -152,9 +152,9 @@ namespace utils
 
 		return fmt::format("Operating system: %s, Version %s", product_name, version_id);
 	}
-#endif
-#endif
 }
+#endif
+#endif
 
 bool utils::has_ssse3()
 {