ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Move the destination alpha blend function to wined3d_blend_state. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-03-10 18:06:18 -05:00 committed by Alexandre Julliard
parent fc740b8724
commit 30e44111fe
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/d3d11/device.c
View File

@ -741,7 +741,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi
const D3D11_RENDER_TARGET_BLEND_DESC *d = &desc->RenderTarget[0];
wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SEPARATEALPHABLENDENABLE, TRUE);
wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, d->DestBlendAlpha);
wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, d->BlendOpAlpha);
}
wined3d_device_set_render_state(device->wined3d_device,

1
dlls/d3d11/state.c
View File

@ -394,6 +394,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC
wined3d_desc.dst = desc->RenderTarget[0].DestBlend;
wined3d_desc.op = desc->RenderTarget[0].BlendOp;
wined3d_desc.src_alpha = desc->RenderTarget[0].SrcBlendAlpha;
wined3d_desc.dst_alpha = desc->RenderTarget[0].DestBlendAlpha;
/* We cannot fail after creating a wined3d_blend_state object. It
* would lead to double free. */

3
dlls/wined3d/device.c
View File

@ -3586,6 +3586,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
case WINED3D_RS_DESTBLEND:
case WINED3D_RS_BLENDOP:
case WINED3D_RS_SRCBLENDALPHA:
case WINED3D_RS_DESTBLENDALPHA:
set_blend_state = TRUE;
break;
@ -3664,10 +3665,12 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
if (state->rs[WINED3D_RS_SEPARATEALPHABLENDENABLE])
{
desc.src_alpha = state->rs[WINED3D_RS_SRCBLENDALPHA];
desc.dst_alpha = state->rs[WINED3D_RS_DESTBLENDALPHA];
}
else
{
desc.src_alpha = state->rs[WINED3D_RS_SRCBLEND];
desc.dst_alpha = state->rs[WINED3D_RS_DESTBLEND];
}
if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_BLENDFACTOR))

7
dlls/wined3d/state.c
View File

@ -573,8 +573,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st
return;
}
gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, b->desc.src_alpha,
state->render_states[WINED3D_RS_DESTBLENDALPHA], rt_format);
gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, b->desc.src_alpha, b->desc.dst_alpha, rt_format);
GL_EXTCALL(glBlendFuncSeparate(src_blend, dst_blend, src_blend_alpha, dst_blend_alpha));
checkGLcall("glBlendFuncSeparate");
@ -4502,8 +4501,6 @@ const struct wined3d_state_entry_template misc_state_template[] =
{ STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so_warn, }, WINED3D_GL_EXT_NONE },
{ STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), state_line_antialias}, WINED3D_GL_EXT_NONE },
{ STATE_RENDER(WINED3D_RS_SEPARATEALPHABLENDENABLE), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE },
{ STATE_RENDER(WINED3D_RS_DESTBLENDALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE },
{ STATE_RENDER(WINED3D_RS_DESTBLENDALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE },
{ STATE_RENDER(WINED3D_RS_BLENDOPALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE },
{ STATE_BLEND, { STATE_BLEND, blend }, WINED3D_GL_EXT_NONE },
{ STATE_BLEND_FACTOR, { STATE_BLEND_FACTOR, state_blend_factor }, EXT_BLEND_COLOR },
@ -5421,7 +5418,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table)
{174, 177},
{193, 193},
{195, 197},
{207, 207},
{207, 208},
{ 0, 0},
};
static const DWORD simple_states[] =

1
include/wine/wined3d.h
View File

@ -2034,6 +2034,7 @@ struct wined3d_blend_state_desc
enum wined3d_blend dst;
enum wined3d_blend_op op;
enum wined3d_blend src_alpha;
enum wined3d_blend dst_alpha;
};
struct wined3d_rasterizer_state_desc