From abf6b7422d7604f3a2f1d1736b5d57bf9568b2b1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B3zef=20Kucia?= Date: Thu, 8 Oct 2015 02:55:54 +0200 Subject: [PATCH] d3d11: Implement ID3D11BlendState interface. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Józef Kucia Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/d3d11/d3d11_private.h | 5 +- dlls/d3d11/state.c | 148 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 131 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b2de1a79cfc..3ee06068ecf 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -275,16 +275,17 @@ struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *i HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; -/* ID3D10BlendState */ +/* ID3D11BlendState, ID3D10BlendState */ struct d3d_blend_state { + ID3D11BlendState ID3D11BlendState_iface; ID3D10BlendState ID3D10BlendState_iface; LONG refcount; struct wined3d_private_store private_store; D3D10_BLEND_DESC desc; struct wine_rb_entry entry; - ID3D10Device1 *device; + ID3D11Device *device; }; HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 2130399c4a4..cdc6ebe2566 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -30,56 +30,66 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); #define D3D10_FILTER_ANISO_MASK 0x40 #define D3D10_FILTER_COMPARE_MASK 0x80 -static inline struct d3d_blend_state *impl_from_ID3D10BlendState(ID3D10BlendState *iface) +/* ID3D11BlendState methods */ + +static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendState *iface) { - return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D10BlendState_iface); + return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D11BlendState_iface); } -/* IUnknown methods */ - -static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_QueryInterface(ID3D11BlendState *iface, REFIID riid, void **object) { + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - if (IsEqualGUID(riid, &IID_ID3D10BlendState) - || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + if (IsEqualGUID(riid, &IID_ID3D11BlendState) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + ID3D11BlendState_AddRef(iface); *object = iface; return S_OK; } + if (IsEqualGUID(riid, &IID_ID3D10BlendState) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild)) + { + ID3D10BlendState_AddRef(&state->ID3D10BlendState_iface); + *object = &state->ID3D10BlendState_iface; + return S_OK; + } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); *object = NULL; return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) +static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState *iface) { - struct d3d_blend_state *This = impl_from_ID3D10BlendState(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + ULONG refcount = InterlockedIncrement(&state->refcount); - TRACE("%p increasing refcount to %u.\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", state, refcount); return refcount; } -static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface) +static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface) { - struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); ULONG refcount = InterlockedDecrement(&state->refcount); TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - struct d3d_device *device = impl_from_ID3D10Device(state->device); + struct d3d_device *device = impl_from_ID3D11Device(state->device); wined3d_mutex_lock(); wine_rb_remove(&device->blend_states, &state->desc); - ID3D10Device1_Release(state->device); + ID3D11Device_Release(state->device); wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); HeapFree(GetProcessHeap(), 0, state); @@ -88,6 +98,104 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface return refcount; } +static void STDMETHODCALLTYPE d3d11_blend_state_GetDevice(ID3D11BlendState *iface, + ID3D11Device **device) +{ + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = state->device; + ID3D11Device_AddRef(*device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_GetPrivateData(ID3D11BlendState *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&state->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateData(ID3D11BlendState *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&state->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateDataInterface(ID3D11BlendState *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&state->private_store, guid, data); +} + +static void STDMETHODCALLTYPE d3d11_blend_state_GetDesc(ID3D11BlendState *iface, D3D11_BLEND_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D11BlendStateVtbl d3d11_blend_state_vtbl = +{ + /* IUnknown methods */ + d3d11_blend_state_QueryInterface, + d3d11_blend_state_AddRef, + d3d11_blend_state_Release, + /* ID3D11DeviceChild methods */ + d3d11_blend_state_GetDevice, + d3d11_blend_state_GetPrivateData, + d3d11_blend_state_SetPrivateData, + d3d11_blend_state_SetPrivateDataInterface, + /* ID3D11BlendState methods */ + d3d11_blend_state_GetDesc, +}; + +/* ID3D10BlendState methods */ + +static inline struct d3d_blend_state *impl_from_ID3D10BlendState(ID3D10BlendState *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D10BlendState_iface); +} + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendState *iface, + REFIID riid, void **object) +{ + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); + + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + return d3d11_blend_state_QueryInterface(&state->ID3D11BlendState_iface, riid, object); +} + +static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) +{ + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_blend_state_AddRef(&state->ID3D11BlendState_iface); +} + +static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface) +{ + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_blend_state_Release(&state->ID3D11BlendState_iface); +} + /* ID3D10DeviceChild methods */ static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState *iface, ID3D10Device **device) @@ -96,8 +204,7 @@ static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState *ifac TRACE("iface %p, device %p.\n", iface, device); - *device = (ID3D10Device *)state->device; - ID3D10Device_AddRef(*device); + ID3D11Device_QueryInterface(state->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendState *iface, @@ -162,6 +269,7 @@ static const struct ID3D10BlendStateVtbl d3d10_blend_state_vtbl = HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, const D3D10_BLEND_DESC *desc) { + state->ID3D11BlendState_iface.lpVtbl = &d3d11_blend_state_vtbl; state->ID3D10BlendState_iface.lpVtbl = &d3d10_blend_state_vtbl; state->refcount = 1; wined3d_mutex_lock(); @@ -177,8 +285,8 @@ HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *d } wined3d_mutex_unlock(); - state->device = &device->ID3D10Device1_iface; - ID3D10Device1_AddRef(state->device); + state->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(state->device); return S_OK; } -- 2.11.4.GIT