From 34c3a65de69066da6e71ccc7e1cb0205fd826b00 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 6 Jul 2018 13:36:36 -0400 Subject: [PATCH 1/3] VideoCommon/TextureCacheBase: Resolve a -Wmissing-braces warning in GetRAMCopyFilterCoefficients() --- Source/Core/VideoCommon/TextureCacheBase.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index 8881ad2457..cd8a024fbc 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -1515,14 +1515,15 @@ TextureCacheBase::CopyFilterCoefficientArray TextureCacheBase::GetRAMCopyFilterC { // To simplify the backend, we precalculate the three coefficients in common. Coefficients 0, 1 // are for the row above, 2, 3, 4 are for the current pixel, and 5, 6 are for the row below. - return { + return {{ static_cast(static_cast(coefficients[0]) + static_cast(coefficients[1])) / 64.0f, static_cast(static_cast(coefficients[2]) + static_cast(coefficients[3]) + static_cast(coefficients[4])) / 64.0f, static_cast(static_cast(coefficients[5]) + static_cast(coefficients[6])) / - 64.0f}; + 64.0f, + }}; } TextureCacheBase::CopyFilterCoefficientArray TextureCacheBase::GetVRAMCopyFilterCoefficients( From 935a273cf1b6ee47ae672d543e63a612fe31d3d3 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 6 Jul 2018 19:57:24 -0400 Subject: [PATCH 2/3] DolphinQt/GameTracker: Remove unused lambda capture in constructor This resolves a -Wunused-lambda-capture warning --- Source/Core/DolphinQt/GameList/GameTracker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinQt/GameList/GameTracker.cpp b/Source/Core/DolphinQt/GameList/GameTracker.cpp index b40585995f..86fd54e0ac 100644 --- a/Source/Core/DolphinQt/GameList/GameTracker.cpp +++ b/Source/Core/DolphinQt/GameList/GameTracker.cpp @@ -32,7 +32,7 @@ GameTracker::GameTracker(QObject* parent) : QFileSystemWatcher(parent) connect(this, &QFileSystemWatcher::directoryChanged, this, &GameTracker::UpdateDirectory); connect(this, &QFileSystemWatcher::fileChanged, this, &GameTracker::UpdateFile); - connect(&Settings::Instance(), &Settings::AutoRefreshToggled, this, [this] { + connect(&Settings::Instance(), &Settings::AutoRefreshToggled, this, [] { const auto paths = Settings::Instance().GetPaths(); for (const auto& path : paths) From ef35f93cbdbf0876dac9257bd9b74d64219615db Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 6 Jul 2018 19:58:01 -0400 Subject: [PATCH 3/3] DolphinQt/PatchesWidget: Remove unused private member variable m_game This resolves a -Wunused-private-field warning --- Source/Core/DolphinQt/Config/PatchesWidget.cpp | 2 +- Source/Core/DolphinQt/Config/PatchesWidget.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Core/DolphinQt/Config/PatchesWidget.cpp b/Source/Core/DolphinQt/Config/PatchesWidget.cpp index 2f5f85c686..5e5d27952f 100644 --- a/Source/Core/DolphinQt/Config/PatchesWidget.cpp +++ b/Source/Core/DolphinQt/Config/PatchesWidget.cpp @@ -20,7 +20,7 @@ #include "UICommon/GameFile.h" PatchesWidget::PatchesWidget(const UICommon::GameFile& game) - : m_game(game), m_game_id(game.GetGameID()), m_game_revision(game.GetRevision()) + : m_game_id(game.GetGameID()), m_game_revision(game.GetRevision()) { IniFile game_ini_local; game_ini_local.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + m_game_id + ".ini"); diff --git a/Source/Core/DolphinQt/Config/PatchesWidget.h b/Source/Core/DolphinQt/Config/PatchesWidget.h index fd68171203..ab1bc324d0 100644 --- a/Source/Core/DolphinQt/Config/PatchesWidget.h +++ b/Source/Core/DolphinQt/Config/PatchesWidget.h @@ -48,7 +48,6 @@ private: QPushButton* m_remove_button; std::vector m_patches; - const UICommon::GameFile& m_game; std::string m_game_id; u16 m_game_revision; };