summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/TextureCacheBase.cpp
diff options
context:
space:
mode:
authorMatthew Parlane <parlane@gmail.com>2017-03-26 14:35:12 +1300
committerGitHub <noreply@github.com>2017-03-26 14:35:12 +1300
commit4f160b254774306c6509de4859612375f44af4f8 (patch)
tree1ea1dd021d801a90929e38f3c5a1e177271f9f94 /Source/Core/VideoCommon/TextureCacheBase.cpp
parent86e6b44271fcfddb68b2680525f23217c4360198 (diff)
parent57c21b9576aa5e7f840fa77e275cbeaa5ac97716 (diff)
Merge pull request #5163 from lioncash/array
TextureCacheBase: Convert bound_textures from a C array to a std::array
Diffstat (limited to 'Source/Core/VideoCommon/TextureCacheBase.cpp')
-rw-r--r--Source/Core/VideoCommon/TextureCacheBase.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp
index 966b30ee39..eabb005600 100644
--- a/Source/Core/VideoCommon/TextureCacheBase.cpp
+++ b/Source/Core/VideoCommon/TextureCacheBase.cpp
@@ -472,16 +472,16 @@ TextureCacheBase::TCacheEntryBase* TextureCacheBase::ReturnEntry(unsigned int st
void TextureCacheBase::BindTextures()
{
- for (int i = 0; i < 8; ++i)
+ for (size_t i = 0; i < bound_textures.size(); ++i)
{
if (bound_textures[i])
- bound_textures[i]->Bind(i);
+ bound_textures[i]->Bind(static_cast<u32>(i));
}
}
void TextureCacheBase::UnbindTextures()
{
- std::fill(std::begin(bound_textures), std::end(bound_textures), nullptr);
+ bound_textures.fill(nullptr);
}
TextureCacheBase::TCacheEntryBase* TextureCacheBase::Load(const u32 stage)