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

gsdx-ogl: don't enable both HW&SW blending

This commit is contained in:
Gregory Hainaut 2015-07-18 16:15:52 +02:00
parent c4e165067d
commit 88cd333839
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/GSdx/GSRendererOGL.cpp
View File

@ -785,7 +785,7 @@ void GSRendererOGL::DrawPrims(GSTexture* rt, GSTexture* ds, GSTextureCache::Sour
sw_blending &= !DATE_GL42; sw_blending &= !DATE_GL42;
if (sw_blending && om_bsel.abe && rt) { if (sw_blending && om_bsel.abe && rt) {
GL_INS("!!! SW blending effect used (0x%x from sel %d) !!!", bogus_blend, blend_sel); //GL_INS("!!! SW blending effect used (0x%x from sel %d) !!!", bogus_blend, blend_sel);
// select a shader that support blending // select a shader that support blending
ps_sel.blend_a = om_bsel.a; ps_sel.blend_a = om_bsel.a;
@ -884,7 +884,7 @@ void GSRendererOGL::DrawPrims(GSTexture* rt, GSTexture* ds, GSTextureCache::Sour
if (colclip_wrap) if (colclip_wrap)
{ {
ASSERT((bogus_blend & A_MAX) == 0); ASSERT(!sw_blending);
GL_PUSH("COLCLIP"); GL_PUSH("COLCLIP");
GSDeviceOGL::OMBlendSelector om_bselneg(om_bsel); GSDeviceOGL::OMBlendSelector om_bselneg(om_bsel);
GSDeviceOGL::PSSelector ps_selneg(ps_sel); GSDeviceOGL::PSSelector ps_selneg(ps_sel);
@ -938,13 +938,13 @@ void GSRendererOGL::DrawPrims(GSTexture* rt, GSTexture* ds, GSTextureCache::Sour
om_csel.wa = a; om_csel.wa = a;
dev->OMSetColorMaskState(om_csel); dev->OMSetColorMaskState(om_csel);
dev->SetupOM(om_dssel, om_bsel, afix); dev->SetupOM(om_dssel, om_bsel, afix, sw_blending);
SendDraw(require_barrier); SendDraw(require_barrier);
if (colclip_wrap) if (colclip_wrap)
{ {
ASSERT((bogus_blend & A_MAX) == 0); ASSERT(!sw_blending);
GL_PUSH("COLCLIP"); GL_PUSH("COLCLIP");
GSDeviceOGL::OMBlendSelector om_bselneg(om_bsel); GSDeviceOGL::OMBlendSelector om_bselneg(om_bsel);
GSDeviceOGL::PSSelector ps_selneg(ps_sel); GSDeviceOGL::PSSelector ps_selneg(ps_sel);