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

Get rid of a few GSdx warnings. Remove some extra newlines in Sio's console output.

This commit is contained in:
Shanoah Alkire 2018-10-27 01:59:53 -07:00
parent 0cbbf2daf9
commit 6710b0c906
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcsx2/Sio.cpp
View File

@ -171,7 +171,7 @@ SIO_WRITE sioWriteStart(u8 data)
case 0x81: siomode = SIO_MEMCARD; break; case 0x81: siomode = SIO_MEMCARD; break;
default: default:
DevCon.Warning("%s cmd: %02X??\n", __FUNCTION__, data); DevCon.Warning("%s cmd: %02X??", __FUNCTION__, data);
DEVICE_UNPLUGGED(); DEVICE_UNPLUGGED();
siomode = SIO_DUMMY; siomode = SIO_DUMMY;
break; break;
@ -257,7 +257,7 @@ SIO_WRITE sioWriteMultitap(u8 data)
break; break;
default: default:
DevCon.Warning("%s cmd: %02X??\n", __FUNCTION__, data); DevCon.Warning("%s cmd: %02X??", __FUNCTION__, data);
sio.buf[3] = 0x00; sio.buf[3] = 0x00;
sio.buf[4] = 0x00; sio.buf[4] = 0x00;
sio.buf[5] = 0x00; sio.buf[5] = 0x00;
@ -364,7 +364,7 @@ SIO_WRITE memcardErase(u8 data)
break; break;
default: default:
DevCon.Warning("%s cmd: %02X??\n", __FUNCTION__, data); DevCon.Warning("%s cmd: %02X??", __FUNCTION__, data);
sio.bufCount = -1; sio.bufCount = -1;
//sio.bufSize = 3; //sio.bufSize = 3;
//sio.bufCount = 4; //sio.bufCount = 4;
@ -425,7 +425,7 @@ SIO_WRITE memcardWrite(u8 data)
} }
default: default:
DevCon.Warning("%s cmd: %02X??\n", __FUNCTION__, data); DevCon.Warning("%s cmd: %02X??", __FUNCTION__, data);
sio.bufCount = -1; sio.bufCount = -1;
//sio.bufSize = 3; //sio.bufSize = 3;
//sio.bufCount = 4; //sio.bufCount = 4;
@ -515,7 +515,7 @@ SIO_WRITE memcardRead(u8 data)
} }
default: default:
DevCon.Warning("%s cmd: %02X??\n", __FUNCTION__, data); DevCon.Warning("%s cmd: %02X??", __FUNCTION__, data);
sio.bufCount = -1; sio.bufCount = -1;
//sio.bufSize = 3; //sio.bufSize = 3;
//sio.bufCount = 4; //sio.bufCount = 4;
@ -706,7 +706,7 @@ SIO_WRITE sioWriteMemcard(u8 data)
break; break;
default: default:
DevCon.Warning("%s cmd: %02X??\n", __FUNCTION__, data); DevCon.Warning("%s cmd: %02X??", __FUNCTION__, data);
siomode = SIO_DUMMY; siomode = SIO_DUMMY;
break; break;
} }

6
plugins/GSdx/GSRendererOGL.cpp
View File

@ -562,17 +562,23 @@ void GSRendererOGL::EmulateBlending(bool DATE_GL42)
bool accumulation_blend = !!(blend_flag & BLEND_ACCU); bool accumulation_blend = !!(blend_flag & BLEND_ACCU);
// Warning no break on purpose // Warning no break on purpose
// Note: the "fall through" comments tell gcc not to complain about not having breaks.
switch (m_sw_blending) { switch (m_sw_blending) {
case ACC_BLEND_ULTRA: sw_blending |= true; case ACC_BLEND_ULTRA: sw_blending |= true;
// fall through
case ACC_BLEND_FULL: if (!m_vt.m_alpha.valid && (ALPHA.C == 0)) GetAlphaMinMax(); case ACC_BLEND_FULL: if (!m_vt.m_alpha.valid && (ALPHA.C == 0)) GetAlphaMinMax();
sw_blending |= (ALPHA.A != ALPHA.B) && sw_blending |= (ALPHA.A != ALPHA.B) &&
((ALPHA.C == 0 && m_vt.m_alpha.max > 128) || (ALPHA.C == 2 && ALPHA.FIX > 128u)); ((ALPHA.C == 0 && m_vt.m_alpha.max > 128) || (ALPHA.C == 2 && ALPHA.FIX > 128u));
// fall through
case ACC_BLEND_CCLIP_DALPHA: sw_blending |= (ALPHA.C == 1) || (m_env.COLCLAMP.CLAMP == 0); case ACC_BLEND_CCLIP_DALPHA: sw_blending |= (ALPHA.C == 1) || (m_env.COLCLAMP.CLAMP == 0);
// Initial idea was to enable accurate blending for sprite rendering to handle // Initial idea was to enable accurate blending for sprite rendering to handle
// correctly post-processing effect. Some games (ZoE) use tons of sprites as particles. // correctly post-processing effect. Some games (ZoE) use tons of sprites as particles.
// In order to keep it fast, let's limit it to smaller draw call. // In order to keep it fast, let's limit it to smaller draw call.
// fall through
case ACC_BLEND_SPRITE: sw_blending |= m_vt.m_primclass == GS_SPRITE_CLASS && m_drawlist.size() < 100; case ACC_BLEND_SPRITE: sw_blending |= m_vt.m_primclass == GS_SPRITE_CLASS && m_drawlist.size() < 100;
// fall through
case ACC_BLEND_FREE: sw_blending |= impossible_or_free_blend; case ACC_BLEND_FREE: sw_blending |= impossible_or_free_blend;
// fall through
default: /*sw_blending |= accumulation_blend*/; default: /*sw_blending |= accumulation_blend*/;
} }
// SW Blending // SW Blending

1
plugins/GSdx/GSTextureOGL.cpp
View File

@ -252,6 +252,7 @@ GSTextureOGL::GSTextureOGL(int type, int w, int h, int format, GLuint fbo_read,
case GSTexture::Offscreen: case GSTexture::Offscreen:
// Offscreen is only used to read color. So it only requires 4B by pixel // Offscreen is only used to read color. So it only requires 4B by pixel
m_local_buffer = (uint8*)_aligned_malloc(m_size.x * m_size.y * 4, 32); m_local_buffer = (uint8*)_aligned_malloc(m_size.x * m_size.y * 4, 32);
// fall through
case GSTexture::Texture: case GSTexture::Texture:
case GSTexture::RenderTarget: case GSTexture::RenderTarget:
case GSTexture::DepthStencil: case GSTexture::DepthStencil:

4
plugins/GSdx/GSVector4i.h
View File

@ -47,6 +47,10 @@ public:
__forceinline GSVector4i() __forceinline GSVector4i()
{ {
x = 0;
y = 0;
z = 0;
w = 0;
} }
__forceinline GSVector4i(int x, int y, int z, int w) __forceinline GSVector4i(int x, int y, int z, int w)