d3d10core: Add a stub ID3D10Texture3D implementation.

dlls/d3d10core/d3d10core_private.h

@@ -94,6 +94,19 @@ struct d3d10_texture2d
 HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_device *device,
         const D3D10_TEXTURE2D_DESC *desc) DECLSPEC_HIDDEN;
 
+/* ID3D10Texture3D */
+struct d3d10_texture3d
+{
+    const struct ID3D10Texture3DVtbl *vtbl;
+    LONG refcount;
+
+    IWineD3DVolumeTexture *wined3d_texture;
+    D3D10_TEXTURE3D_DESC desc;
+};
+
+HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_device *device,
+        const D3D10_TEXTURE3D_DESC *desc) DECLSPEC_HIDDEN;
+
 /* ID3D10Buffer */
 struct d3d10_buffer
 {

dlls/d3d10core/device.c

@@ -688,9 +688,31 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device *ifac
 static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device *iface,
         const D3D10_TEXTURE3D_DESC *desc, const D3D10_SUBRESOURCE_DATA *data, ID3D10Texture3D **texture)
 {
-    FIXME("iface %p, desc %p, data %p, texture %p stub!\n", iface, desc, data, texture);
+    struct d3d10_device *device = (struct d3d10_device *)iface;
+    struct d3d10_texture3d *object;
+    HRESULT hr;
 
-    return E_NOTIMPL;
+    TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture);
+
+    object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
+    if (!object)
+    {
+        ERR("Failed to allocate D3D10 texture3d object memory.\n");
+        return E_OUTOFMEMORY;
+    }
+
+    hr = d3d10_texture3d_init(object, device, desc);
+    if (FAILED(hr))
+    {
+        WARN("Failed to initialize texture, hr %#x.\n", hr);
+        HeapFree(GetProcessHeap(), 0, object);
+        return hr;
+    }
+
+    TRACE("Created 3D texture %p.\n", object);
+    *texture = (ID3D10Texture3D *)object;
+
+    return S_OK;
 }
 
 static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Device *iface,

dlls/d3d10core/tests/device.c

@@ -95,7 +95,7 @@ static void test_device_interfaces(ID3D10Device *device)
     ok(SUCCEEDED(hr), "ID3D10Device does not implement ID3D10Device\n");
 }
 
-static void test_create_texture(ID3D10Device *device)
+static void test_create_texture2d(ID3D10Device *device)
 {
     D3D10_TEXTURE2D_DESC desc;
     ID3D10Texture2D *texture;
@@ -142,6 +142,41 @@ static void test_create_texture(ID3D10Device *device)
     ID3D10Texture2D_Release(texture);
 }
 
+static void test_create_texture3d(ID3D10Device *device)
+{
+    D3D10_TEXTURE3D_DESC desc;
+    ID3D10Texture3D *texture;
+    IDXGISurface *surface;
+    HRESULT hr;
+
+    desc.Width = 64;
+    desc.Height = 64;
+    desc.Depth = 64;
+    desc.MipLevels = 1;
+    desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+    desc.Usage = D3D10_USAGE_DEFAULT;
+    desc.BindFlags = D3D10_BIND_RENDER_TARGET;
+    desc.CPUAccessFlags = 0;
+    desc.MiscFlags = 0;
+
+    hr = ID3D10Device_CreateTexture3D(device, &desc, NULL, &texture);
+    ok(SUCCEEDED(hr), "Failed to create a 3d texture, hr %#x.\n", hr);
+
+    hr = ID3D10Texture3D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface);
+    ok(FAILED(hr), "Texture should not implement IDXGISurface.\n");
+    if (SUCCEEDED(hr)) IDXGISurface_Release(surface);
+    ID3D10Texture3D_Release(texture);
+
+    desc.MipLevels = 0;
+    hr = ID3D10Device_CreateTexture3D(device, &desc, NULL, &texture);
+    ok(SUCCEEDED(hr), "Failed to create a 3d texture, hr %#x.\n", hr);
+
+    hr = ID3D10Texture3D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface);
+    ok(FAILED(hr), "Texture should not implement IDXGISurface.\n");
+    if (SUCCEEDED(hr)) IDXGISurface_Release(surface);
+    ID3D10Texture3D_Release(texture);
+}
+
 static void test_create_rendertarget_view(ID3D10Device *device)
 {
     D3D10_RENDER_TARGET_VIEW_DESC rtv_desc;
@@ -214,7 +249,8 @@ START_TEST(device)
     }
 
     test_device_interfaces(device);
-    test_create_texture(device);
+    test_create_texture2d(device);
+    test_create_texture3d(device);
     test_create_rendertarget_view(device);
 
     refcount = ID3D10Device_Release(device);

dlls/d3d10core/texture.c

@@ -242,3 +242,178 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic
 
     return S_OK;
 }
