From 5e9ffc4a94d2367258fb0f50543d8ffdd30a8c22 Mon Sep 17 00:00:00 2001 From: Kojin Date: Fri, 21 Dec 2018 23:55:33 +0100 Subject: [PATCH] GSdx-d3d: Adjust D3D11Blend, get rid of some casts. --- plugins/GSdx/Renderers/DX11/GSTextureFX11.cpp | 6 +++--- plugins/GSdx/Renderers/DXCommon/GSDeviceDX.h | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/plugins/GSdx/Renderers/DX11/GSTextureFX11.cpp b/plugins/GSdx/Renderers/DX11/GSTextureFX11.cpp index 2a87a51c40..5796f7019d 100644 --- a/plugins/GSdx/Renderers/DX11/GSTextureFX11.cpp +++ b/plugins/GSdx/Renderers/DX11/GSTextureFX11.cpp @@ -398,9 +398,9 @@ void GSDevice11::SetupOM(OMDepthStencilSelector dssel, OMBlendSelector bsel, uin { int i = ((bsel.a * 3 + bsel.b) * 3 + bsel.c) * 3 + bsel.d; - bd.RenderTarget[0].BlendOp = (D3D11_BLEND_OP)m_blendMapD3D11[i].op; - bd.RenderTarget[0].SrcBlend = (D3D11_BLEND)m_blendMapD3D11[i].src; - bd.RenderTarget[0].DestBlend = (D3D11_BLEND)m_blendMapD3D11[i].dst; + bd.RenderTarget[0].BlendOp = m_blendMapD3D11[i].op; + bd.RenderTarget[0].SrcBlend = m_blendMapD3D11[i].src; + bd.RenderTarget[0].DestBlend = m_blendMapD3D11[i].dst; bd.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD; bd.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE; bd.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO; diff --git a/plugins/GSdx/Renderers/DXCommon/GSDeviceDX.h b/plugins/GSdx/Renderers/DXCommon/GSDeviceDX.h index 88684e0d5c..bd209b7a8a 100644 --- a/plugins/GSdx/Renderers/DXCommon/GSDeviceDX.h +++ b/plugins/GSdx/Renderers/DXCommon/GSDeviceDX.h @@ -304,7 +304,12 @@ public: } }; - struct D3D11Blend {int bogus, op, src, dst;}; + struct D3D11Blend + { + int bogus; + D3D11_BLEND_OP op; + D3D11_BLEND src, dst; + }; static const D3D11Blend m_blendMapD3D11[3*3*3*3]; #pragma pack(pop)