Henri Verbeet : wined3d: Get rid of the surface parameter to wined3d_device_parent_ops.surface_created ().
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Feb 12 09:47:45 CST 2016
Module: wine
Branch: master
Commit: 3b5eca269d409ba3ce895d0e5c03f05ab1b6a557
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5eca269d409ba3ce895d0e5c03f05ab1b6a557
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Feb 12 11:06:08 2016 +0100
wined3d: Get rid of the surface parameter to wined3d_device_parent_ops.surface_created().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d11/device.c | 21 ++++-----------------
dlls/d3d8/device.c | 8 ++++----
dlls/d3d9/device.c | 8 ++++----
dlls/ddraw/ddraw.c | 6 +++---
dlls/wined3d/surface.c | 2 +-
include/wine/wined3d.h | 3 +--
6 files changed, 17 insertions(+), 31 deletions(-)
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index b3e8775..8b7d2f8 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -4819,24 +4819,11 @@ static void CDECL device_parent_activate(struct wined3d_device_parent *device_pa
TRACE("device_parent %p, activate %#x.\n", device_parent, activate);
}
-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,
- 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);
-
- *parent = NULL;
- *parent_ops = &d3d_null_wined3d_parent_ops;
-
- return S_OK;
-}
-
-static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent,
+static HRESULT CDECL device_parent_sub_resource_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)
{
- TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n",
+ 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;
@@ -4920,8 +4907,8 @@ static const struct wined3d_device_parent_ops d3d_wined3d_device_parent_ops =
device_parent_wined3d_device_created,
device_parent_mode_changed,
device_parent_activate,
- device_parent_surface_created,
- device_parent_volume_created,
+ device_parent_sub_resource_created,
+ device_parent_sub_resource_created,
device_parent_create_swapchain_texture,
device_parent_create_swapchain,
};
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 94cb7e7..9154ccb 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,
- 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 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..382b971 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,
- 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_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 c5bb31c..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)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 7cb16ed..459cbdc 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..d5cae29 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2020,7 +2020,6 @@ struct wined3d_sampler;
struct wined3d_shader;
struct wined3d_shader_resource_view;
struct wined3d_stateblock;
-struct wined3d_surface;
struct wined3d_swapchain;
struct wined3d_texture;
struct wined3d_vertex_declaration;
@@ -2037,7 +2036,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);
More information about the wine-cvs
mailing list