piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-26 07:39:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7224 from lioncash/warning

Browse Source 
VideoCommon/DolphinQt2: Resolve compiler warnings
This commit is contained in:
spycrab
2018-07-07 16:20:56 +02:00
committed by GitHub
parent 988cb7dd14 ef35f93cbd
commit 7b986c1b54
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinQt/Config/PatchesWidget.cpp
View File

@ -20,7 +20,7 @@
#include "UICommon/GameFile.h" #include "UICommon/GameFile.h"
PatchesWidget::PatchesWidget(const UICommon::GameFile& game) 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; IniFile game_ini_local;
game_ini_local.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + m_game_id + ".ini"); game_ini_local.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + m_game_id + ".ini");

1
Source/Core/DolphinQt/Config/PatchesWidget.h
View File

@ -48,7 +48,6 @@ private:
QPushButton* m_remove_button; QPushButton* m_remove_button;
std::vector<PatchEngine::Patch> m_patches; std::vector<PatchEngine::Patch> m_patches;
const UICommon::GameFile& m_game;
std::string m_game_id; std::string m_game_id;
u16 m_game_revision; u16 m_game_revision;
}; };

2
Source/Core/DolphinQt/GameList/GameTracker.cpp
View File

@ -32,7 +32,7 @@ GameTracker::GameTracker(QObject* parent) : QFileSystemWatcher(parent)
connect(this, &QFileSystemWatcher::directoryChanged, this, &GameTracker::UpdateDirectory); connect(this, &QFileSystemWatcher::directoryChanged, this, &GameTracker::UpdateDirectory);
connect(this, &QFileSystemWatcher::fileChanged, this, &GameTracker::UpdateFile); 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(); const auto paths = Settings::Instance().GetPaths();
for (const auto& path : paths) for (const auto& path : paths)

5
Source/Core/VideoCommon/TextureCacheBase.cpp
View File

@ -1515,14 +1515,15 @@ TextureCacheBase::CopyFilterCoefficientArray TextureCacheBase::GetRAMCopyFilterC
{ {
// To simplify the backend, we precalculate the three coefficients in common. Coefficients 0, 1 // 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. // 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<float>(static_cast<u32>(coefficients[0]) + static_cast<u32>(coefficients[1])) / static_cast<float>(static_cast<u32>(coefficients[0]) + static_cast<u32>(coefficients[1])) /
64.0f, 64.0f,
static_cast<float>(static_cast<u32>(coefficients[2]) + static_cast<u32>(coefficients[3]) + static_cast<float>(static_cast<u32>(coefficients[2]) + static_cast<u32>(coefficients[3]) +
static_cast<u32>(coefficients[4])) / static_cast<u32>(coefficients[4])) /
64.0f, 64.0f,
static_cast<float>(static_cast<u32>(coefficients[5]) + static_cast<u32>(coefficients[6])) / static_cast<float>(static_cast<u32>(coefficients[5]) + static_cast<u32>(coefficients[6])) /
64.0f}; 64.0f,
}};
} }
TextureCacheBase::CopyFilterCoefficientArray TextureCacheBase::GetVRAMCopyFilterCoefficients( TextureCacheBase::CopyFilterCoefficientArray TextureCacheBase::GetVRAMCopyFilterCoefficients(