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

GSdx: please test mipmapping again... 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4455 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gabest11 2011-03-19 03:54:22 +00:00
parent b1eac6d058
commit 4f8bbb2c52
7 changed files with 56 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
plugins/GSdx/GSDrawScanlineCodeGenerator.x86.avx.cpp
View File

@ -387,13 +387,6 @@ void GSDrawScanlineCodeGenerator::Init()
vmovdqa(ptr[&m_local.temp.s], xmm2);
vmovdqa(ptr[&m_local.temp.t], xmm3);
if(m_sel.mmin && !m_sel.lcm)
{
vshufps(xmm4, xmm4, _MM_SHUFFLE(2, 2, 2, 2));
vaddps(xmm4, ptr[edx + offsetof(GSScanlineLocalData::skip, q)]);
vmovaps(ptr[&m_local.temp.q], xmm4);
}
}
else
{
@ -517,13 +510,6 @@ void GSDrawScanlineCodeGenerator::Step()
{
vmovdqa(xmm3, ptr[&m_local.temp.t]);
}
if(m_sel.mmin && !m_sel.lcm)
{
vshufps(xmm4, xmm4, _MM_SHUFFLE(2, 2, 2, 2));
vaddps(xmm4, ptr[&m_local.temp.q]);
vmovaps(ptr[&m_local.temp.q], xmm4);
}
}
else
{
@ -1175,6 +1161,14 @@ void GSDrawScanlineCodeGenerator::SampleTextureLOD()
vmaxps(xmm4, xmm0);
vcvtps2dq(xmm4, xmm4);
if(m_sel.mmin == 1) // round-off mode
{
mov(eax, 0x8000);
vmovd(xmm0, eax);
vpshufd(xmm0, xmm0, _MM_SHUFFLE(0, 0, 0, 0));
vpaddd(xmm4, xmm0);
}
vpsrld(xmm0, xmm4, 16);
vmovdqa(ptr[&m_local.temp.lod.i], xmm0);
/*
@ -1183,9 +1177,12 @@ vpslld(xmm6, xmm4, 16);
vpsrld(xmm6, xmm6, 24);
return;
*/
vpshuflw(xmm0, xmm4, _MM_SHUFFLE(2, 2, 0, 0));
vpshufhw(xmm0, xmm0, _MM_SHUFFLE(2, 2, 0, 0));
vmovdqa(ptr[&m_local.temp.lod.f], xmm0);
if(m_sel.mmin == 2) // trilinear mode
{
vpshuflw(xmm0, xmm4, _MM_SHUFFLE(2, 2, 0, 0));
vpshufhw(xmm0, xmm0, _MM_SHUFFLE(2, 2, 0, 0));
vmovdqa(ptr[&m_local.temp.lod.f], xmm0);
}
// shift u/v by (int)lod

31
plugins/GSdx/GSDrawScanlineCodeGenerator.x86.cpp
View File

@ -384,13 +384,6 @@ void GSDrawScanlineCodeGenerator::Init()
movdqa(ptr[&m_local.temp.s], xmm2);
movdqa(ptr[&m_local.temp.t], xmm3);
if(m_sel.mmin && !m_sel.lcm)
{
shufps(xmm4, xmm4, _MM_SHUFFLE(2, 2, 2, 2));
addps(xmm4, ptr[edx + offsetof(GSScanlineLocalData::skip, q)]);
movaps(ptr[&m_local.temp.q], xmm4);
}
}
else
{
@ -517,13 +510,6 @@ void GSDrawScanlineCodeGenerator::Step()
{
movdqa(xmm3, ptr[&m_local.temp.t]);
}
if(m_sel.mmin && !m_sel.lcm)
{
shufps(xmm4, xmm4, _MM_SHUFFLE(2, 2, 2, 2));
addps(xmm4, ptr[&m_local.temp.q]);
movaps(ptr[&m_local.temp.q], xmm4);
}
}
else
{
@ -1221,13 +1207,24 @@ void GSDrawScanlineCodeGenerator::SampleTextureLOD()
maxps(xmm4, xmm0);
cvtps2dq(xmm4, xmm4);
if(m_sel.mmin == 1) // round-off mode
{
mov(eax, 0x8000);
movd(xmm0, eax);
pshufd(xmm0, xmm0, _MM_SHUFFLE(0, 0, 0, 0));
paddd(xmm4, xmm0);
}
movdqa(xmm0, xmm4);
psrld(xmm4, 16);
movdqa(ptr[&m_local.temp.lod.i], xmm4);
pshuflw(xmm0, xmm0, _MM_SHUFFLE(2, 2, 0, 0));
pshufhw(xmm0, xmm0, _MM_SHUFFLE(2, 2, 0, 0));
movdqa(ptr[&m_local.temp.lod.f], xmm0);
if(m_sel.mmin == 2) // trilinear mode
{
pshuflw(xmm0, xmm0, _MM_SHUFFLE(2, 2, 0, 0));
pshufhw(xmm0, xmm0, _MM_SHUFFLE(2, 2, 0, 0));
movdqa(ptr[&m_local.temp.lod.f], xmm0);
}
// shift u/v by (int)lod

1
plugins/GSdx/GSRenderer.cpp
View File

@ -513,6 +513,7 @@ void GSRenderer::KeyEvent(GSKeyEventData* e)
return;
case VK_DELETE:
m_aa1 = !m_aa1;
printf("GSdx: (Software) aa1 is now %s.\n", m_aa1 ? "enabled" : "disabled");
return;
case VK_INSERT:
m_mipmap = !m_mipmap;

23
plugins/GSdx/GSRendererSW.cpp
View File

@ -365,7 +365,7 @@ void GSRendererSW::GetScanlineGlobalData(GSScanlineGlobalData& gd)
if(m_vt.m_lod.x > 0)
{
gd.sel.ltf = (context->TEX1.MMIN & 5) ? 1 : 0;
gd.sel.ltf = context->TEX1.MMIN >> 2;
}
else
{
@ -387,9 +387,22 @@ void GSRendererSW::GetScanlineGlobalData(GSScanlineGlobalData& gd)
gd.l = GSVector4((float)(-0x10000 << context->TEX1.L));
gd.k = GSVector4((float)k);
if(gd.sel.fst)
{
ASSERT(gd.sel.lcm == 1);
ASSERT(((m_vt.m_min.t.uph(m_vt.m_max.t) == GSVector4::zero()).mask() & 3) == 3); // ratchet and clank (menu)
gd.sel.lcm = 1;
}
if(gd.sel.lcm)
{
int lod = std::min<int>(k, mxl);
int lod = std::max<int>(std::min<int>(k, mxl), 0);
if(gd.sel.mmin == 1)
{
lod = (lod + 0x8000) & 0xffff0000; // rounding
}
gd.lod.i = GSVector4i(lod >> 16);
gd.lod.f = GSVector4i(lod & 0xffff).xxxxl().xxzz();
@ -403,7 +416,7 @@ void GSRendererSW::GetScanlineGlobalData(GSScanlineGlobalData& gd)
GSVector4 tmin = m_vt.m_min.t;
GSVector4 tmax = m_vt.m_max.t;
//static int s_counter = 0;
static int s_counter = 0;
//t->Save(format("c:/temp1/%08d_%05x_0.bmp", s_counter, context->TEX0.TBP0));
@ -460,10 +473,10 @@ void GSRendererSW::GetScanlineGlobalData(GSScanlineGlobalData& gd)
gd.tex[i] = t->m_buff;
//t->Save(format("c:/temp1/%08d_%05x_%d.bmp", s_counter, context->TEX0.TBP0, i));
// t->Save(format("c:/temp1/%08d_%05x_%d.bmp", s_counter, context->TEX0.TBP0, i));
}
//s_counter++;
s_counter++;
m_vt.m_min.t = tmin;
m_vt.m_max.t = tmax;

13
plugins/GSdx/GSSetupPrimCodeGenerator.x86.avx.cpp
View File

@ -170,16 +170,11 @@ void GSSetupPrimCodeGenerator::Texture()
if(m_sel.fst)
{
// m_local.d4.st = GSVector4i(t * 4.0f);
if(m_sel.mmin && !m_sel.lcm)
{
vmovhps(ptr[&m_local.d4.stq.z], xmm1);
}
// m_local.d4.stq = GSVector4i(t * 4.0f);
vcvttps2dq(xmm1, xmm1);
vmovq(ptr[&m_local.d4.stq], xmm1);
vmovdqa(ptr[&m_local.d4.stq], xmm1);
}
else
{
@ -188,7 +183,7 @@ void GSSetupPrimCodeGenerator::Texture()
vmovaps(ptr[&m_local.d4.stq], xmm1);
}
for(int j = 0, k = m_sel.fst && !(m_sel.mmin && !m_sel.lcm) ? 2 : 3; j < k; j++)
for(int j = 0, k = m_sel.fst ? 2 : 3; j < k; j++)
{
// GSVector4 ds = t.xxxx();
// GSVector4 dt = t.yyyy();
@ -202,7 +197,7 @@ void GSSetupPrimCodeGenerator::Texture()
vmulps(xmm2, xmm1, Xmm(4 + i));
if(m_sel.fst && !(m_sel.mmin && !m_sel.lcm))
if(m_sel.fst)
{
// m_local.d[i].s/t = GSVector4i(v);

13
plugins/GSdx/GSSetupPrimCodeGenerator.x86.cpp
View File

@ -176,16 +176,11 @@ void GSSetupPrimCodeGenerator::Texture()
if(m_sel.fst)
{
// m_local.d4.st = GSVector4i(t * 4.0f);
if(m_sel.mmin && !m_sel.lcm)
{
movhps(ptr[&m_local.d4.stq.z], xmm1);
}
// m_local.d4.stq = GSVector4i(t * 4.0f);
cvttps2dq(xmm1, xmm1);
movq(ptr[&m_local.d4.stq], xmm1);
movdqa(ptr[&m_local.d4.stq], xmm1);
}
else
{
@ -194,7 +189,7 @@ void GSSetupPrimCodeGenerator::Texture()
movaps(ptr[&m_local.d4.stq], xmm1);
}
for(int j = 0, k = m_sel.fst && !(m_sel.mmin && !m_sel.lcm) ? 2 : 3; j < k; j++)
for(int j = 0, k = m_sel.fst ? 2 : 3; j < k; j++)
{
// GSVector4 ds = t.xxxx();
// GSVector4 dt = t.yyyy();
@ -210,7 +205,7 @@ void GSSetupPrimCodeGenerator::Texture()
movaps(xmm2, xmm1);
mulps(xmm2, Xmm(4 + i));
if(m_sel.fst && !(m_sel.mmin && !m_sel.lcm))
if(m_sel.fst)
{
// m_local.d[i].s/t = GSVector4i(v);

2
plugins/GSdx/GSVertexTrace.cpp
View File

@ -66,7 +66,7 @@ void GSVertexTrace::UpdateLOD()
float K = (float)TEX1.K / 16;
if(TEX1.LCM == 0) // && m_state->PRIM->FST == 0 // if FST => assume Q = 1.0f (should not, but Q is very often bogus, 0 or DEN)
if(TEX1.LCM == 0 && m_state->PRIM->FST == 0) // FST == 1 => Q is not interpolated
{
// LOD = log2(1/|Q|) * (1 << L) + K