From 1b16ba3d984d2320fae7d327550b62d45595df2a Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Tue, 26 Jan 2021 02:23:06 +1000 Subject: [PATCH] Warning fixes --- src/core/gpu_hw_vulkan.cpp | 2 +- src/core/settings.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/gpu_hw_vulkan.cpp b/src/core/gpu_hw_vulkan.cpp index aa7bfddeb..e8d675391 100644 --- a/src/core/gpu_hw_vulkan.cpp +++ b/src/core/gpu_hw_vulkan.cpp @@ -133,7 +133,7 @@ bool GPU_HW_Vulkan::DoState(StateWrapper& sw, HostDisplayTexture** host_texture, { HostDisplayTexture* htex = *host_texture; if (!htex || htex->GetWidth() != m_vram_texture.GetWidth() || htex->GetHeight() != m_vram_texture.GetHeight() || - htex->GetSamples() != m_vram_texture.GetSamples()) + htex->GetSamples() != static_cast(m_vram_texture.GetSamples())) { delete htex; diff --git a/src/core/settings.cpp b/src/core/settings.cpp index de629bda6..4b448fa39 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -262,7 +262,7 @@ void Settings::Load(SettingsInterface& si) debugging.dump_cpu_to_vram_copies = si.GetBoolValue("Debug", "DumpCPUToVRAMCopies"); debugging.dump_vram_to_cpu_copies = si.GetBoolValue("Debug", "DumpVRAMToCPUCopies"); debugging.enable_gdb_server = si.GetBoolValue("Debug", "EnableGDBServer"); - debugging.gdb_server_port = si.GetIntValue("Debug", "GDBServerPort"); + debugging.gdb_server_port = static_cast(si.GetIntValue("Debug", "GDBServerPort")); debugging.show_gpu_state = si.GetBoolValue("Debug", "ShowGPUState"); debugging.show_cdrom_state = si.GetBoolValue("Debug", "ShowCDROMState"); debugging.show_spu_state = si.GetBoolValue("Debug", "ShowSPUState"); @@ -304,7 +304,7 @@ void Settings::Save(SettingsInterface& si) const si.SetFloatValue("Main", "RewindFrequency", rewind_save_frequency); si.SetIntValue("Main", "RewindSaveSlots", rewind_save_slots); si.SetBoolValue("Main", "RunaheadEnable", runahead_enable); - si.SetFloatValue("Main", "RunaheadFrames", runahead_frames); + si.SetIntValue("Main", "RunaheadFrames", runahead_frames); si.SetStringValue("CPU", "ExecutionMode", GetCPUExecutionModeName(cpu_execution_mode)); si.SetBoolValue("CPU", "OverclockEnable", cpu_overclock_enable);