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

gsdx sw: vinsert128 opcode require an XMM register 

Reported as an error on lastest Xbyak
This commit is contained in:
Gregory Hainaut 2016-11-20 20:17:47 +01:00
parent e674518c4e
commit 923c297dfc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/GSdx/GSDrawScanlineCodeGenerator.x86.avx2.cpp
View File

@ -2698,10 +2698,10 @@ void GSDrawScanlineCodeGenerator::WriteFrame()
void GSDrawScanlineCodeGenerator::ReadPixel(const Ymm& dst, const Ymm& temp, const Reg32& addr) void GSDrawScanlineCodeGenerator::ReadPixel(const Ymm& dst, const Ymm& temp, const Reg32& addr)
{ {
vmovq(Xmm(dst.getIdx()), qword[addr * 2 + (size_t)m_local.gd->vm]); vmovq(Xmm(dst.getIdx()), qword[addr * 2 + (size_t)m_local.gd->vm]);
vmovhps(Xmm(dst.getIdx()), qword[addr * 2 + (size_t)m_local.gd->vm + 8 * 2]); vmovhps(Xmm(dst.getIdx()), qword[addr * 2 + (size_t)m_local.gd->vm + 8 * 2]);
vmovq(Xmm(temp.getIdx()), qword[addr * 2 + (size_t)m_local.gd->vm + 16 * 2]); vmovq(Xmm(temp.getIdx()), qword[addr * 2 + (size_t)m_local.gd->vm + 16 * 2]);
vmovhps(Xmm(temp.getIdx()), qword[addr * 2 + (size_t)m_local.gd->vm + 24 * 2]); vmovhps(Xmm(temp.getIdx()), qword[addr * 2 + (size_t)m_local.gd->vm + 24 * 2]);
vinserti128(dst, dst, temp, 1); vinserti128(dst, dst, Xmm(temp.getIdx()), 1);
/* /*
vmovdqu(dst, ptr[addr * 2 + (size_t)m_local.gd->vm]); vmovdqu(dst, ptr[addr * 2 + (size_t)m_local.gd->vm]);
vmovdqu(temp, ptr[addr * 2 + (size_t)m_local.gd->vm + 16 * 2]); vmovdqu(temp, ptr[addr * 2 + (size_t)m_local.gd->vm + 16 * 2]);
@ -2888,14 +2888,14 @@ void GSDrawScanlineCodeGenerator::ReadTexel(int pixels, int mip_offset)
ReadTexel(t2, t1, j); ReadTexel(t2, t1, j);
} }
vinserti128(dst, dst, t2, 1); vinserti128(dst, dst, Xmm(t2.getIdx()), 1);
} }
} }
else else
{ {
const int r[] = {5, 6, 2, 4, 0, 1, 3, 5}; const int r[] = {5, 6, 2, 4, 0, 1, 3, 5};
const int t[] = {1, 4, 5, 1, 2, 5, 0, 2}; const int t[] = {1, 4, 5, 1, 2, 5, 0, 2};
if(m_sel.mmin && m_sel.lcm) if(m_sel.mmin && m_sel.lcm)
{ {
mov(ebx, ptr[&lod_i->u32[0]]); mov(ebx, ptr[&lod_i->u32[0]]);
@ -2924,7 +2924,7 @@ void GSDrawScanlineCodeGenerator::ReadTexel(int pixels, int mip_offset)
ReadTexel(t2, t1, j); ReadTexel(t2, t1, j);
} }
vinserti128(dst, dst, t2, 1); vinserti128(dst, dst, Xmm(t2.getIdx()), 1);
/* /*
vpcmpeqd(t1, t1); vpcmpeqd(t1, t1);
vpgatherdd(t2, ptr[ebx + src * 1], t1); // either this 1x scale, or the latency of two dependendent gathers are too slow vpgatherdd(t2, ptr[ebx + src * 1], t1); // either this 1x scale, or the latency of two dependendent gathers are too slow