From 03fae2179fd724555c40ef0ec35b4ae063fe7ac1 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Wed, 4 Mar 2009 07:07:38 +0100 Subject: [PATCH] d3d10core: Add a stub ID3D10InputLayout implementation. --- dlls/d3d10core/Makefile.in | 1 + dlls/d3d10core/d3d10core_private.h | 8 ++ dlls/d3d10core/device.c | 16 +++- dlls/d3d10core/inputlayout.c | 118 +++++++++++++++++++++++++++++ 4 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 dlls/d3d10core/inputlayout.c diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index 80f0def5d03..7c96d299a0f 100644 --- a/dlls/d3d10core/Makefile.in +++ b/dlls/d3d10core/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ buffer.c \ d3d10core_main.c \ device.c \ + inputlayout.c \ texture2d.c \ utils.c \ view.c diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index a05f773edf3..c5e919d6447 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -89,6 +89,14 @@ struct d3d10_rendertarget_view D3D10_RENDER_TARGET_VIEW_DESC desc; }; +/* ID3D10InputLayout */ +extern const struct ID3D10InputLayoutVtbl d3d10_input_layout_vtbl; +struct d3d10_input_layout +{ + const struct ID3D10InputLayoutVtbl *vtbl; + LONG refcount; +}; + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 4f0fb31070d..1d18c3f9c72 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -894,12 +894,26 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device *if const D3D10_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, ID3D10InputLayout **input_layout) { + struct d3d10_input_layout *object; + FIXME("iface %p, element_descs %p, element_count %u, shader_byte_code %p," "\tshader_byte_code_length %lu, input_layout %p stub!\n", iface, element_descs, element_count, shader_byte_code, shader_byte_code_length, input_layout); - return E_NOTIMPL; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 input layout object memory\n"); + return E_OUTOFMEMORY; + } + + object->vtbl = &d3d10_input_layout_vtbl; + object->refcount = 1; + + *input_layout = (ID3D10InputLayout *)object; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *iface, diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c new file mode 100644 index 00000000000..034a642d199 --- /dev/null +++ b/dlls/d3d10core/inputlayout.c @@ -0,0 +1,118 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "d3d10core_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_input_layout_QueryInterface(ID3D10InputLayout *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10InputLayout) + || 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_input_layout_AddRef(ID3D10InputLayout *iface) +{ + struct d3d10_input_layout *This = (struct d3d10_input_layout *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_input_layout_Release(ID3D10InputLayout *iface) +{ + struct d3d10_input_layout *This = (struct d3d10_input_layout *)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_input_layout_GetDevice(ID3D10InputLayout *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_input_layout_GetPrivateData(ID3D10InputLayout *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_input_layout_SetPrivateData(ID3D10InputLayout *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_input_layout_SetPrivateDataInterface(ID3D10InputLayout *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +const struct ID3D10InputLayoutVtbl d3d10_input_layout_vtbl = +{ + /* IUnknown methods */ + d3d10_input_layout_QueryInterface, + d3d10_input_layout_AddRef, + d3d10_input_layout_Release, + /* ID3D10DeviceChild methods */ + d3d10_input_layout_GetDevice, + d3d10_input_layout_GetPrivateData, + d3d10_input_layout_SetPrivateData, + d3d10_input_layout_SetPrivateDataInterface, +};