From 6d2d5318c474f97f9ecaec3b059b62cb9afd86e8 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Fri, 23 Jan 2009 10:22:34 +0100 Subject: [PATCH] d3d10core: Add a stub ID3D10Buffer implementation. --- dlls/d3d10core/Makefile.in | 1 + dlls/d3d10core/buffer.c | 164 +++++++++++++++++++++++++++++ dlls/d3d10core/d3d10core_private.h | 8 ++ dlls/d3d10core/device.c | 20 +++- 4 files changed, 191 insertions(+), 2 deletions(-) create mode 100644 dlls/d3d10core/buffer.c diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index 65211504b4..80f0def5d0 100644 --- a/dlls/d3d10core/Makefile.in +++ b/dlls/d3d10core/Makefile.in @@ -7,6 +7,7 @@ IMPORTLIB = d3d10core IMPORTS = dxguid uuid dxgi kernel32 C_SRCS = \ + buffer.c \ d3d10core_main.c \ device.c \ texture2d.c \ diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c new file mode 100644 index 0000000000..b6d60af720 --- /dev/null +++ b/dlls/d3d10core/buffer.c @@ -0,0 +1,164 @@ +/* + * 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_buffer_QueryInterface(ID3D10Buffer *iface, REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10Buffer) + || IsEqualGUID(riid, &IID_ID3D10Resource) + || 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_buffer_AddRef(ID3D10Buffer *iface) +{ + struct d3d10_buffer *This = (struct d3d10_buffer *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_buffer_Release(ID3D10Buffer *iface) +{ + struct d3d10_buffer *This = (struct d3d10_buffer *)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_buffer_GetDevice(ID3D10Buffer *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_buffer_GetPrivateData(ID3D10Buffer *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_buffer_SetPrivateData(ID3D10Buffer *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_buffer_SetPrivateDataInterface(ID3D10Buffer *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +/* ID3D10Resource methods */ + +static void STDMETHODCALLTYPE d3d10_buffer_GetType(ID3D10Buffer *iface, D3D10_RESOURCE_DIMENSION *resource_dimension) +{ + FIXME("iface %p, resource_dimension %p stub!\n", iface, resource_dimension); +} + +static void STDMETHODCALLTYPE d3d10_buffer_SetEvictionPriority(ID3D10Buffer *iface, UINT eviction_priority) +{ + FIXME("iface %p, eviction_priority %u stub!\n", iface, eviction_priority); +} + +static UINT STDMETHODCALLTYPE d3d10_buffer_GetEvictionPriority(ID3D10Buffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +/* ID3D10Buffer methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP map_type, UINT map_flags, void **data) +{ + FIXME("iface %p, map_type %u, map_flags %#x, data %p stub!\n", iface, map_type, map_flags, data); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d3d10_buffer_Unmap(ID3D10Buffer *iface) +{ + FIXME("iface %p stub!\n", iface); +} + +static void STDMETHODCALLTYPE d3d10_buffer_GetDesc(ID3D10Buffer *iface, D3D10_BUFFER_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +const struct ID3D10BufferVtbl d3d10_buffer_vtbl = +{ + /* IUnknown methods */ + d3d10_buffer_QueryInterface, + d3d10_buffer_AddRef, + d3d10_buffer_Release, + /* ID3D10DeviceChild methods */ + d3d10_buffer_GetDevice, + d3d10_buffer_GetPrivateData, + d3d10_buffer_SetPrivateData, + d3d10_buffer_SetPrivateDataInterface, + /* ID3D10Resource methods */ + d3d10_buffer_GetType, + d3d10_buffer_SetEvictionPriority, + d3d10_buffer_GetEvictionPriority, + /* ID3D10Buffer methods */ + d3d10_buffer_Map, + d3d10_buffer_Unmap, + d3d10_buffer_GetDesc, +}; diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index ab79a80fb5..b9e3a496c7 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -62,6 +62,14 @@ struct d3d10_texture2d IWineD3DSurface *wined3d_surface; }; +/* ID3D10Buffer */ +extern const struct ID3D10BufferVtbl d3d10_buffer_vtbl; +struct d3d10_buffer +{ + const struct ID3D10BufferVtbl *vtbl; + LONG refcount; +}; + /* ID3D10RenderTargetView */ extern const struct ID3D10RenderTargetViewVtbl d3d10_rendertarget_view_vtbl; struct d3d10_rendertarget_view diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 5268ac4828..71291cff48 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -558,9 +558,25 @@ static void STDMETHODCALLTYPE d3d10_device_Flush(ID3D10Device *iface) static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device *iface, const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data, ID3D10Buffer **buffer) { - FIXME("iface %p, desc %p, data %p, buffer %p stub!\n", iface, desc, data, buffer); + struct d3d10_buffer *object; - return E_NOTIMPL; + FIXME("iface %p, desc %p, data %p, buffer %p partial stub!\n", iface, desc, data, buffer); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 buffer object memory\n"); + return E_OUTOFMEMORY; + } + + object->vtbl = &d3d10_buffer_vtbl; + object->refcount = 1; + + *buffer = (ID3D10Buffer *)object; + + TRACE("Created ID3D10Buffer %p\n", object); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture1D(ID3D10Device *iface,