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

gsdx: align variable 'offsetof' of x64.avx with x86

This commit is contained in:
Gregory Hainaut 2015-11-13 18:10:12 +01:00
parent 3fea5779df
commit 967cc0b37b
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
plugins/GSdx/GSSetupPrimCodeGenerator.x64.avx.cpp
View File

@ -95,7 +95,9 @@ void GSSetupPrimCodeGenerator::Depth()
vcvttps2dq(xmm2, xmm2); vcvttps2dq(xmm2, xmm2);
vpshuflw(xmm2, xmm2, _MM_SHUFFLE(2, 2, 0, 0)); vpshuflw(xmm2, xmm2, _MM_SHUFFLE(2, 2, 0, 0));
vpshufhw(xmm2, xmm2, _MM_SHUFFLE(2, 2, 0, 0)); vpshufhw(xmm2, xmm2, _MM_SHUFFLE(2, 2, 0, 0));
vmovdqa(ptr[r8 + offsetof(GSScanlineLocalData, d[i].f)], xmm2);
const size_t variableOffset = offsetof(GSScanlineLocalData, d[0].f) + (i * sizeof(GSScanlineLocalData::d[0]));
vmovdqa(ptr[r8 + variableOffset], xmm2);
} }
} }
@ -115,7 +117,9 @@ void GSSetupPrimCodeGenerator::Depth()
// m_local.d[i].z = dz * m_shift[i]; // m_local.d[i].z = dz * m_shift[i];
vmulps(xmm1, xmm0, Xmm(4 + i)); vmulps(xmm1, xmm0, Xmm(4 + i));
vmovdqa(ptr[r8 + offsetof(GSScanlineLocalData, d[i].z)], xmm1);
const size_t variableOffset = offsetof(GSScanlineLocalData, d[0].z) + (i * sizeof(GSScanlineLocalData::d[0]));
vmovdqa(ptr[r8 + variableOffset], xmm1);
} }
} }
} }
@ -219,21 +223,28 @@ void GSSetupPrimCodeGenerator::Texture()
vcvttps2dq(xmm2, xmm2); vcvttps2dq(xmm2, xmm2);
const size_t variableOffsetS = offsetof(GSScanlineLocalData, d[0].s) + (i * sizeof(GSScanlineLocalData::d[0]));
const size_t variableOffsetT = offsetof(GSScanlineLocalData, d[0].t) + (i * sizeof(GSScanlineLocalData::d[0]));
switch(j) switch(j)
{ {
case 0: vmovdqa(ptr[r8 + offsetof(GSScanlineLocalData, d[i].s)], xmm2); break; case 0: vmovdqa(ptr[r8 + variableOffsetS], xmm2); break;
case 1: vmovdqa(ptr[r8 + offsetof(GSScanlineLocalData, d[i].t)], xmm2); break; case 1: vmovdqa(ptr[r8 + variableOffsetT], xmm2); break;
} }
} }
else else
{ {
// m_local.d[i].s/t/q = v; // m_local.d[i].s/t/q = v;
const size_t variableOffsetS = offsetof(GSScanlineLocalData, d[0].s) + (i * sizeof(GSScanlineLocalData::d[0]));
const size_t variableOffsetT = offsetof(GSScanlineLocalData, d[0].t) + (i * sizeof(GSScanlineLocalData::d[0]));
const size_t variableOffsetQ = offsetof(GSScanlineLocalData, d[0].q) + (i * sizeof(GSScanlineLocalData::d[0]));
switch(j) switch(j)
{ {
case 0: vmovaps(ptr[r8 + offsetof(GSScanlineLocalData, d[i].s)], xmm2); break; case 0: vmovaps(ptr[r8 + variableOffsetS], xmm2); break;
case 1: vmovaps(ptr[r8 + offsetof(GSScanlineLocalData, d[i].t)], xmm2); break; case 1: vmovaps(ptr[r8 + variableOffsetT], xmm2); break;
case 2: vmovaps(ptr[r8 + offsetof(GSScanlineLocalData, d[i].q)], xmm2); break; case 2: vmovaps(ptr[r8 + variableOffsetQ], xmm2); break;
} }
} }
} }
@ -286,7 +297,9 @@ void GSSetupPrimCodeGenerator::Color()
// m_local.d[i].rb = r.upl16(b); // m_local.d[i].rb = r.upl16(b);
vpunpcklwd(xmm0, xmm1); vpunpcklwd(xmm0, xmm1);
vmovdqa(ptr[r8 + offsetof(GSScanlineLocalData, d[i].rb)], xmm0);
const size_t variableOffset = offsetof(GSScanlineLocalData, d[0].rb) + (i * sizeof(GSScanlineLocalData::d[0]));
vmovdqa(ptr[r8 + variableOffset], xmm0);
} }
// GSVector4 c = dscan.c; // GSVector4 c = dscan.c;
@ -316,7 +329,9 @@ void GSSetupPrimCodeGenerator::Color()
// m_local.d[i].ga = g.upl16(a); // m_local.d[i].ga = g.upl16(a);
vpunpcklwd(xmm0, xmm1); vpunpcklwd(xmm0, xmm1);
vmovdqa(ptr[r8 + offsetof(GSScanlineLocalData, d[i].ga)], xmm0);
const size_t variableOffset = offsetof(GSScanlineLocalData, d[0].ga) + (i * sizeof(GSScanlineLocalData::d[0]));
vmovdqa(ptr[r8 + variableOffset], xmm0);
} }
} }
else else
@ -348,4 +363,4 @@ void GSSetupPrimCodeGenerator::Color()
} }
} }
#endif #endif