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

gsdx tc: use array in GSOffset to store texture coverage 

GSOffset is already based on a lookup of PSM/BP/BW. Coverage only adds
the size parameters (so only 256 possibilities)

It replaces the hash lookup with a free array access.
This commit is contained in:
Gregory Hainaut 2016-04-28 17:03:41 +02:00
parent 9cacfee8c7
commit 826b38c47a
4 changed files with 28 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/GSdx/GSLocalMemory.cpp
View File

@ -2016,10 +2016,20 @@ GSOffset::GSOffset(uint32 _bp, uint32 _bw, uint32 _psm)
{
pixel.col[i] = GSLocalMemory::m_psm[_psm].rowOffset[i];
}
for(int i = 0; i < 256; i++)
{
coverages[i] = nullptr;
}
}
GSOffset::~GSOffset()
{
for(int i = 0; i < 256; i++)
{
_aligned_free(coverages[i]);
}
}
uint32* GSOffset::GetPages(const GSVector4i& rect, uint32* pages, GSVector4i* bbox)

2
plugins/GSdx/GSLocalMemory.h
View File

@ -47,6 +47,8 @@ public:
Block block;
Pixel pixel;
uint32* coverages[256]; // texture page coverage based on the texture size. Lazy allocated
GSOffset(uint32 bp, uint32 bw, uint32 psm);
virtual ~GSOffset();

62
plugins/GSdx/GSTextureCache.cpp
View File

@ -1864,7 +1864,7 @@ bool GSTextureCache::Target::Inside(uint32 bp, uint32 psm, const GSVector4i& rec
// GSTextureCache::SourceMap
void GSTextureCache::SourceMap::Add(Source* s, const GIFRegTEX0& TEX0, const GSOffset* off)
void GSTextureCache::SourceMap::Add(Source* s, const GIFRegTEX0& TEX0, GSOffset* off)
{
m_surfaces.insert(s);
@ -1882,48 +1882,6 @@ void GSTextureCache::SourceMap::Add(Source* s, const GIFRegTEX0& TEX0, const GSO
// Remaining code will compute a list of pages that are dirty (in a similar fashion as GSOffset::GetPages)
// (Maybe GetPages could be used instead, perf opt?)
// The source pointer will be stored/duplicated in all m_map[array of pages]
#if 0
const GSLocalMemory::psm_t& psm = GSLocalMemory::m_psm[TEX0.PSM];
GSVector2i bs = (TEX0.TBP0 & 31) == 0 ? psm.pgs : psm.bs;
int tw = 1 << TEX0.TW;
int th = 1 << TEX0.TH;
for(int y = 0; y < th; y += bs.y)
{
uint32 base = off->block.row[y >> 3];
for(int x = 0; x < tw; x += bs.x)
{
uint32 page = (base + off->block.col[x >> 3]) >> 5;
if(page < MAX_PAGES)
{
m_pages[page >> 5] |= 1 << (page & 31);
}
}
}
for(size_t i = 0; i < countof(m_pages); i++)
{
if(uint32 p = m_pages[i])
{
m_pages[i] = 0;
list<Source*>* m = &m_map[i << 5];
unsigned long j;
while(_BitScanForward(&j, p))
{
p ^= 1 << j;
m[j].push_front(s);
}
}
}
#else
uint32* pages = GetPagesCoverage(TEX0, off);
for(size_t i = 0; i < countof(m_pages); i++)
{
@ -1941,21 +1899,24 @@ void GSTextureCache::SourceMap::Add(Source* s, const GIFRegTEX0& TEX0, const GSO
}
}
}
#endif
}
uint32* GSTextureCache::SourceMap::GetPagesCoverage(const GIFRegTEX0& TEX0, const GSOffset* off)
uint32* GSTextureCache::SourceMap::GetPagesCoverage(const GIFRegTEX0& TEX0, GSOffset* off)
{
uint64 hash = TEX0.u64 & 0x3ffffffffull; // TBP0 TBW PSM TW TH
// Performance note:
// GSOffset is a hash lookup of the following parameter TB0, TBW, PSM
// Coverage adds TW and Th (8bits). Therefore GSOffset was extended with a small array.
// Avoid the hash map overhead (memory and lookup)
auto it_pages = m_pages_coverage.find(hash);
int index = (TEX0.u64 >> 26) & 0xFF;
if (it_pages != m_pages_coverage.end()) return it_pages->second;
if (off->coverages[index])
return off->coverages[index];
// Aligned on 64 bytes to store the full bitmap in a single cache line
uint32* pages = (uint32*)_aligned_malloc(MAX_PAGES/8, 64);
m_pages_coverage.emplace(hash, pages);
off->coverages[index] = pages;
((GSVector4i*)pages)[0] = GSVector4i::zero();
((GSVector4i*)pages)[1] = GSVector4i::zero();
@ -2000,9 +1961,6 @@ void GSTextureCache::SourceMap::RemoveAll()
{
m_map[i].clear();
}
for_each(m_pages_coverage.begin(), m_pages_coverage.end(), aligned_free_second());
m_pages_coverage.clear();
}
void GSTextureCache::SourceMap::RemoveAt(Source* s)

4
plugins/GSdx/GSTextureCache.h
View File

@ -110,12 +110,12 @@ public:
SourceMap() : m_used(false) {memset(m_pages, 0, sizeof(m_pages));}
void Add(Source* s, const GIFRegTEX0& TEX0, const GSOffset* off);
void Add(Source* s, const GIFRegTEX0& TEX0, GSOffset* off);
void RemoveAll();
void RemovePartial();
void RemoveAt(Source* s);
uint32* GetPagesCoverage(const GIFRegTEX0& TEX0, const GSOffset* off);
uint32* GetPagesCoverage(const GIFRegTEX0& TEX0, GSOffset* off);
};
protected: