diff --git a/src/core/cdrom.cpp b/src/core/cdrom.cpp index 033d5d9b5..2b4ec442c 100644 --- a/src/core/cdrom.cpp +++ b/src/core/cdrom.cpp @@ -19,261 +19,49 @@ struct CommandInfo }; static std::array s_command_info = {{ - {"Sync", 0}, - {"Getstat", 0}, - {"Setloc", 3}, - {"Play", 0}, - {"Forward", 0}, - {"Backward", 0}, - {"ReadN", 0}, - {"MotorOn", 0}, - {"Stop", 0}, - {"Pause", 0}, - {"Reset", 0}, - {"Mute", 0}, - {"Demute", 0}, - {"Setfilter", 2}, - {"Setmode", 1}, - {"Getparam", 0}, - {"GetlocL", 0}, - {"GetlocP", 0}, - {"SetSession", 1}, - {"GetTN", 0}, - {"GetTD", 1}, - {"SeekL", 0}, - {"SeekP", 0}, - {"SetClock", 0}, - {"GetClock", 0}, - {"Test", 1}, - {"GetID", 0}, - {"ReadS", 0}, - {"Init", 0}, - {"GetQ", 2}, - {"ReadTOC", 0}, - {"VideoCD", 6}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - {"Unknown", 0}, - 0 // Unknown + {"Sync", 0}, {"Getstat", 0}, {"Setloc", 3}, {"Play", 0}, {"Forward", 0}, {"Backward", 0}, + {"ReadN", 0}, {"MotorOn", 0}, {"Stop", 0}, {"Pause", 0}, {"Reset", 0}, {"Mute", 0}, + {"Demute", 0}, {"Setfilter", 2}, {"Setmode", 1}, {"Getparam", 0}, {"GetlocL", 0}, {"GetlocP", 0}, + {"SetSession", 1}, {"GetTN", 0}, {"GetTD", 1}, {"SeekL", 0}, {"SeekP", 0}, {"SetClock", 0}, + {"GetClock", 0}, {"Test", 1}, {"GetID", 0}, {"ReadS", 0}, {"Init", 0}, {"GetQ", 2}, + {"ReadTOC", 0}, {"VideoCD", 6}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, {"Unknown", 0}, + {"Unknown", 0}, {"Unknown", 0}, {nullptr, 0} // Unknown }}; CDROM g_cdrom; diff --git a/src/core/gpu_commands.cpp b/src/core/gpu_commands.cpp index c9334822c..1f379af3f 100644 --- a/src/core/gpu_commands.cpp +++ b/src/core/gpu_commands.cpp @@ -44,9 +44,6 @@ void GPU::ExecuteCommands() { DebugAssert(m_blit_remaining_words > 0); const u32 words_to_copy = std::min(m_blit_remaining_words, m_fifo.GetSize()); - const size_t old_size = m_blit_buffer.size(); - // m_blit_buffer.resize(m_blit_buffer.size() + words_to_copy); - // FifoPopRange(&m_blit_buffer[old_size], words_to_copy); m_blit_buffer.reserve(m_blit_buffer.size() + words_to_copy); for (u32 i = 0; i < words_to_copy; i++) m_blit_buffer.push_back(FifoPop()); @@ -83,9 +80,6 @@ void GPU::ExecuteCommands() const u32 words_to_copy = std::min(terminator_index, m_fifo.GetSize()); if (words_to_copy > 0) { - const size_t old_size = m_blit_buffer.size(); - // m_blit_buffer.resize(m_blit_buffer.size() + words_to_copy); - // FifoPopRange(&m_blit_buffer[old_size], words_to_copy); m_blit_buffer.reserve(m_blit_buffer.size() + words_to_copy); for (u32 i = 0; i < words_to_copy; i++) m_blit_buffer.push_back(FifoPop()); diff --git a/src/core/gpu_hw_vulkan.cpp b/src/core/gpu_hw_vulkan.cpp index d9d75b6a1..1f82a979e 100644 --- a/src/core/gpu_hw_vulkan.cpp +++ b/src/core/gpu_hw_vulkan.cpp @@ -946,7 +946,7 @@ void GPU_HW_Vulkan::ClearDisplay() VkCommandBuffer cmdbuf = g_vulkan_context->GetCurrentCommandBuffer(); m_display_texture.TransitionToLayout(cmdbuf, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); - static const VkClearColorValue cc = {0.0f, 0.0f, 0.0f, 1.0f}; + static const VkClearColorValue cc = {{0.0f, 0.0f, 0.0f, 1.0f}}; static const VkImageSubresourceRange srr = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; vkCmdClearColorImage(cmdbuf, m_display_texture.GetImage(), m_display_texture.GetLayout(), &cc, 1, &srr); } diff --git a/src/core/gpu_sw.cpp b/src/core/gpu_sw.cpp index 23b5f4c77..b602826cc 100644 --- a/src/core/gpu_sw.cpp +++ b/src/core/gpu_sw.cpp @@ -121,7 +121,6 @@ void GPU_SW::CopyOut24Bit(u32 src_x, u32 src_y, u32* dst_ptr, u32 dst_stride, u3 dst_stride <<= interlaced_shift; height >>= interlaced_shift; - const u32 end_x = src_x + width; for (u32 row = 0; row < height; row++) { const u16* src_row_ptr = &m_vram[(src_y % VRAM_HEIGHT) * VRAM_WIDTH]; @@ -160,7 +159,6 @@ void GPU_SW::UpdateDisplay() return; } - const u32 vram_offset_x = m_crtc_state.display_vram_left; const u32 vram_offset_y = m_crtc_state.display_vram_top; const u32 display_width = m_crtc_state.display_vram_width; const u32 display_height = m_crtc_state.display_vram_height; diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 4c354287a..f0d10cd2c 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -7,6 +7,8 @@ Settings g_settings; +SettingsInterface::~SettingsInterface() = default; + const char* SettingInfo::StringDefaultValue() const { return default_value ? default_value : ""; @@ -628,3 +630,4 @@ const char* Settings::GetMemoryCardTypeDisplayName(MemoryCardType type) { return s_memory_card_type_display_names[static_cast(type)]; } + diff --git a/src/core/settings.h b/src/core/settings.h index aa5f63f9b..4fb3796ab 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -9,6 +9,8 @@ class SettingsInterface { public: + virtual ~SettingsInterface(); + virtual void Clear() = 0; virtual int GetIntValue(const char* section, const char* key, int default_value = 0) = 0; diff --git a/src/duckstation-libretro/libretro_host_interface.h b/src/duckstation-libretro/libretro_host_interface.h index 07e0e23fb..941d31ff8 100644 --- a/src/duckstation-libretro/libretro_host_interface.h +++ b/src/duckstation-libretro/libretro_host_interface.h @@ -54,7 +54,7 @@ private: void InitDiskControlInterface(); void InitRumbleInterface(); - void LoadSettings(); + void LoadSettings() override; void UpdateSettings(); void UpdateControllers(); void UpdateControllersDigitalController(u32 index); diff --git a/src/duckstation-qt/qthostinterface.h b/src/duckstation-qt/qthostinterface.h index 0d5c48721..927b13249 100644 --- a/src/duckstation-qt/qthostinterface.h +++ b/src/duckstation-qt/qthostinterface.h @@ -64,8 +64,8 @@ public: void SetStringListSettingValue(const char* section, const char* key, const std::vector& values); void RemoveSettingValue(const char* section, const char* key); - TinyString TranslateString(const char* context, const char* str) const; - std::string TranslateStdString(const char* context, const char* str) const; + TinyString TranslateString(const char* context, const char* str) const override; + std::string TranslateStdString(const char* context, const char* str) const override; ALWAYS_INLINE const GameList* getGameList() const { return m_game_list.get(); } ALWAYS_INLINE GameList* getGameList() { return m_game_list.get(); } diff --git a/src/frontend-common/common_host_interface.cpp b/src/frontend-common/common_host_interface.cpp index 8df599450..7bc472ae1 100644 --- a/src/frontend-common/common_host_interface.cpp +++ b/src/frontend-common/common_host_interface.cpp @@ -1048,7 +1048,7 @@ void CommonHostInterface::UpdateControllerInputMap(SettingsInterface& si) if (!SplitBinding(binding, &device, &button)) continue; - AddButtonToInputMap(binding, device, button, [this, controller_index, button_code](bool pressed) { + AddButtonToInputMap(binding, device, button, [controller_index, button_code](bool pressed) { if (System::IsShutdown()) return; @@ -1074,7 +1074,7 @@ void CommonHostInterface::UpdateControllerInputMap(SettingsInterface& si) if (!SplitBinding(binding, &device, &axis)) continue; - AddAxisToInputMap(binding, device, axis, axis_type, [this, controller_index, axis_code](float value) { + AddAxisToInputMap(binding, device, axis, axis_type, [controller_index, axis_code](float value) { if (System::IsShutdown()) return; diff --git a/src/frontend-common/d3d11_host_display.h b/src/frontend-common/d3d11_host_display.h index e992c8ac4..6369658c6 100644 --- a/src/frontend-common/d3d11_host_display.h +++ b/src/frontend-common/d3d11_host_display.h @@ -62,8 +62,8 @@ protected: static std::vector EnumerateAdapterNames(IDXGIFactory* dxgi_factory); - virtual bool CreateResources(); - virtual void DestroyResources(); + virtual bool CreateResources() override; + virtual void DestroyResources() override; virtual bool CreateImGuiContext(); virtual void DestroyImGuiContext(); diff --git a/src/frontend-common/ini_settings_interface.h b/src/frontend-common/ini_settings_interface.h index b6efc3433..cfc0f827f 100644 --- a/src/frontend-common/ini_settings_interface.h +++ b/src/frontend-common/ini_settings_interface.h @@ -7,11 +7,11 @@ #endif #include "SimpleIni.h" -class INISettingsInterface : public SettingsInterface +class INISettingsInterface final : public SettingsInterface { public: INISettingsInterface(std::string filename); - ~INISettingsInterface(); + ~INISettingsInterface() override; bool Save(); diff --git a/src/frontend-common/opengl_host_display.h b/src/frontend-common/opengl_host_display.h index 628be37ab..b710492e7 100644 --- a/src/frontend-common/opengl_host_display.h +++ b/src/frontend-common/opengl_host_display.h @@ -56,8 +56,8 @@ protected: const char* GetGLSLVersionString() const; std::string GetGLSLVersionHeader() const; - virtual bool CreateResources(); - virtual void DestroyResources(); + virtual bool CreateResources() override; + virtual void DestroyResources() override; virtual bool CreateImGuiContext(); virtual void DestroyImGuiContext(); diff --git a/src/frontend-common/vulkan_host_display.h b/src/frontend-common/vulkan_host_display.h index 757dd9fd9..607522127 100644 --- a/src/frontend-common/vulkan_host_display.h +++ b/src/frontend-common/vulkan_host_display.h @@ -63,8 +63,8 @@ protected: // Can be overridden by frontends. virtual VkRenderPass GetRenderPassForDisplay() const; - virtual bool CreateResources(); - virtual void DestroyResources(); + virtual bool CreateResources() override; + virtual void DestroyResources() override; virtual bool CreateImGuiContext(); virtual void DestroyImGuiContext();