diff options
| author | spycrab <spycrab@users.noreply.github.com> | 2018-07-07 16:20:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-07 16:20:56 +0200 |
| commit | 7b986c1b54eac4aac972e24bd4a9d81b8ee746a1 (patch) | |
| tree | c9636ae045e9d34c49fd00a98da7d98a8a79e4a9 /Source/Core/VideoCommon/TextureCacheBase.cpp | |
| parent | 988cb7dd14560fb660b5f5f9ef0c2e90f27c4caa (diff) | |
| parent | ef35f93cbdbf0876dac9257bd9b74d64219615db (diff) | |
Merge pull request #7224 from lioncash/warning
VideoCommon/DolphinQt2: Resolve compiler warnings
Diffstat (limited to 'Source/Core/VideoCommon/TextureCacheBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/TextureCacheBase.cpp | 5 |
1 files 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<float>(static_cast<u32>(coefficients[0]) + static_cast<u32>(coefficients[1])) / 64.0f, static_cast<float>(static_cast<u32>(coefficients[2]) + static_cast<u32>(coefficients[3]) + static_cast<u32>(coefficients[4])) / 64.0f, static_cast<float>(static_cast<u32>(coefficients[5]) + static_cast<u32>(coefficients[6])) / - 64.0f}; + 64.0f, + }}; } TextureCacheBase::CopyFilterCoefficientArray TextureCacheBase::GetVRAMCopyFilterCoefficients( |
