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

Merge pull request #1707 from magumagu/blend-and-logic-op 

D3D+OGL: choose blendenable over logicopenable.
This commit is contained in:
Markus Wick 2014-12-16 12:27:04 +01:00
parent 7b5b76caa4 31bcdb8f2f
commit d3c4a8eda3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoBackends/D3D/Render.cpp
View File

@ -615,7 +615,7 @@ void Renderer::SetBlendMode(bool forceUpdate)
(target_has_alpha) ? D3D11_BLEND_INV_DEST_ALPHA : D3D11_BLEND_ZERO (target_has_alpha) ? D3D11_BLEND_INV_DEST_ALPHA : D3D11_BLEND_ZERO
}; };
if (bpmem.blendmode.logicopenable && !forceUpdate) if (bpmem.blendmode.logicopenable && !bpmem.blendmode.blendenable && !forceUpdate)
return; return;
if (bpmem.blendmode.subtract) if (bpmem.blendmode.subtract)
@ -1234,7 +1234,7 @@ void Renderer::SetLogicOpMode()
D3D11_BLEND_ONE//15 D3D11_BLEND_ONE//15
}; };
if (bpmem.blendmode.logicopenable) if (bpmem.blendmode.logicopenable && !bpmem.blendmode.blendenable)
{ {
gx_state.blend.blend_enable = true; gx_state.blend.blend_enable = true;
gx_state.blend.blend_op = d3dLogicOps[bpmem.blendmode.logicmode]; gx_state.blend.blend_op = d3dLogicOps[bpmem.blendmode.logicmode];

2
Source/Core/VideoBackends/OGL/Render.cpp
View File

@ -1882,7 +1882,7 @@ void Renderer::SetLogicOpMode()
GL_SET GL_SET
}; };
if (bpmem.blendmode.logicopenable) if (bpmem.blendmode.logicopenable && !bpmem.blendmode.blendenable)
{ {
glEnable(GL_COLOR_LOGIC_OP); glEnable(GL_COLOR_LOGIC_OP);
glLogicOp(glLogicOpCodes[bpmem.blendmode.logicmode]); glLogicOp(glLogicOpCodes[bpmem.blendmode.logicmode]);