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

GSDX: Cleanup warnings on MSVC (#1694) 

Explicitly cast some bitfields/local loop variables to uint8 as these functions have uint8 as the parameter datatype.
This commit is contained in:
Akash 2016-12-22 04:51:07 +05:30 committed by Jonathan Li
parent 10eb88f6fe
commit 8038ce1aa9
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/GSdx/GSDrawScanlineCodeGenerator.x64.avx.cpp
View File

@ -693,8 +693,8 @@ void GSDrawScanlineCodeGenerator::TestZ_AVX(const Xmm& temp1, const Xmm& temp2)
if(m_sel.zpsm) if(m_sel.zpsm)
{ {
vpslld(xmm1, m_sel.zpsm * 8); vpslld(xmm1, static_cast<uint8>(m_sel.zpsm * 8));
vpsrld(xmm1, m_sel.zpsm * 8); vpsrld(xmm1, static_cast<uint8>(m_sel.zpsm * 8));
} }
if(m_sel.zoverflow || m_sel.zpsm == 0) if(m_sel.zoverflow || m_sel.zpsm == 0)
@ -824,7 +824,7 @@ void GSDrawScanlineCodeGenerator::SampleTexture_AVX()
vpunpcklwd(xmm2, xmm4, xmm0); vpunpcklwd(xmm2, xmm4, xmm0);
vpunpckhwd(xmm3, xmm4, xmm0); vpunpckhwd(xmm3, xmm4, xmm0);
vpslld(xmm3, m_sel.tw + 3); vpslld(xmm3, static_cast<uint8>(m_sel.tw + 3));
// xmm0 = 0 // xmm0 = 0
// xmm2 = x0 // xmm2 = x0
@ -840,7 +840,7 @@ void GSDrawScanlineCodeGenerator::SampleTexture_AVX()
vpunpcklwd(xmm4, xmm5, xmm0); vpunpcklwd(xmm4, xmm5, xmm0);
vpunpckhwd(xmm5, xmm5, xmm0); vpunpckhwd(xmm5, xmm5, xmm0);
vpslld(xmm5, m_sel.tw + 3); vpslld(xmm5, static_cast<uint8>(m_sel.tw + 3));
// xmm2 = x0 // xmm2 = x0
// xmm3 = y0 // xmm3 = y0
@ -2019,7 +2019,7 @@ void GSDrawScanlineCodeGenerator::ReadTexel_AVX(int pixels, int mip_offset)
for(int i = 0; i < pixels; i++) for(int i = 0; i < pixels; i++)
{ {
for(int j = 0; j < 4; j++) for(uint8 j = 0; j < 4; j++)
{ {
ReadTexel_AVX(Xmm(out[i]), Xmm(in[i]), j); ReadTexel_AVX(Xmm(out[i]), Xmm(in[i]), j);
} }

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

@ -654,8 +654,8 @@ void GSDrawScanlineCodeGenerator::TestZ_AVX(const Xmm& temp1, const Xmm& temp2)
if(m_sel.zpsm) if(m_sel.zpsm)
{ {
vpslld(xmm1, m_sel.zpsm * 8); vpslld(xmm1, static_cast<uint8>(m_sel.zpsm * 8));
vpsrld(xmm1, m_sel.zpsm * 8); vpsrld(xmm1, static_cast<uint8>(m_sel.zpsm * 8));
} }
if(m_sel.zoverflow || m_sel.zpsm == 0) if(m_sel.zoverflow || m_sel.zpsm == 0)
@ -795,7 +795,7 @@ void GSDrawScanlineCodeGenerator::SampleTexture_AVX()
vpunpcklwd(xmm4, xmm2, xmm0); vpunpcklwd(xmm4, xmm2, xmm0);
vpunpckhwd(xmm2, xmm2, xmm0); vpunpckhwd(xmm2, xmm2, xmm0);
vpslld(xmm2, m_sel.tw + 3); vpslld(xmm2, static_cast<uint8>(m_sel.tw + 3));
// xmm0 = 0 // xmm0 = 0
// xmm2 = y0 // xmm2 = y0
@ -811,7 +811,7 @@ void GSDrawScanlineCodeGenerator::SampleTexture_AVX()
vpunpcklwd(xmm6, xmm3, xmm0); vpunpcklwd(xmm6, xmm3, xmm0);
vpunpckhwd(xmm3, xmm3, xmm0); vpunpckhwd(xmm3, xmm3, xmm0);
vpslld(xmm3, m_sel.tw + 3); vpslld(xmm3, static_cast<uint8>(m_sel.tw + 3));
// xmm2 = y0 // xmm2 = y0
// xmm3 = y1 // xmm3 = y1
@ -1380,7 +1380,7 @@ return;
vpunpcklwd(xmm4, xmm2, xmm0); vpunpcklwd(xmm4, xmm2, xmm0);
vpunpckhwd(xmm2, xmm2, xmm0); vpunpckhwd(xmm2, xmm2, xmm0);
vpslld(xmm2, m_sel.tw + 3); vpslld(xmm2, static_cast<uint8>(m_sel.tw + 3));
// xmm0 = 0 // xmm0 = 0
// xmm2 = y0 // xmm2 = y0
@ -1396,7 +1396,7 @@ return;
vpunpcklwd(xmm6, xmm3, xmm0); vpunpcklwd(xmm6, xmm3, xmm0);
vpunpckhwd(xmm3, xmm3, xmm0); vpunpckhwd(xmm3, xmm3, xmm0);
vpslld(xmm3, m_sel.tw + 3); vpslld(xmm3, static_cast<uint8>(m_sel.tw + 3));
// xmm2 = y0 // xmm2 = y0
// xmm3 = y1 // xmm3 = y1
@ -1611,7 +1611,7 @@ return;
vpunpcklwd(xmm4, xmm2, xmm0); vpunpcklwd(xmm4, xmm2, xmm0);
vpunpckhwd(xmm2, xmm2, xmm0); vpunpckhwd(xmm2, xmm2, xmm0);
vpslld(xmm2, m_sel.tw + 3); vpslld(xmm2, static_cast<uint8>(m_sel.tw + 3));
// xmm0 = 0 // xmm0 = 0
// xmm2 = y0 // xmm2 = y0
@ -1627,7 +1627,7 @@ return;
vpunpcklwd(xmm6, xmm3, xmm0); vpunpcklwd(xmm6, xmm3, xmm0);
vpunpckhwd(xmm3, xmm3, xmm0); vpunpckhwd(xmm3, xmm3, xmm0);
vpslld(xmm3, m_sel.tw + 3); vpslld(xmm3, static_cast<uint8>(m_sel.tw + 3));
// xmm2 = y0 // xmm2 = y0
// xmm3 = y1 // xmm3 = y1

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

@ -2889,7 +2889,7 @@ void GSDrawScanlineCodeGenerator::ReadTexel_SSE(int pixels, int mip_offset)
movdqa(ptr[&m_local.temp.test], xmm7); movdqa(ptr[&m_local.temp.test], xmm7);
} }
for(int j = 0; j < 4; j++) for(uint8 j = 0; j < 4; j++)
{ {
mov(ebx, ptr[&lod_i->u32[j]]); mov(ebx, ptr[&lod_i->u32[j]]);
mov(ebx, ptr[ebp + ebx * sizeof(void*) + mip_offset]); mov(ebx, ptr[ebp + ebx * sizeof(void*) + mip_offset]);
@ -3042,7 +3042,7 @@ void GSDrawScanlineCodeGenerator::ReadTexel_SSE(int pixels, int mip_offset)
{ {
for(int i = 0; i < pixels; i++) for(int i = 0; i < pixels; i++)
{ {
for(int j = 0; j < 4; j++) for(uint8 j = 0; j < 4; j++)
{ {
ReadTexel_SSE(Xmm(r[i * 2 + 1]), Xmm(r[i * 2 + 0]), j); ReadTexel_SSE(Xmm(r[i * 2 + 1]), Xmm(r[i * 2 + 0]), j);
} }