diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2017-06-07 21:20:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-07 21:20:06 -0700 |
| commit | ffd8309aca806a6cf5ca4da85f5854ef14c8e0d9 (patch) | |
| tree | ba029b5a68e1613f3dca3185a854ef70d05de61e /Source/Core/VideoCommon/TextureCacheBase.cpp | |
| parent | a2358786dc66eab8fa63987751d4e3fc1a3ee525 (diff) | |
| parent | 9ee63608b3c7160cadb0291e577b158d1b8aa5c6 (diff) | |
Merge branch 'master' into fix-unittests
Diffstat (limited to 'Source/Core/VideoCommon/TextureCacheBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/TextureCacheBase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index 613f2dfed9..72978f6752 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -994,7 +994,7 @@ void TextureCacheBase::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFo float* const ColorMask = colmat + 20; ColorMask[0] = ColorMask[1] = ColorMask[2] = ColorMask[3] = 255.0f; ColorMask[4] = ColorMask[5] = ColorMask[6] = ColorMask[7] = 1.0f / 255.0f; - unsigned int cbufid = -1; + unsigned int cbufid = UINT_MAX; u32 srcFormat = bpmem.zcontrol.pixel_format; bool efbHasAlpha = srcFormat == PEControl::RGBA6_Z24; |
