From: Chip Davis Subject: [PATCH 07/11] d3d11: Introduce a function to convert D3D10 blend ops to D3D11. Message-Id: <20200403160605.80465-7-cdavis@codeweavers.com> Date: Fri, 3 Apr 2020 11:06:01 -0500 In-Reply-To: <20200403160605.80465-6-cdavis@codeweavers.com> References: <20200403160605.80465-1-cdavis@codeweavers.com> <20200403160605.80465-2-cdavis@codeweavers.com> <20200403160605.80465-3-cdavis@codeweavers.com> <20200403160605.80465-4-cdavis@codeweavers.com> <20200403160605.80465-5-cdavis@codeweavers.com> <20200403160605.80465-6-cdavis@codeweavers.com> Signed-off-by: Chip Davis --- dlls/d3d11/state.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 76784a3e3df..9170986b1c9 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -245,6 +245,11 @@ static D3D10_BLEND d3d10_blend_from_d3d11(D3D11_BLEND factor) return (D3D10_BLEND)factor; } +static D3D10_BLEND_OP d3d10_blend_op_from_d3d11(D3D11_BLEND_OP op) +{ + return (D3D10_BLEND_OP)op; +} + static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc(ID3D10BlendState1 *iface, D3D10_BLEND_DESC *desc) { struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); @@ -256,10 +261,10 @@ static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc(ID3D10BlendState1 *iface desc->AlphaToCoverageEnable = d3d11_desc->AlphaToCoverageEnable; desc->SrcBlend = d3d10_blend_from_d3d11(d3d11_desc->RenderTarget[0].SrcBlend); desc->DestBlend = d3d10_blend_from_d3d11(d3d11_desc->RenderTarget[0].DestBlend); - desc->BlendOp = d3d11_desc->RenderTarget[0].BlendOp; + desc->BlendOp = d3d10_blend_op_from_d3d11(d3d11_desc->RenderTarget[0].BlendOp); desc->SrcBlendAlpha = d3d10_blend_from_d3d11(d3d11_desc->RenderTarget[0].SrcBlendAlpha); desc->DestBlendAlpha = d3d10_blend_from_d3d11(d3d11_desc->RenderTarget[0].DestBlendAlpha); - desc->BlendOpAlpha = d3d11_desc->RenderTarget[0].BlendOpAlpha; + desc->BlendOpAlpha = d3d10_blend_op_from_d3d11(d3d11_desc->RenderTarget[0].BlendOpAlpha); for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) { desc->BlendEnable[i] = d3d11_desc->RenderTarget[i].BlendEnable; -- 2.24.0