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

GregMiscellaneous: zzogl-pg: 

* Keep same format when reupload the texture after an error...
* various minor clean


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3925 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut@gmail.com 2010-10-16 21:11:56 +00:00
parent 465f786dee
commit 0da424452c
1 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1906,41 +1906,31 @@ inline list<CMemoryTarget>::iterator CMemoryTargetMngr::DestroyTargetIter(list<C
return it; return it;
} }
// Compare target to current texture info
// Not same format -> 1
// Same format, not same data (clut only) -> 2
// identical -> 0
int CMemoryTargetMngr::CompareTarget(list<CMemoryTarget>::iterator& it, const tex0Info& tex0, int clutsize, int nClutOffset) int CMemoryTargetMngr::CompareTarget(list<CMemoryTarget>::iterator& it, const tex0Info& tex0, int clutsize, int nClutOffset)
{ {
if (PSMT_ISCLUT(it->psm) != PSMT_ISCLUT(tex0.psm)) if (PSMT_ISCLUT(it->psm) != PSMT_ISCLUT(tex0.psm))
{
return 1; return 1;
}
if (PSMT_ISCLUT(tex0.psm)) if (PSMT_ISCLUT(tex0.psm)) {
{
assert(it->clut.size() > 0); assert(it->clut.size() > 0);
if (it->psm != tex0.psm || it->cpsm != tex0.cpsm || it->clut.size() != 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)) {
{
if (memcmp_mmx(&it->clut[0], g_pbyGSClut + nClutOffset, clutsize)) if (memcmp_mmx(&it->clut[0], g_pbyGSClut + nClutOffset, clutsize))
{
return 2; return 2;
} } else {
}
else
{
if (memcmp_clut16((u16*)&it->clut[0], (u16*)(g_pbyGSClut + nClutOffset), clutsize)) if (memcmp_clut16((u16*)&it->clut[0], (u16*)(g_pbyGSClut + nClutOffset), clutsize))
{
return 2; return 2;
} }
}
} } else {
else
if (PSMT_IS16BIT(tex0.psm) != PSMT_IS16BIT(it->psm)) if (PSMT_IS16BIT(tex0.psm) != PSMT_IS16BIT(it->psm))
{
return 1; return 1;
} }
@ -2001,9 +1991,8 @@ CMemoryTarget* CMemoryTargetMngr::SearchExistTarget(int start, int end, int nClu
if (listTargets.size() == 0) break; if (listTargets.size() == 0) break;
} }
else else
{
++it; ++it;
}
continue; continue;
} }
else if (res == 2) else if (res == 2)
@ -2027,9 +2016,7 @@ CMemoryTarget* CMemoryTargetMngr::SearchExistTarget(int start, int end, int nClu
break; break;
} }
else else
{
++it; ++it;
}
continue; continue;
} }
@ -2109,10 +2096,17 @@ CMemoryTarget* CMemoryTargetMngr::GetMemoryTarget(const tex0Info& tex0, int forc
// couldn't find so create // couldn't find so create
CMemoryTarget* targ; CMemoryTarget* targ;
u32 fmt = GL_UNSIGNED_BYTE; u32 fmt;
u32 internal_fmt;
// RGBA16 storage format if (PSMT_ISHALF_STORAGE(tex0)) {
if (PSMT_ISHALF_STORAGE(tex0)) fmt = GL_UNSIGNED_SHORT_1_5_5_5_REV; // RGBA_5551 storage format
fmt = GL_UNSIGNED_SHORT_1_5_5_5_REV;
internal_fmt = GL_RGB5_A1;
} else {
// RGBA_8888 storage format
fmt = GL_UNSIGNED_BYTE;
internal_fmt = GL_RGBA;
}
int widthmult = 1, channels = 1; int widthmult = 1, channels = 1;
@ -2182,10 +2176,7 @@ CMemoryTarget* CMemoryTargetMngr::GetMemoryTarget(const tex0Info& tex0, int forc
targ->psm = tex0.psm; targ->psm = tex0.psm;
targ->cpsm = tex0.cpsm; targ->cpsm = tex0.cpsm;
targ->height = end - start; targ->height = end - start;
} } else {
if (targ->ptex == NULL)
{
// not initialized yet // not initialized yet
targ->fmt = fmt; targ->fmt = fmt;
targ->realy = targ->starty = start; targ->realy = targ->starty = start;
@ -2341,10 +2332,7 @@ CMemoryTarget* CMemoryTargetMngr::GetMemoryTarget(const tex0Info& tex0, int forc
glBindTexture(GL_TEXTURE_RECTANGLE_NV, targ->ptex->tex); glBindTexture(GL_TEXTURE_RECTANGLE_NV, targ->ptex->tex);
if (fmt == GL_UNSIGNED_BYTE) TextureRect(internal_fmt, targ->texW, targ->texH, GL_RGBA, fmt, ptexdata);
TextureRect(GL_RGBA, targ->texW, targ->texH, GL_RGBA, fmt, ptexdata);
else
TextureRect(GL_RGB5_A1, targ->texW, targ->texH, GL_RGBA, fmt, ptexdata);
while (glGetError() != GL_NO_ERROR) while (glGetError() != GL_NO_ERROR)
{ {
@ -2366,7 +2354,7 @@ CMemoryTarget* CMemoryTargetMngr::GetMemoryTarget(const tex0Info& tex0, int forc
DestroyOldest(); DestroyOldest();
} }
TextureRect(GL_RGBA, targ->texW, targ->texH, GL_RGBA, fmt, ptexdata); TextureRect(internal_fmt, targ->texW, targ->texH, GL_RGBA, fmt, ptexdata);
} }
setRectWrap(GL_CLAMP); setRectWrap(GL_CLAMP);