[PATCH 4/4] wined3d: Remove unused wined3d_surface argument from device_parent_surface_created().
Riccardo Bortolato
rikyz619 at gmail.com
Thu Feb 11 15:51:44 CST 2016
Signed-off-by: Riccardo Bortolato <rikyz619 at gmail.com>
---
dlls/d3d11/device.c | 6 +++---
dlls/d3d8/device.c | 6 +++---
dlls/d3d9/device.c | 6 +++---
dlls/ddraw/ddraw.c | 8 ++++----
dlls/ddraw/ddraw_private.h | 2 +-
dlls/ddraw/surface.c | 2 +-
dlls/wined3d/surface.c | 2 +-
include/wine/wined3d.h | 2 +-
8 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index b3e8775..ec8af37 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -4820,11 +4820,11 @@ static void CDECL device_parent_activate(struct wined3d_device_parent *device_pa
}
static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent,
- struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_surface *surface, 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, wined3d_texture %p, sub_resource_idx %u, surface %p, parent %p, parent_ops %p.\n",
- device_parent, wined3d_texture, sub_resource_idx, surface, parent, parent_ops);
+ TRACE("device_parent %p, wined3d_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 = &d3d_null_wined3d_parent_ops;
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 94cb7e7..8dc2514 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -2992,13 +2992,13 @@ static void CDECL device_parent_activate(struct wined3d_device_parent *device_pa
}
static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent,
- struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_surface *surface, void **parent,
+ struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, void **parent,
const struct wined3d_parent_ops **parent_ops)
{
struct d3d8_surface *d3d_surface;
- TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, surface %p, parent %p, parent_ops %p.\n",
- device_parent, wined3d_texture, sub_resource_idx, surface, parent, parent_ops);
+ TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n",
+ device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops);
if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface))))
return E_OUTOFMEMORY;
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 7f14cd0..a90b715 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -3634,13 +3634,13 @@ static void CDECL device_parent_activate(struct wined3d_device_parent *device_pa
}
static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent,
- struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_surface *surface, void **parent,
+ struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, void **parent,
const struct wined3d_parent_ops **parent_ops)
{
struct d3d9_surface *d3d_surface;
- TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, surface %p, parent %p, parent_ops %p.\n",
- device_parent, wined3d_texture, sub_resource_idx, surface, parent, parent_ops);
+ TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n",
+ device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops);
if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface))))
return E_OUTOFMEMORY;
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 5ffc951..782b6b5 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -4750,14 +4750,14 @@ void ddraw_update_lost_surfaces(struct ddraw *ddraw)
}
static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent,
- struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_surface *surface,
+ struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx,
void **parent, const struct wined3d_parent_ops **parent_ops)
{
struct ddraw *ddraw = ddraw_from_device_parent(device_parent);
struct ddraw_surface *ddraw_surface;
- TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, surface %p, parent %p, parent_ops %p.\n",
- device_parent, wined3d_texture, sub_resource_idx, surface, parent, parent_ops);
+ TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n",
+ device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops);
/* We have a swapchain or wined3d internal texture. */
if (!wined3d_texture_get_parent(wined3d_texture) || wined3d_texture_get_parent(wined3d_texture) == ddraw)
@@ -4774,7 +4774,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent
return DDERR_OUTOFVIDEOMEMORY;
}
- ddraw_surface_init(ddraw_surface, ddraw, wined3d_texture, sub_resource_idx, surface, parent_ops);
+ ddraw_surface_init(ddraw_surface, ddraw, wined3d_texture, sub_resource_idx, parent_ops);
*parent = ddraw_surface;
ddraw_update_lost_surfaces(ddraw);
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index e6d8f3a..2e7624b 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -213,7 +213,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
struct wined3d_rendertarget_view *ddraw_surface_get_rendertarget_view(struct ddraw_surface *surface) DECLSPEC_HIDDEN;
void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw,
struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx,
- struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN;
+ const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN;
ULONG ddraw_surface_release_iface(struct ddraw_surface *This) DECLSPEC_HIDDEN;
HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface,
const RECT *rect, BOOL read) DECLSPEC_HIDDEN;
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index adb47a6..6856d26 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -6253,7 +6253,7 @@ fail:
void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw,
struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx,
- struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops)
+ const struct wined3d_parent_ops **parent_ops)
{
struct ddraw_texture *texture = wined3d_texture_get_parent(wined3d_texture);
DDSURFACEDESC2 *desc = &surface->surface_desc;
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 0793d3a..e3a5c22 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -5227,7 +5227,7 @@ HRESULT wined3d_surface_create(struct wined3d_texture *container, const struct w
}
if (FAILED(hr = device_parent->ops->surface_created(device_parent,
- container, layer * container->level_count + level, object, &parent, &parent_ops)))
+ container, layer * container->level_count + level, &parent, &parent_ops)))
{
WARN("Failed to create surface parent, hr %#x.\n", hr);
wined3d_surface_destroy(object);
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index fbecb0b..928b644 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2037,7 +2037,7 @@ struct wined3d_device_parent_ops
void (__cdecl *activate)(struct wined3d_device_parent *device_parent, BOOL activate);
HRESULT (__cdecl *surface_created)(struct wined3d_device_parent *device_parent,
struct wined3d_texture *texture, unsigned int sub_resource_idx,
- struct wined3d_surface *surface, void **parent, const struct wined3d_parent_ops **parent_ops);
+ 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,
void **parent, const struct wined3d_parent_ops **parent_ops);
--
1.9.1
More information about the wine-patches
mailing list