diff --git a/pcsx2/GS.cpp b/pcsx2/GS.cpp index 5cc3f2ae26..779f10a8e6 100644 --- a/pcsx2/GS.cpp +++ b/pcsx2/GS.cpp @@ -79,7 +79,8 @@ static __fi void gsCSRwrite( const tGS_CSR& csr ) SIGNAL_IMR_Pending = false; #else - GUNIT_WARN("csr.RESET"); + GUNIT_WARN("GUNIT_WARN: csr.RESET"); + Console.Warning( "csr.RESET" ); //gifUnit.Reset(true); // Don't think gif should be reset... gifUnit.gsSIGNAL.queued = false; GetMTGS().SendSimplePacket(GS_RINGTYPE_RESET, 0, 0, 0); diff --git a/plugins/GSdx/GSRendererDX.h b/plugins/GSdx/GSRendererDX.h index 7dc2f29b01..cbec37fe12 100644 --- a/plugins/GSdx/GSRendererDX.h +++ b/plugins/GSdx/GSRendererDX.h @@ -248,7 +248,7 @@ public: } } - if(env.COLCLAMP.CLAMP == 0) + if (env.COLCLAMP.CLAMP == 0 && /* hack */ !tex) { ps_sel.colclip = 1; } @@ -357,7 +357,7 @@ public: { dev->DrawPrimitive(); - if(env.COLCLAMP.CLAMP == 0) + if (env.COLCLAMP.CLAMP == 0 && /* hack */ !tex) { GSDeviceDX::OMBlendSelector om_bselneg(om_bsel); GSDeviceDX::PSSelector ps_selneg(ps_sel); @@ -422,7 +422,7 @@ public: dev->DrawPrimitive(); - if(env.COLCLAMP.CLAMP == 0) + if (env.COLCLAMP.CLAMP == 0 && /* hack */ !tex) { GSDeviceDX::OMBlendSelector om_bselneg(om_bsel); GSDeviceDX::PSSelector ps_selneg(ps_sel);