+
+static HRESULT STDMETHODCALLTYPE d3d10_texture3d_QueryInterface(ID3D10Texture3D *iface, REFIID riid, void **object)
+{
+    TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
+
+    if (IsEqualGUID(riid, &IID_ID3D10Texture3D)
+            || 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_texture3d_AddRef(ID3D10Texture3D *iface)
+{
+    struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface;
+    ULONG refcount = InterlockedIncrement(&texture->refcount);
+
+    TRACE("%p increasing refcount to %u.\n", texture, refcount);
+
+    if (refcount == 1) IWineD3DVolumeTexture_AddRef(texture->wined3d_texture);
+
+    return refcount;
+}
+
+static void STDMETHODCALLTYPE d3d10_texture3d_wined3d_object_released(void *parent)
+{
+    HeapFree(GetProcessHeap(), 0, parent);
+}
+
+static ULONG STDMETHODCALLTYPE d3d10_texture3d_Release(ID3D10Texture3D *iface)
+{
+    struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface;
+    ULONG refcount = InterlockedDecrement(&texture->refcount);
+
+    TRACE("%p decreasing refcount to %u.\n", texture, refcount);
+
+    if (!refcount)
+    {
+        IWineD3DVolumeTexture_Release(texture->wined3d_texture);
+    }
+
+    return refcount;
+}
+
+static void STDMETHODCALLTYPE d3d10_texture3d_GetDevice(ID3D10Texture3D *iface, ID3D10Device **device)
+{
+    FIXME("iface %p, device %p stub!\n", iface, device);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d10_texture3d_GetPrivateData(ID3D10Texture3D *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_texture3d_SetPrivateData(ID3D10Texture3D *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_texture3d_SetPrivateDataInterface(ID3D10Texture3D *iface,
+        REFGUID guid, const IUnknown *data)
+{
+    FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data);
+
+    return E_NOTIMPL;
+}
+
+static void STDMETHODCALLTYPE d3d10_texture3d_GetType(ID3D10Texture3D *iface,
+        D3D10_RESOURCE_DIMENSION *resource_dimension)
+{
+    TRACE("iface %p, resource_dimension %p.\n", iface, resource_dimension);
+
+    *resource_dimension = D3D10_RESOURCE_DIMENSION_TEXTURE3D;
+}
+
+static void STDMETHODCALLTYPE d3d10_texture3d_SetEvictionPriority(ID3D10Texture3D *iface, UINT eviction_priority)
+{
+    FIXME("iface %p, eviction_priority %u stub!\n", iface, eviction_priority);
+}
+
+static UINT STDMETHODCALLTYPE d3d10_texture3d_GetEvictionPriority(ID3D10Texture3D *iface)
+{
+    FIXME("iface %p stub!\n", iface);
+
+    return 0;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UINT sub_resource,
+        D3D10_MAP map_type, UINT map_flags, D3D10_MAPPED_TEXTURE3D *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_texture3d_Unmap(ID3D10Texture3D *iface, UINT sub_resource)
+{
+    FIXME("iface %p, sub_resource %u stub!\n", iface, sub_resource);
+}
+
+static void STDMETHODCALLTYPE d3d10_texture3d_GetDesc(ID3D10Texture3D *iface, D3D10_TEXTURE3D_DESC *desc)
+{
+    struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface;
+
+    TRACE("iface %p, desc %p.\n", iface, desc);
+
+    *desc = texture->desc;
+}
+
+static const struct ID3D10Texture3DVtbl d3d10_texture3d_vtbl =
+{
+    /* IUnknown methods */
+    d3d10_texture3d_QueryInterface,
+    d3d10_texture3d_AddRef,
+    d3d10_texture3d_Release,
+    /* ID3D10DeviceChild methods */
+    d3d10_texture3d_GetDevice,
+    d3d10_texture3d_GetPrivateData,
+    d3d10_texture3d_SetPrivateData,
+    d3d10_texture3d_SetPrivateDataInterface,
+    /* ID3D10Resource methods */
+    d3d10_texture3d_GetType,
+    d3d10_texture3d_SetEvictionPriority,
+    d3d10_texture3d_GetEvictionPriority,
+    /* ID3D10Texture3D methods */
+    d3d10_texture3d_Map,
+    d3d10_texture3d_Unmap,
+    d3d10_texture3d_GetDesc,
+};
+
+static const struct wined3d_parent_ops d3d10_texture3d_wined3d_parent_ops =
+{
+    d3d10_texture3d_wined3d_object_released,
+};
+
+HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_device *device,
+        const D3D10_TEXTURE3D_DESC *desc)
+{
+    HRESULT hr;
+
+    texture->vtbl = &d3d10_texture3d_vtbl;
+    texture->refcount = 1;
+    texture->desc = *desc;
+
+    FIXME("Implement DXGI<->wined3d usage conversion.\n");
+
+    hr = IWineD3DDevice_CreateVolumeTexture(device->wined3d_device, desc->Width, desc->Height, desc->Depth,
+            desc->MipLevels, desc->Usage, wined3dformat_from_dxgi_format(desc->Format), WINED3DPOOL_DEFAULT,
+            texture, &d3d10_texture3d_wined3d_parent_ops, &texture->wined3d_texture);
+    if (FAILED(hr))
+    {
+        WARN("Failed to create wined3d texture, hr %#x.\n", hr);
+        return hr;
+    }
+
+    return S_OK;
+}