preserve-emulation/pcsx2
1
0 Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-11-13 17:50:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

GSdx: changes of r5007 did not help as much as I thought, disabled it for the time being, plus other minor optimizations

Browse Source 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5010 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gabest11 committed 2011-12-23 15:53:53 +00:00
1 parent da41bcd756
commit 963a6a653a
10 files changed
+359 -273
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

plugins/GSdx/GSTextureCacheSW.cpp
+31 -70
View File
@@ -70,78 +70,50 @@ GSTextureCacheSW::Texture* GSTextureCacheSW::Lookup(const GIFRegTEX0& TEX0, cons
if(t == NULL)
{
const GSOffset* o = m_state->m_mem.GetOffset(TEX0.TBP0, TEX0.TBW, TEX0.PSM);
t = new Texture(m_state, o, tw0, TEX0, TEXA);
t = new Texture(m_state, tw0, TEX0, TEXA);
m_textures.insert(t);
for(int i = 0; i < countof(t->m_pages); i++)
for(list<uint32>::iterator i = t->m_pages.n.begin(); i != t->m_pages.n.end(); i++)
{
uint32 p = t->m_pages[i];
if(p != 0)
{
list<Texture*>* m = &m_map[i << 5];
unsigned long j;
while(_BitScanForward(&j, p))
{
p ^= 1 << j;
m[j].push_front(t);
}
}
m_map[*i].push_front(t);
}
}
return t;
}
void GSTextureCacheSW::InvalidateVideoMem(const GSOffset* o, const GSVector4i& rect)
void GSTextureCacheSW::InvalidateVideoMem(GSOffset* o, const GSVector4i& rect)
{
uint32 psm = o->psm;
list<uint32>* pages = o->GetPages(rect);
GSVector2i bs = (o->bp & 31) == 0 ? GSLocalMemory::m_psm[psm].pgs : GSLocalMemory::m_psm[psm].bs;
GSVector4i r = rect.ralign<Align_Outside>(bs);
for(int y = r.top; y < r.bottom; y += bs.y)
for(list<uint32>::iterator p = pages->begin(); p != pages->end(); p++)
{
uint32 base = o->block.row[y >> 3];
uint32 page = *p;
for(int x = r.left; x < r.right; x += bs.x)
const list<Texture*>& map = m_map[page];
for(list<Texture*>::const_iterator i = map.begin(); i != map.end(); i++)
{
uint32 page = (base + o->block.col[x >> 3]) >> 5;
Texture* t = *i;
if(page < MAX_PAGES)
if(GSUtil::HasSharedBits(o->psm, t->m_TEX0.PSM))
{
const list<Texture*>& map = m_map[page];
for(list<Texture*>::const_iterator i = map.begin(); i != map.end(); i++)
if(t->m_repeating)
{
Texture* t = *i;
if(GSUtil::HasSharedBits(psm, t->m_TEX0.PSM))
{
if(t->m_repeating)
{
list<GSVector2i>& l = t->m_p2t[page];
list<GSVector2i>& l = t->m_p2t[page];
for(list<GSVector2i>::iterator j = l.begin(); j != l.end(); j++)
{
t->m_valid[j->x] &= j->y;
}
}
else
{
t->m_valid[page] = 0;
}
t->m_complete = false;
for(list<GSVector2i>::iterator j = l.begin(); j != l.end(); j++)
{
t->m_valid[j->x] &= j->y;
}
}
else
{
t->m_valid[page] = 0;
}
t->m_complete = false;
}
}
}
@@ -195,9 +167,8 @@ void GSTextureCacheSW::IncAge()
//
GSTextureCacheSW::Texture::Texture(GSState* state, const GSOffset* offset, uint32 tw0, const GIFRegTEX0& TEX0, const GIFRegTEXA& TEXA)
GSTextureCacheSW::Texture::Texture(GSState* state, uint32 tw0, const GIFRegTEX0& TEX0, const GIFRegTEXA& TEXA)
: m_state(state)
, m_offset(offset)
, m_buff(NULL)
, m_tw(tw0)
, m_age(0)
@@ -208,28 +179,18 @@ GSTextureCacheSW::Texture::Texture(GSState* state, const GSOffset* offset, uint3
m_TEXA = TEXA;
memset(m_valid, 0, sizeof(m_valid));
memset(m_pages, 0, sizeof(m_pages));
const GSLocalMemory::psm_t& psm = GSLocalMemory::m_psm[TEX0.PSM];
memset(m_pages.bm, 0, sizeof(m_pages.bm));
GSVector2i bs = (TEX0.TBP0 & 31) == 0 ? psm.pgs : psm.bs;
m_offset = m_state->m_mem.GetOffset(TEX0.TBP0, TEX0.TBW, TEX0.PSM);
int tw = 1 << TEX0.TW;
int th = 1 << TEX0.TH;
list<uint32>* pages = m_offset->GetPages(GSVector4i(0, 0, 1 << TEX0.TW, 1 << TEX0.TH));
for(int y = 0; y < th; y += bs.y)
for(list<uint32>::iterator i = pages->begin(); i != pages->end(); i++)
{
uint32 base = offset->block.row[y >> 3];
uint32 page = *i;
for(int x = 0; x < tw; x += bs.x)
{
uint32 page = (base + offset->block.col[x >> 3]) >> 5;
if(page < MAX_PAGES)
{
m_pages[page >> 5] |= 1 << (page & 31);
}
}
m_pages.bm[page >> 5] |= 1 << (page & 31);
m_pages.n.push_back(page);
}
m_repeating = m_TEX0.IsRepeating(); // repeating mode always works, it is just slightly slower