Module: wine Branch: master Commit: 4b341c252cdf3929c956f21e447639e1d5ab94d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b341c252cdf3929c956f21e44...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Fri Oct 30 20:11:35 2009 +0100
d3d10core: Add a stub ID3D10RasterizerState implementation.
---
dlls/d3d10core/d3d10core_private.h | 9 +++ dlls/d3d10core/device.c | 25 ++++++++- dlls/d3d10core/state.c | 111 ++++++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index fd62766..3ee143c 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -198,6 +198,15 @@ struct d3d10_depthstencil_state
HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state) DECLSPEC_HIDDEN;
+/* ID3D10RasterizerState */ +struct d3d10_rasterizer_state +{ + const struct ID3D10RasterizerStateVtbl *vtbl; + LONG refcount; +}; + +HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) DECLSPEC_HIDDEN; + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 51c9603..2537d1f 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -956,9 +956,30 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device *iface, const D3D10_RASTERIZER_DESC *desc, ID3D10RasterizerState **rasterizer_state) { - FIXME("iface %p, desc %p, rasterizer_state %p stub!\n", iface, desc, rasterizer_state); + struct d3d10_rasterizer_state *object; + HRESULT hr;
- return E_NOTIMPL; + TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 rasterizer state object memory.\n"); + return E_OUTOFMEMORY; + } + + hr = d3d10_rasterizer_state_init(object); + if (FAILED(hr)) + { + WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created rasterizer state %p.\n", object); + *rasterizer_state = (ID3D10RasterizerState *)object; + + return S_OK; }
static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *iface, diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index af712c3..6c35f4b 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -134,3 +134,114 @@ HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state)
return S_OK; } + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_QueryInterface(ID3D10RasterizerState *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10RasterizerState) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerState *iface) +{ + struct d3d10_rasterizer_state *This = (struct d3d10_rasterizer_state *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u.\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerState *iface) +{ + struct d3d10_rasterizer_state *This = (struct d3d10_rasterizer_state *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u.\n", This, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* ID3D10DeviceChild methods */ + +static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDevice(ID3D10RasterizerState *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_GetPrivateData(ID3D10RasterizerState *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateData(ID3D10RasterizerState *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateDataInterface(ID3D10RasterizerState *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +/* ID3D10RasterizerState methods */ + +static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDesc(ID3D10RasterizerState *iface, + D3D10_RASTERIZER_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = +{ + /* IUnknown methods */ + d3d10_rasterizer_state_QueryInterface, + d3d10_rasterizer_state_AddRef, + d3d10_rasterizer_state_Release, + /* ID3D10DeviceChild methods */ + d3d10_rasterizer_state_GetDevice, + d3d10_rasterizer_state_GetPrivateData, + d3d10_rasterizer_state_SetPrivateData, + d3d10_rasterizer_state_SetPrivateDataInterface, + /* ID3D10RasterizerState methods */ + d3d10_rasterizer_state_GetDesc, +}; + +HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) +{ + state->vtbl = &d3d10_rasterizer_state_vtbl; + state->refcount = 1; + + return S_OK; +}
-
Alexandre Julliard