[PATCH 3/5] d3d11: Rename d3d10_null_wined3d_parent_ops to d3d_null_wined3d_parent_ops.
Józef Kucia
jkucia at codeweavers.com
Thu Oct 8 20:19:12 CDT 2015
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/d3d11/d3d11_private.h | 2 +-
dlls/d3d11/device.c | 10 +++++-----
dlls/d3d11/view.c | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
index 64568ce..2725a7c 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -54,7 +54,7 @@ struct d3d_shader_info
struct wined3d_shader_signature *output_signature;
};
-extern const struct wined3d_parent_ops d3d10_null_wined3d_parent_ops DECLSPEC_HIDDEN;
+extern const struct wined3d_parent_ops d3d_null_wined3d_parent_ops DECLSPEC_HIDDEN;
/* TRACE helper functions */
const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology) DECLSPEC_HIDDEN;
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index 8a3a2e8..0e06eeb 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -25,11 +25,11 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d11);
-static void STDMETHODCALLTYPE d3d10_null_wined3d_object_destroyed(void *parent) {}
+static void STDMETHODCALLTYPE d3d_null_wined3d_object_destroyed(void *parent) {}
-const struct wined3d_parent_ops d3d10_null_wined3d_parent_ops =
+const struct wined3d_parent_ops d3d_null_wined3d_parent_ops =
{
- d3d10_null_wined3d_object_destroyed,
+ d3d_null_wined3d_object_destroyed,
};
/* ID3D11Device methods */
@@ -3018,7 +3018,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent
device_parent, container_parent, surface, parent, parent_ops);
*parent = NULL;
- *parent_ops = &d3d10_null_wined3d_parent_ops;
+ *parent_ops = &d3d_null_wined3d_parent_ops;
return S_OK;
}
@@ -3031,7 +3031,7 @@ static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *
device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops);
*parent = NULL;
- *parent_ops = &d3d10_null_wined3d_parent_ops;
+ *parent_ops = &d3d_null_wined3d_parent_ops;
return S_OK;
}
diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c
index 4b39cc8..ce33749 100644
--- a/dlls/d3d11/view.c
+++ b/dlls/d3d11/view.c
@@ -718,7 +718,7 @@ static HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, st
wined3d_depth_stencil_view_desc_from_d3d11(&wined3d_desc, &view->desc);
if (FAILED(hr = wined3d_rendertarget_view_create(&wined3d_desc, wined3d_resource,
- view, &d3d10_null_wined3d_parent_ops, &view->wined3d_view)))
+ view, &d3d_null_wined3d_parent_ops, &view->wined3d_view)))
{
wined3d_mutex_unlock();
WARN("Failed to create a wined3d rendertarget view, hr %#x.\n", hr);
@@ -1130,7 +1130,7 @@ static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, st
wined3d_rendertarget_view_desc_from_d3d11(&wined3d_desc, &view->desc);
if (FAILED(hr = wined3d_rendertarget_view_create(&wined3d_desc, wined3d_resource,
- view, &d3d10_null_wined3d_parent_ops, &view->wined3d_view)))
+ view, &d3d_null_wined3d_parent_ops, &view->wined3d_view)))
{
wined3d_mutex_unlock();
WARN("Failed to create a wined3d rendertarget view, hr %#x.\n", hr);
@@ -1477,7 +1477,7 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi
}
if (FAILED(hr = wined3d_shader_resource_view_create(wined3d_resource,
- view, &d3d10_null_wined3d_parent_ops, &view->wined3d_view)))
+ view, &d3d_null_wined3d_parent_ops, &view->wined3d_view)))
{
WARN("Failed to create wined3d shader resource view, hr %#x.\n", hr);
return hr;
--
2.4.9
More information about the wine-patches
mailing list