Riccardo Bortolato : wined3d: Don' t pass a wined3d_volume to device_volume_created callback anymore.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 33bb9e96109cda4709a55603f1244d011e3c2b90
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=33bb9e96109cda4709a55603f1...

Author: Riccardo Bortolato 
Date:   Wed Oct  7 19:04:34 2015 +0200

wined3d: Don't pass a wined3d_volume to device_volume_created callback anymore.

Signed-off-by: Riccardo Bortolato 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/d3d11/device.c    | 6 +++---
 dlls/d3d8/device.c     | 6 +++---
 dlls/d3d9/device.c     | 8 ++++----
 dlls/ddraw/ddraw.c     | 6 +++---
 dlls/wined3d/volume.c  | 2 +-
 include/wine/wined3d.h | 3 +--
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index 5384387..4939883 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -2966,11 +2966,11 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent
 }

static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent,
-        struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_volume *volume, void **parent,
+        struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, void **parent,
         const struct wined3d_parent_ops **parent_ops)
 {
-    TRACE("device_parent %p, texture %p, sub_resource_idx %u, volume %p, parent %p, parent_ops %p.\n",
-            device_parent, wined3d_texture, sub_resource_idx, volume, parent, parent_ops);
+    TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n",
+            device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops);

*parent = NULL;
     *parent_ops = &d3d10_null_wined3d_parent_ops;
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 818f601..e9583fc 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -3019,12 +3019,12 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent

static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent,
         struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx,
-        struct wined3d_volume *volume, void **parent, const struct wined3d_parent_ops **parent_ops)
+        void **parent, const struct wined3d_parent_ops **parent_ops)
 {
     struct d3d8_volume *d3d_volume;

-    TRACE("device_parent %p, texture %p, sub_resource_idx %u, volume %p, parent %p, parent_ops %p.\n",
-            device_parent, wined3d_texture, sub_resource_idx, volume, parent, parent_ops);
+    TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n",
+            device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops);

if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume))))
         return E_OUTOFMEMORY;
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 35abb13..656bf4b 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -3553,13 +3553,13 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent
 }

static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent,
-        struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_volume *volume, void **parent,
-        const struct wined3d_parent_ops **parent_ops)
+        struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx,
+        void **parent, const struct wined3d_parent_ops **parent_ops)
 {
     struct d3d9_volume *d3d_volume;

-    TRACE("device_parent %p, texture %p, sub_resource_idx %u, volume %p, parent %p, parent_ops %p.\n",
-            device_parent, wined3d_texture, sub_resource_idx, volume, parent, parent_ops);
+    TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n",
+            device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops);

if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume))))
         return E_OUTOFMEMORY;
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index aef9963..21f8038 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -4746,11 +4746,11 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent
 }

static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent,
-        struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_volume *volume,
+        struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx,
         void **parent, const struct wined3d_parent_ops **parent_ops)
 {
-    TRACE("device_parent %p, texture %p, sub_resource_idx %u, volume %p, parent %p, parent_ops %p.\n",
-            device_parent, wined3d_texture, sub_resource_idx, volume, parent, parent_ops);
+    TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n",
+            device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops);

*parent = NULL;
     *parent_ops = &ddraw_null_wined3d_parent_ops;
diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index ef5a999..6a7cc5c 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -784,7 +784,7 @@ HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wi
     }

if (FAILED(hr = device_parent->ops->volume_created(device_parent,
-            container, level, object, &parent, &parent_ops)))
+            container, level, &parent, &parent_ops)))
     {
         WARN("Failed to create volume parent, hr %#x.\n", hr);
         wined3d_volume_destroy(object);
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index a354308..4579e02 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2018,7 +2018,6 @@ struct wined3d_surface;
 struct wined3d_swapchain;
 struct wined3d_texture;
 struct wined3d_vertex_declaration;
-struct wined3d_volume;

struct wined3d_device_parent
 {
@@ -2034,7 +2033,7 @@ struct wined3d_device_parent_ops
             struct wined3d_surface *surface, void **parent, const struct wined3d_parent_ops **parent_ops);
     HRESULT (__cdecl *volume_created)(struct wined3d_device_parent *device_parent,
             struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx,
-            struct wined3d_volume *volume, void **parent, const struct wined3d_parent_ops **parent_ops);
+            void **parent, const struct wined3d_parent_ops **parent_ops);
     HRESULT (__cdecl *create_swapchain_texture)(struct wined3d_device_parent *device_parent, void *parent,
             const struct wined3d_resource_desc *desc, struct wined3d_texture **texture);
     HRESULT (__cdecl *create_swapchain)(struct wined3d_device_parent *device_parent,