From bc01863654669067ec34da79374f5a2dd0871f37 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 16 Nov 2025 19:23:37 +0100 Subject: [PATCH] Fix some warnings --- rpcs3/Emu/CPU/CPUTranslator.h | 2 +- rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp | 2 +- rpcs3/Emu/RSX/VK/VKCompute.cpp | 6 ------ rpcs3/util/sysinfo.cpp | 8 ++++---- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/rpcs3/Emu/CPU/CPUTranslator.h b/rpcs3/Emu/CPU/CPUTranslator.h index 8d1a5d42aa..bb5b262294 100644 --- a/rpcs3/Emu/CPU/CPUTranslator.h +++ b/rpcs3/Emu/CPU/CPUTranslator.h @@ -4007,7 +4007,7 @@ llvm::CallInst* llvm_asm( const std::string& constraints, llvm::LLVMContext& context) { - llvm::ArrayRef types_ref = std::nullopt; + llvm::ArrayRef types_ref {}; std::vector types; types.reserve(args.size()); diff --git a/rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp b/rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp index ce2b685046..ba3d138f96 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp +++ b/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(caret_x) + padding_left + x, static_cast(caret_y) + padding_top + y); diff --git a/rpcs3/Emu/RSX/VK/VKCompute.cpp b/rpcs3/Emu/RSX/VK/VKCompute.cpp index 9e9e2a4746..6803ce1f49 100644 --- a/rpcs3/Emu/RSX/VK/VKCompute.cpp +++ b/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, diff --git a/rpcs3/util/sysinfo.cpp b/rpcs3/util/sysinfo.cpp index 52bb6f27b0..bf9376239c 100755 --- a/rpcs3/util/sysinfo.cpp +++ b/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 { @@ -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() {