Józef Kucia : d3d11: Rename d3d10_device_init() to d3d_device_init().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5fb028139973c94b67cc22b2c9d2cc3095240037
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5fb028139973c94b67cc22b2c9...

Author: Józef Kucia 
Date:   Sun Sep 27 18:49:59 2015 +0200

d3d11: Rename d3d10_device_init() to d3d_device_init().

Signed-off-by: Józef Kucia

---

dlls/d3d11/d3d11_main.c    | 2 +-
 dlls/d3d11/d3d11_private.h | 2 +-
 dlls/d3d11/device.c        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c
index 5d35f10..5be4cd0 100644
--- a/dlls/d3d11/d3d11_main.c
+++ b/dlls/d3d11/d3d11_main.c
@@ -88,7 +88,7 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba
     }

object = *layer_base;
-    if (FAILED(hr = d3d10_device_init(object, device_object)))
+    if (FAILED(hr = d3d_device_init(object, device_object)))
     {
         WARN("Failed to initialize device, hr %#x.\n", hr);
         *device_layer = NULL;
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
index 671a5b5..6d9489a 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -392,7 +392,7 @@ static inline struct d3d_device *impl_from_ID3D10Device(ID3D10Device1 *iface)
     return CONTAINING_RECORD(iface, struct d3d_device, ID3D10Device1_iface);
 }

-HRESULT d3d10_device_init(struct d3d_device *device, void *outer_unknown) DECLSPEC_HIDDEN;
+HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) DECLSPEC_HIDDEN;

/* Layered device */
 enum dxgi_device_layer_id
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index ed45ebe..efa52ee 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -3123,7 +3123,7 @@ static const struct wine_rb_functions d3d_rasterizer_state_rb_ops =
     d3d_rasterizer_state_compare,
 };

-HRESULT d3d10_device_init(struct d3d_device *device, void *outer_unknown)
+HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown)
 {
     device->IUnknown_inner.lpVtbl = &d3d10_device_inner_unknown_vtbl;
     device->ID3D11Device_iface.lpVtbl = &d3d11_device_vtbl;