ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5163 from lioncash/array 

TextureCacheBase: Convert bound_textures from a C array to a std::array
This commit is contained in:
Matthew Parlane 2017-03-26 14:35:12 +13:00 committed by GitHub
parent 86e6b44271 57c21b9576
commit 4f160b2547
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)

3
Source/Core/VideoCommon/TextureCacheBase.h
View File

@ -4,6 +4,7 @@
#pragma once
#include <array>
#include <map>
#include <memory>
#include <tuple>
@ -176,7 +177,7 @@ protected:
alignas(16) u8* temp = nullptr;
size_t temp_size = 0;
TCacheEntryBase* bound_textures[8] = {};
std::array<TCacheEntryBase*, 8> bound_textures{};
private:
typedef std::multimap<u32, TCacheEntryBase*> TexAddrCache;