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

GregMiscellaneous: zzogl-pg: 

* 16 bits aligned the local clut array to allow sse2 operations


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3947 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut@gmail.com 2010-10-19 17:53:36 +00:00
parent b20c1021e8
commit f4584d3c9c
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/zzogl-pg/opengl/targets.cpp
View File

@ -1737,9 +1737,7 @@ int CMemoryTargetMngr::CompareTarget(list<CMemoryTarget>::iterator& it, const te
return 1; return 1;
if (PSMT_ISCLUT(tex0.psm)) { if (PSMT_ISCLUT(tex0.psm)) {
assert(it->clut.size() > 0); if (it->psm != tex0.psm || it->cpsm != tex0.cpsm || it->clutsize != clutsize)
if (it->psm != tex0.psm || it->cpsm != tex0.cpsm || it->clut.size() != clutsize)
return 1; return 1;
if (PSMT_IS32BIT(tex0.cpsm)) { if (PSMT_IS32BIT(tex0.cpsm)) {
@ -1986,8 +1984,17 @@ CMemoryTarget* CMemoryTargetMngr::GetMemoryTarget(const tex0Info& tex0, int forc
// Local clut parameter // Local clut parameter
targ->cpsm = tex0.cpsm; targ->cpsm = tex0.cpsm;
targ->clut.reserve(256*4); // no matter what
targ->clut.resize(clutsize); // Allocate a local clut array
targ->clutsize = clutsize;
if(targ->clut == NULL)
targ->clut = (u8*)_aligned_malloc(clutsize, 16);
else {
// In case it could occured
// realloc would be better but you need to get it from libutilies first
_aligned_free(targ->clut);
targ->clut = (u8*)_aligned_malloc(clutsize, 16);
}
// texture parameter // texture parameter
ptexdata = (u8*)_aligned_malloc(CLUT_PIXEL_SIZE(tex0.cpsm) * targ->texH * targ->texW, 16); ptexdata = (u8*)_aligned_malloc(CLUT_PIXEL_SIZE(tex0.cpsm) * targ->texH * targ->texW, 16);
@ -1998,15 +2005,13 @@ CMemoryTarget* CMemoryTargetMngr::GetMemoryTarget(const tex0Info& tex0, int forc
// Fill a local clut then build the real texture // Fill a local clut then build the real texture
if (PSMT_IS32BIT(tex0.cpsm)) if (PSMT_IS32BIT(tex0.cpsm))
{ {
u32* pclut = (u32*) & targ->clut[0]; ClutBuffer_to_Array<u32>((u32*)targ->clut, tex0.csa, clutsize);
ClutBuffer_to_Array<u32>(pclut, tex0.csa, clutsize); Build_Clut_Texture<u32>(tex0.psm, targ->height, (u32*)targ->clut, psrc, (u32*)ptexdata);
Build_Clut_Texture<u32>(tex0.psm, targ->height, pclut, psrc, (u32*)ptexdata);
} }
else else
{ {
u16* pclut = (u16*) & targ->clut[0]; ClutBuffer_to_Array<u16>((u16*)targ->clut, tex0.csa, clutsize);
ClutBuffer_to_Array<u16>(pclut, tex0.csa, clutsize); Build_Clut_Texture<u16>(tex0.psm, targ->height, (u16*)targ->clut, psrc, (u16*)ptexdata);
Build_Clut_Texture<u16>(tex0.psm, targ->height, pclut, psrc, (u16*)ptexdata);
} }
assert(targ->clut.size() > 0); assert(targ->clut.size() > 0);

7
plugins/zzogl-pg/opengl/targets.h
View File

@ -186,6 +186,10 @@ class CMemoryTarget
} }
ptex = NULL; ptex = NULL;
_aligned_free(clut);
clut = NULL;
clutsize = 0;
} }
// returns true if clut data is synced // returns true if clut data is synced
@ -218,7 +222,8 @@ class CMemoryTarget
int validatecount; // count how many times has been validated, if too many, destroy int validatecount; // count how many times has been validated, if too many, destroy
vector<u8> clut; // if nonzero, texture uses CLUT u8* clut; // Clut texture data. Null otherwise
int clutsize; // size of the clut array. 0 otherwise
}; };