Module: wine Branch: master Commit: e398a779f7bda8d652fa4a4bbf42db68a4ce4947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e398a779f7bda8d652fa4a4bbf...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu Jan 15 09:58:44 2009 +0100
d3d10core: Add a stub ID3D10Texture2D implementation.
---
dlls/d3d10core/Makefile.in | 1 + dlls/d3d10core/d3d10core_private.h | 8 ++ dlls/d3d10core/device.c | 19 ++++- dlls/d3d10core/texture2d.c | 162 ++++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index c45ff3c..fe3ead6 100644 --- a/dlls/d3d10core/Makefile.in +++ b/dlls/d3d10core/Makefile.in @@ -9,6 +9,7 @@ IMPORTS = dxguid uuid dxgi kernel32 C_SRCS = \ d3d10core_main.c \ device.c \ + texture2d.c \ utils.c
RC_SRCS = version.rc diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 16bb323..965ebf9 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -43,6 +43,14 @@ struct d3d10_device LONG refcount; };
+/* ID3D10Texture2D */ +extern const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl; +struct d3d10_texture2d +{ + const struct ID3D10Texture2DVtbl *vtbl; + LONG refcount; +}; + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 567c93a..437219a 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -567,9 +567,24 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture1D(ID3D10Device *ifac static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device *iface, const D3D10_TEXTURE2D_DESC *desc, const D3D10_SUBRESOURCE_DATA *data, ID3D10Texture2D **texture) { - FIXME("iface %p, desc %p, data %p, texture %p stub!\n", iface, desc, data, texture); + struct d3d10_texture2d *object;
- return E_NOTIMPL; + FIXME("iface %p, desc %p, data %p, texture %p partial stub!\n", iface, desc, data, texture); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 texture2d object memory\n"); + return E_OUTOFMEMORY; + } + + object->vtbl = &d3d10_texture2d_vtbl; + object->refcount = 1; + *texture = (ID3D10Texture2D *)object; + + TRACE("Created ID3D10Texture2D %p\n", object); + + return S_OK; }
static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device *iface, diff --git a/dlls/d3d10core/texture2d.c b/dlls/d3d10core/texture2d.c new file mode 100644 index 0000000..9b57c61 --- /dev/null +++ b/dlls/d3d10core/texture2d.c @@ -0,0 +1,162 @@ +/* + * 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_texture2d_QueryInterface(ID3D10Texture2D *iface, REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10Texture2D) + || 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_texture2d_AddRef(ID3D10Texture2D *iface) +{ + struct d3d10_texture2d *This = (struct d3d10_texture2d *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_texture2d_Release(ID3D10Texture2D *iface) +{ + struct d3d10_texture2d *This = (struct d3d10_texture2d *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u\n", This, refcount); + + return refcount; +} + +/* ID3D10DeviceChild methods */ + +static void STDMETHODCALLTYPE d3d10_texture2d_GetDevice(ID3D10Texture2D *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_texture2d_GetPrivateData(ID3D10Texture2D *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_texture2d_SetPrivateData(ID3D10Texture2D *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_texture2d_SetPrivateDataInterface(ID3D10Texture2D *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_texture2d_GetType(ID3D10Texture2D *iface, + D3D10_RESOURCE_DIMENSION *resource_dimension) +{ + FIXME("iface %p, resource_dimension %p stub!\n", iface, resource_dimension); +} + +static void STDMETHODCALLTYPE d3d10_texture2d_SetEvictionPriority(ID3D10Texture2D *iface, UINT eviction_priority) +{ + FIXME("iface %p, eviction_priority %u stub!\n", iface, eviction_priority); +} + +static UINT STDMETHODCALLTYPE d3d10_texture2d_GetEvictionPriority(ID3D10Texture2D *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +/* ID3D10Texture2D methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_texture2d_Map(ID3D10Texture2D *iface, UINT sub_resource, + D3D10_MAP map_type, UINT map_flags, D3D10_MAPPED_TEXTURE2D *mapped_texture) +{ + FIXME("iface %p, sub_resource %u, map_type %u, map_flags %#x, mapped_texture %p stub!\n", + iface, sub_resource, map_type, map_flags, mapped_texture); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d3d10_texture2d_Unmap(ID3D10Texture2D *iface, UINT sub_resource) +{ + FIXME("iface %p, sub_resource %u stub!\n", iface, sub_resource); +} + +static void STDMETHODCALLTYPE d3d10_texture2d_GetDesc(ID3D10Texture2D *iface, D3D10_TEXTURE2D_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl = +{ + /* IUnknown methods */ + d3d10_texture2d_QueryInterface, + d3d10_texture2d_AddRef, + d3d10_texture2d_Release, + /* ID3D10DeviceChild methods */ + d3d10_texture2d_GetDevice, + d3d10_texture2d_GetPrivateData, + d3d10_texture2d_SetPrivateData, + d3d10_texture2d_SetPrivateDataInterface, + /* ID3D10Resource methods */ + d3d10_texture2d_GetType, + d3d10_texture2d_SetEvictionPriority, + d3d10_texture2d_GetEvictionPriority, + /* ID3D10Texture2D methods */ + d3d10_texture2d_Map, + d3d10_texture2d_Unmap, + d3d10_texture2d_GetDesc, +};