mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-02 02:52:30 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

TextureCacheBase: Convert bound_textures from a C array to a std::array

Browse Source 
Prevents array-to-pointer decay and simplifies some code.
This commit is contained in:
Lioncash 2017-03-25 14:45:55 -04:00
parent 4b5995a6e0
commit 57c21b9576
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() void TextureCacheBase::BindTextures()
{ {
for (int i = 0; i < 8; ++i) for (size_t i = 0; i < bound_textures.size(); ++i)
{ {
if (bound_textures[i]) if (bound_textures[i])
bound_textures[i]->Bind(i); bound_textures[i]->Bind(static_cast<u32>(i));
} }
} }
void TextureCacheBase::UnbindTextures() 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) TextureCacheBase::TCacheEntryBase* TextureCacheBase::Load(const u32 stage)

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

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