Skip to content

W
wine-cw
Commit 7448012e authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard
Browse files
Options

d3d11: Introduce d3d_blend_state_create() helper function.

Signed-off-by: 's avatarJózef Kucia <jkucia@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 39c2ff02
Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 67 deletions
dlls/d3d11/d3d11_private.h
View file @ 7448012e
......@@ -402,8 +402,8 @@ static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendStat
return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D11BlendState_iface);
}
HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device,
const D3D11_BLEND_DESC *desc) DECLSPEC_HIDDEN;
HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC *desc,
struct d3d_blend_state **state) DECLSPEC_HIDDEN;
struct d3d_blend_state *unsafe_impl_from_ID3D11BlendState(ID3D11BlendState *iface) DECLSPEC_HIDDEN;
struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) DECLSPEC_HIDDEN;
......
dlls/d3d11/device.c
View file @ 7448012e
......@@ -3001,70 +3001,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device *ifa
{
struct d3d_device *device = impl_from_ID3D11Device(iface);
struct d3d_blend_state *object;
struct wine_rb_entry *entry;
D3D11_BLEND_DESC tmp_desc;
unsigned int i, j;
HRESULT hr;
TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state);
if (!desc)
return E_INVALIDARG;
/* D3D11_RENDER_TARGET_BLEND_DESC has a hole, which is a problem because we use
* D3D11_BLEND_DESC as a key in the rbtree. */
memset(&tmp_desc, 0, sizeof(tmp_desc));
tmp_desc.AlphaToCoverageEnable = desc->AlphaToCoverageEnable;
tmp_desc.IndependentBlendEnable = desc->IndependentBlendEnable;
for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i)
{
j = desc->IndependentBlendEnable ? i : 0;
tmp_desc.RenderTarget[i].BlendEnable = desc->RenderTarget[j].BlendEnable;
tmp_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[j].SrcBlend;
tmp_desc.RenderTarget[i].DestBlend = desc->RenderTarget[j].DestBlend;
tmp_desc.RenderTarget[i].BlendOp = desc->RenderTarget[j].BlendOp;
tmp_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[j].SrcBlendAlpha;
tmp_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[j].DestBlendAlpha;
tmp_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[j].BlendOpAlpha;
tmp_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTarget[j].RenderTargetWriteMask;
if (i > 3 && tmp_desc.RenderTarget[i].RenderTargetWriteMask != D3D11_COLOR_WRITE_ENABLE_ALL)
FIXME("Color mask %#x not supported for render target %u.\n",
tmp_desc.RenderTarget[i].RenderTargetWriteMask, i);
}
/* glSampleCoverage() */
if (tmp_desc.AlphaToCoverageEnable)
FIXME("Ignoring AlphaToCoverageEnable %#x.\n", tmp_desc.AlphaToCoverageEnable);
/* glEnableIndexedEXT(GL_BLEND, ...) */
if (tmp_desc.IndependentBlendEnable)
FIXME("Per-rendertarget blend not implemented.\n");
wined3d_mutex_lock();
if ((entry = wine_rb_get(&device->blend_states, &tmp_desc)))
{
object = WINE_RB_ENTRY_VALUE(entry, struct d3d_blend_state, entry);
TRACE("Returning existing blend state %p.\n", object);
*blend_state = &object->ID3D11BlendState_iface;
ID3D11BlendState_AddRef(*blend_state);
wined3d_mutex_unlock();
return S_OK;
}
wined3d_mutex_unlock();
if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
return E_OUTOFMEMORY;
if (FAILED(hr = d3d_blend_state_init(object, device, &tmp_desc)))
{
WARN("Failed to initialize blend state, hr %#x.\n", hr);
HeapFree(GetProcessHeap(), 0, object);
if (FAILED(hr = d3d_blend_state_create(device, desc, &object)))
return hr;
}
TRACE("Created blend state %p.\n", object);
*blend_state = &object->ID3D11BlendState_iface;
return S_OK;
......@@ -5390,18 +5333,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState1(ID3D10Device1 *i
const D3D10_BLEND_DESC1 *desc, ID3D10BlendState1 **blend_state)
{
struct d3d_device *device = impl_from_ID3D10Device(iface);
ID3D11BlendState *d3d11_blend_state;
struct d3d_blend_state *object;
HRESULT hr;
TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state);
if (FAILED(hr = d3d11_device_CreateBlendState(&device->ID3D11Device_iface, (D3D11_BLEND_DESC *)desc,
&d3d11_blend_state)))
if (FAILED(hr = d3d_blend_state_create(device, (const D3D11_BLEND_DESC *)desc, &object)))
return hr;
hr = ID3D11BlendState_QueryInterface(d3d11_blend_state, &IID_ID3D10BlendState1, (void **)blend_state);
ID3D11BlendState_Release(d3d11_blend_state);
return hr;
*blend_state = &object->ID3D10BlendState1_iface;
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device1 *iface,
......
dlls/d3d11/state.c
View file @ 7448012e
......@@ -283,7 +283,7 @@ static const struct ID3D10BlendState1Vtbl d3d10_blend_state_vtbl =
d3d10_blend_state_GetDesc1,
};
HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device,
static HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device,
const D3D11_BLEND_DESC *desc)
{
state->ID3D11BlendState_iface.lpVtbl = &d3d11_blend_state_vtbl;
......@@ -308,6 +308,77 @@ HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *d
return S_OK;
}
HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC *desc,
struct d3d_blend_state **state)
{
struct d3d_blend_state *object;
struct wine_rb_entry *entry;
D3D11_BLEND_DESC tmp_desc;
unsigned int i, j;
HRESULT hr;
if (!desc)
return E_INVALIDARG;
/* D3D11_RENDER_TARGET_BLEND_DESC has a hole, which is a problem because we use
* D3D11_BLEND_DESC as a key in the rbtree. */
memset(&tmp_desc, 0, sizeof(tmp_desc));
tmp_desc.AlphaToCoverageEnable = desc->AlphaToCoverageEnable;
tmp_desc.IndependentBlendEnable = desc->IndependentBlendEnable;
for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i)
{
j = desc->IndependentBlendEnable ? i : 0;
tmp_desc.RenderTarget[i].BlendEnable = desc->RenderTarget[j].BlendEnable;
tmp_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[j].SrcBlend;
tmp_desc.RenderTarget[i].DestBlend = desc->RenderTarget[j].DestBlend;
tmp_desc.RenderTarget[i].BlendOp = desc->RenderTarget[j].BlendOp;
tmp_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[j].SrcBlendAlpha;
tmp_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[j].DestBlendAlpha;
tmp_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[j].BlendOpAlpha;
tmp_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTarget[j].RenderTargetWriteMask;
if (i > 3 && tmp_desc.RenderTarget[i].RenderTargetWriteMask != D3D11_COLOR_WRITE_ENABLE_ALL)
FIXME("Color mask %#x not supported for render target %u.\n",
tmp_desc.RenderTarget[i].RenderTargetWriteMask, i);
}
/* glSampleCoverage() */
if (tmp_desc.AlphaToCoverageEnable)
FIXME("Ignoring AlphaToCoverageEnable %#x.\n", tmp_desc.AlphaToCoverageEnable);
/* glEnableIndexedEXT(GL_BLEND, ...) */
if (tmp_desc.IndependentBlendEnable)
FIXME("Per-rendertarget blend not implemented.\n");
wined3d_mutex_lock();
if ((entry = wine_rb_get(&device->blend_states, &tmp_desc)))
{
object = WINE_RB_ENTRY_VALUE(entry, struct d3d_blend_state, entry);
TRACE("Returning existing blend state %p.\n", object);
ID3D11BlendState_AddRef(&object->ID3D11BlendState_iface);
*state = object;
wined3d_mutex_unlock();
return S_OK;
}
wined3d_mutex_unlock();
if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
return E_OUTOFMEMORY;
if (FAILED(hr = d3d_blend_state_init(object, device, &tmp_desc)))
{
WARN("Failed to initialize blend state, hr %#x.\n", hr);
HeapFree(GetProcessHeap(), 0, object);
return hr;
}
TRACE("Created blend state %p.\n", object);
*state = object;
return S_OK;
}
struct d3d_blend_state *unsafe_impl_from_ID3D11BlendState(ID3D11BlendState *iface)
{
if (!iface)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment