diff options
| author | Yuriy O'Donnell <yuriyo@gmail.com> | 2014-10-17 22:24:44 +0200 |
|---|---|---|
| committer | Yuriy O'Donnell <yuriyo@gmail.com> | 2014-10-17 22:24:57 +0200 |
| commit | b78396847fe5e2244fab613ab527b3fd89f3da3a (patch) | |
| tree | 47163b794bdcb253a01621546cbb7ab3d5c92ae2 /Source/Core/VideoBackends/D3D/Render.cpp | |
| parent | 9bdfd4a833ffbd95f7636fb42db0004a896621b1 (diff) | |
D3D: Removed SetBlendOp, SetSrcBlend and SetDestBlend as they are now trivial
Diffstat (limited to 'Source/Core/VideoBackends/D3D/Render.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/Render.cpp | 45 |
1 files changed, 9 insertions, 36 deletions
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index a036e67b4c..dd4e5e62c5 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -551,33 +551,6 @@ void Renderer::ReinterpretPixelData(unsigned int convtype) D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(), FramebufferManager::GetEFBDepthTexture()->GetDSV()); } -void SetSrcBlend(D3D11_BLEND val) -{ - // Colors should blend against SRC_ALPHA - if (val == D3D11_BLEND_SRC1_ALPHA) - val = D3D11_BLEND_SRC_ALPHA; - else if (val == D3D11_BLEND_INV_SRC1_ALPHA) - val = D3D11_BLEND_INV_SRC_ALPHA; - - gx_state.blend.src_blend = val; -} - -void SetDestBlend(D3D11_BLEND val) -{ - // Colors should blend against SRC_ALPHA - if (val == D3D11_BLEND_SRC1_ALPHA) - val = D3D11_BLEND_SRC_ALPHA; - else if (val == D3D11_BLEND_INV_SRC1_ALPHA) - val = D3D11_BLEND_INV_SRC_ALPHA; - - gx_state.blend.dst_blend = val; -} - -void SetBlendOp(D3D11_BLEND_OP val) -{ - gx_state.blend.blend_op = val; -} - void Renderer::SetBlendMode(bool forceUpdate) { // Our render target always uses an alpha channel, so we need to override the blend functions to assume a destination alpha of 1 if the render target isn't supposed to have an alpha channel @@ -612,18 +585,18 @@ void Renderer::SetBlendMode(bool forceUpdate) if (bpmem.blendmode.subtract) { gx_state.blend.blend_enable = true; - SetBlendOp(D3D11_BLEND_OP_REV_SUBTRACT); - SetSrcBlend(D3D11_BLEND_ONE); - SetDestBlend(D3D11_BLEND_ONE); + gx_state.blend.blend_op = D3D11_BLEND_OP_REV_SUBTRACT; + gx_state.blend.src_blend = D3D11_BLEND_ONE; + gx_state.blend.dst_blend = D3D11_BLEND_ONE; } else { gx_state.blend.blend_enable = (u32)bpmem.blendmode.blendenable; if (bpmem.blendmode.blendenable) { - SetBlendOp(D3D11_BLEND_OP_ADD); - SetSrcBlend(d3dSrcFactors[bpmem.blendmode.srcfactor]); - SetDestBlend(d3dDestFactors[bpmem.blendmode.dstfactor]); + gx_state.blend.blend_op = D3D11_BLEND_OP_ADD; + gx_state.blend.src_blend = d3dSrcFactors[bpmem.blendmode.srcfactor]; + gx_state.blend.dst_blend = d3dDestFactors[bpmem.blendmode.dstfactor]; } } } @@ -1181,9 +1154,9 @@ void Renderer::SetLogicOpMode() if (bpmem.blendmode.logicopenable) { gx_state.blend.blend_enable = true; - SetBlendOp(d3dLogicOps[bpmem.blendmode.logicmode]); - SetSrcBlend(d3dLogicOpSrcFactors[bpmem.blendmode.logicmode]); - SetDestBlend(d3dLogicOpDestFactors[bpmem.blendmode.logicmode]); + gx_state.blend.blend_op = d3dLogicOps[bpmem.blendmode.logicmode]; + gx_state.blend.src_blend = d3dLogicOpSrcFactors[bpmem.blendmode.logicmode]; + gx_state.blend.dst_blend = d3dLogicOpDestFactors[bpmem.blendmode.logicmode]; } else { |