Module: wine Branch: master Commit: 6d6d8eb1d8b4d57dc9de0c4ff3f95622e8939de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6d8eb1d8b4d57dc9de0c4ff3...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Fri Oct 30 20:11:36 2009 +0100
d3d10core: Add a stub ID3D10SamplerState 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 3ee143c..e68754f 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -207,6 +207,15 @@ struct d3d10_rasterizer_state
HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) DECLSPEC_HIDDEN;
+/* ID3D10SamplerState */ +struct d3d10_sampler_state +{ + const struct ID3D10SamplerStateVtbl *vtbl; + LONG refcount; +}; + +HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state) DECLSPEC_HIDDEN; + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 2537d1f..de623bc 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -985,9 +985,30 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *iface, const D3D10_SAMPLER_DESC *desc, ID3D10SamplerState **sampler_state) { - FIXME("iface %p, desc %p, sampler_state %p stub!\n", iface, desc, sampler_state); + struct d3d10_sampler_state *object; + HRESULT hr;
- return E_NOTIMPL; + FIXME("iface %p, desc %p, sampler_state %p.\n", iface, desc, sampler_state); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 sampler state object memory.\n"); + return E_OUTOFMEMORY; + } + + hr = d3d10_sampler_state_init(object); + if (FAILED(hr)) + { + WARN("Failed to initialize sampler state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created sampler state %p.\n", object); + *sampler_state = (ID3D10SamplerState *)object; + + return S_OK; }
static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device *iface, diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 6c35f4b..e0468c3 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -245,3 +245,114 @@ HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state)
return S_OK; } + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_QueryInterface(ID3D10SamplerState *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10SamplerState) + || 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_sampler_state_AddRef(ID3D10SamplerState *iface) +{ + struct d3d10_sampler_state *This = (struct d3d10_sampler_state *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u.\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_sampler_state_Release(ID3D10SamplerState *iface) +{ + struct d3d10_sampler_state *This = (struct d3d10_sampler_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_sampler_state_GetDevice(ID3D10SamplerState *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_GetPrivateData(ID3D10SamplerState *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_sampler_state_SetPrivateData(ID3D10SamplerState *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_sampler_state_SetPrivateDataInterface(ID3D10SamplerState *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +/* ID3D10SamplerState methods */ + +static void STDMETHODCALLTYPE d3d10_sampler_state_GetDesc(ID3D10SamplerState *iface, + D3D10_SAMPLER_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D10SamplerStateVtbl d3d10_sampler_state_vtbl = +{ + /* IUnknown methods */ + d3d10_sampler_state_QueryInterface, + d3d10_sampler_state_AddRef, + d3d10_sampler_state_Release, + /* ID3D10DeviceChild methods */ + d3d10_sampler_state_GetDevice, + d3d10_sampler_state_GetPrivateData, + d3d10_sampler_state_SetPrivateData, + d3d10_sampler_state_SetPrivateDataInterface, + /* ID3D10SamplerState methods */ + d3d10_sampler_state_GetDesc, +}; + +HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state) +{ + state->vtbl = &d3d10_sampler_state_vtbl; + state->refcount = 1; + + return S_OK; +}
-
Alexandre Julliard