[PATCH 2/4] d3d11: Add ID3D11Device3 stub.

[Zhiyi Zhang]

From: Zhiyi Zhang

---
 dlls/d3d11/async.c         |  10 +-
 dlls/d3d11/buffer.c        |  10 +-
 dlls/d3d11/d3d11_private.h |  54 +++---
 dlls/d3d11/decoder.c       |   4 +-
 dlls/d3d11/device.c        | 338 ++++++++++++++++++++++++-------------
 dlls/d3d11/inputlayout.c   |  10 +-
 dlls/d3d11/shader.c        |  60 +++----
 dlls/d3d11/state.c         |  48 +++---
 dlls/d3d11/tests/d3d11.c   |   1 -
 dlls/d3d11/texture.c       |  30 ++--
 dlls/d3d11/view.c          |  42 ++---
 11 files changed, 356 insertions(+), 251 deletions(-)

diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c
index 639728ffa0a..f1f469a617f 100644
--- a/dlls/d3d11/async.c
+++ b/dlls/d3d11/async.c
@@ -71,7 +71,7 @@ static ULONG STDMETHODCALLTYPE d3d11_query_AddRef(ID3D11Query *iface)

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(query->device);
+        ID3D11Device3_AddRef(query->device);
         wined3d_query_incref(query->wined3d_query);
     }

@@ -87,9 +87,9 @@ static ULONG STDMETHODCALLTYPE d3d11_query_Release(ID3D11Query *iface)

if (!refcount)
     {
-        ID3D11Device2 *device = query->device;
+        ID3D11Device3 *device = query->device;
         wined3d_query_decref(query->wined3d_query);
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -245,7 +245,7 @@ static void STDMETHODCALLTYPE d3d10_query_GetDevice(ID3D10Query *iface, ID3D10De

TRACE("iface %p, device %p.\n", iface, device);

-    ID3D11Device2_QueryInterface(query->device, &IID_ID3D10Device, (void **)device);
+    ID3D11Device3_QueryInterface(query->device, &IID_ID3D10Device, (void **)device);
 }

static HRESULT STDMETHODCALLTYPE d3d10_query_GetPrivateData(ID3D10Query *iface,
@@ -457,7 +457,7 @@ static HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device
     wined3d_mutex_unlock();

query->predicate = predicate;
-    ID3D11Device2_AddRef(query->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(query->device = &device->ID3D11Device3_iface);

return S_OK;
 }
diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c
index 971fab0533e..4f1d2f6698b 100644
--- a/dlls/d3d11/buffer.c
+++ b/dlls/d3d11/buffer.c
@@ -72,7 +72,7 @@ static ULONG STDMETHODCALLTYPE d3d11_buffer_AddRef(ID3D11Buffer *iface)

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(buffer->device);
+        ID3D11Device3_AddRef(buffer->device);
         wined3d_buffer_incref(buffer->wined3d_buffer);
     }

@@ -88,12 +88,12 @@ static ULONG STDMETHODCALLTYPE d3d11_buffer_Release(ID3D11Buffer *iface)

if (!refcount)
     {
-        ID3D11Device2 *device = buffer->device;
+        ID3D11Device3 *device = buffer->device;

wined3d_buffer_decref(buffer->wined3d_buffer);
         /* Release the device last, it may cause the wined3d device to be
          * destroyed. */
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -263,7 +263,7 @@ static void STDMETHODCALLTYPE d3d10_buffer_GetDevice(ID3D10Buffer *iface, ID3D10

TRACE("iface %p, device %p.\n", iface, device);

-    ID3D11Device2_QueryInterface(buffer->device, &IID_ID3D10Device, (void **)device);
+    ID3D11Device3_QueryInterface(buffer->device, &IID_ID3D10Device, (void **)device);
 }

static HRESULT STDMETHODCALLTYPE d3d10_buffer_GetPrivateData(ID3D10Buffer *iface,
@@ -496,7 +496,7 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev
     }
     wined3d_mutex_unlock();

-    ID3D11Device2_AddRef(buffer->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(buffer->device = &device->ID3D11Device3_iface);

return S_OK;
 }
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
index 426ac0772c5..ce7b9d65790 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -124,7 +124,7 @@ struct d3d_texture1d
     IUnknown *dxgi_resource;
     struct wined3d_texture *wined3d_texture;
     D3D11_TEXTURE1D_DESC desc;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DESC *desc,
@@ -143,7 +143,7 @@ struct d3d_texture2d
     struct wined3d_texture *wined3d_texture;
     struct wined3d_swapchain *swapchain;
     D3D11_TEXTURE2D_DESC desc;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

static inline struct d3d_texture2d *impl_from_ID3D11Texture2D(ID3D11Texture2D *iface)
@@ -167,7 +167,7 @@ struct d3d_texture3d
     IUnknown *dxgi_resource;
     struct wined3d_texture *wined3d_texture;
     D3D11_TEXTURE3D_DESC desc;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

HRESULT d3d_texture3d_create(struct d3d_device *device, const D3D11_TEXTURE3D_DESC *desc,
@@ -185,7 +185,7 @@ struct d3d_buffer
     IUnknown *dxgi_resource;
     struct wined3d_buffer *wined3d_buffer;
     D3D11_BUFFER_DESC desc;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

HRESULT d3d_buffer_create(struct d3d_device *device, const D3D11_BUFFER_DESC *desc,
@@ -204,7 +204,7 @@ struct d3d_depthstencil_view
     struct wined3d_rendertarget_view *wined3d_view;
     D3D11_DEPTH_STENCIL_VIEW_DESC desc;
     ID3D11Resource *resource;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

HRESULT d3d_depthstencil_view_create(struct d3d_device *device, ID3D11Resource *resource,
@@ -223,7 +223,7 @@ struct d3d_rendertarget_view
     struct wined3d_rendertarget_view *wined3d_view;
     D3D11_RENDER_TARGET_VIEW_DESC desc;
     ID3D11Resource *resource;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource *resource,
@@ -242,7 +242,7 @@ struct d3d_shader_resource_view
     struct wined3d_shader_resource_view *wined3d_view;
     D3D11_SHADER_RESOURCE_VIEW_DESC desc;
     ID3D11Resource *resource;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

HRESULT d3d_shader_resource_view_create(struct d3d_device *device, ID3D11Resource *resource,
@@ -262,7 +262,7 @@ struct d3d11_unordered_access_view
     struct wined3d_unordered_access_view *wined3d_view;
     D3D11_UNORDERED_ACCESS_VIEW_DESC desc;
     ID3D11Resource *resource;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

HRESULT d3d11_unordered_access_view_create(struct d3d_device *device, ID3D11Resource *resource,
@@ -296,7 +296,7 @@ struct d3d_input_layout

struct wined3d_private_store private_store;
     struct wined3d_vertex_declaration *wined3d_decl;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

HRESULT d3d_input_layout_create(struct d3d_device *device,
@@ -315,7 +315,7 @@ struct d3d_vertex_shader

struct wined3d_private_store private_store;
     struct wined3d_shader *wined3d_shader;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

HRESULT d3d_vertex_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length,
@@ -331,7 +331,7 @@ struct d3d11_hull_shader

struct wined3d_private_store private_store;
     struct wined3d_shader *wined3d_shader;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

HRESULT d3d11_hull_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length,
@@ -346,7 +346,7 @@ struct d3d11_domain_shader

struct wined3d_private_store private_store;
     struct wined3d_shader *wined3d_shader;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

HRESULT d3d11_domain_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length,
@@ -362,7 +362,7 @@ struct d3d_geometry_shader

struct wined3d_private_store private_store;
     struct wined3d_shader *wined3d_shader;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

HRESULT d3d_geometry_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length,
@@ -381,7 +381,7 @@ struct d3d_pixel_shader

struct wined3d_private_store private_store;
     struct wined3d_shader *wined3d_shader;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

HRESULT d3d_pixel_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length,
@@ -397,7 +397,7 @@ struct d3d11_compute_shader

struct wined3d_private_store private_store;
     struct wined3d_shader *wined3d_shader;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

HRESULT d3d11_compute_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length,
@@ -411,7 +411,7 @@ struct d3d11_class_linkage
     LONG refcount;

struct wined3d_private_store private_store;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

HRESULT d3d11_class_linkage_create(struct d3d_device *device,
@@ -428,7 +428,7 @@ struct d3d_blend_state
     struct wined3d_blend_state *wined3d_state;
     D3D11_BLEND_DESC1 desc;
     struct wine_rb_entry entry;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

static inline struct d3d_blend_state *impl_from_ID3D11BlendState1(ID3D11BlendState1 *iface)
@@ -452,7 +452,7 @@ struct d3d_depthstencil_state
     struct wined3d_depth_stencil_state *wined3d_state;
     D3D11_DEPTH_STENCIL_DESC desc;
     struct wine_rb_entry entry;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

static inline struct d3d_depthstencil_state *impl_from_ID3D11DepthStencilState(ID3D11DepthStencilState *iface)
@@ -478,7 +478,7 @@ struct d3d_rasterizer_state
     struct wined3d_rasterizer_state *wined3d_state;
     D3D11_RASTERIZER_DESC1 desc;
     struct wine_rb_entry entry;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTERIZER_DESC1 *desc,
@@ -497,7 +497,7 @@ struct d3d_sampler_state
     struct wined3d_sampler *wined3d_sampler;
     D3D11_SAMPLER_DESC desc;
     struct wine_rb_entry entry;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

HRESULT d3d_sampler_state_create(struct d3d_device *device, const D3D11_SAMPLER_DESC *desc,
@@ -516,7 +516,7 @@ struct d3d_query
     struct wined3d_query *wined3d_query;
     BOOL predicate;
     D3D11_QUERY_DESC desc;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc, BOOL predicate,
@@ -546,7 +546,7 @@ struct d3d_device_context_state
     SIZE_T entry_count;

struct wined3d_device *wined3d_device;
-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
 };

/* ID3D11DeviceContext */
@@ -569,7 +569,7 @@ struct d3d11_device_context
 struct d3d_device
 {
     IUnknown IUnknown_inner;
-    ID3D11Device2 ID3D11Device2_iface;
+    ID3D11Device3 ID3D11Device3_iface;
     ID3D10Device1 ID3D10Device1_iface;
     ID3D10Multithread ID3D10Multithread_iface;
     IWineDXGIDeviceParent IWineDXGIDeviceParent_iface;
@@ -600,19 +600,19 @@ struct d3d11_command_list
     ID3D11CommandList ID3D11CommandList_iface;
     LONG refcount;

-    ID3D11Device2 *device;
+    ID3D11Device3 *device;
     struct wined3d_command_list *wined3d_list;
     struct wined3d_private_store private_store;
 };

static inline struct d3d_device *impl_from_ID3D11Device(ID3D11Device *iface)
 {
-    return CONTAINING_RECORD((ID3D11Device2 *)iface, struct d3d_device, ID3D11Device2_iface);
+    return CONTAINING_RECORD((ID3D11Device3 *)iface, struct d3d_device, ID3D11Device3_iface);
 }

-static inline struct d3d_device *impl_from_ID3D11Device2(ID3D11Device2 *iface)
+static inline struct d3d_device *impl_from_ID3D11Device3(ID3D11Device3 *iface)
 {
-    return CONTAINING_RECORD(iface, struct d3d_device, ID3D11Device2_iface);
+    return CONTAINING_RECORD(iface, struct d3d_device, ID3D11Device3_iface);
 }

static inline struct d3d_device *impl_from_ID3D10Device(ID3D10Device1 *iface)
diff --git a/dlls/d3d11/decoder.c b/dlls/d3d11/decoder.c
index 2e5db2a0230..eb27ecc828b 100644
--- a/dlls/d3d11/decoder.c
+++ b/dlls/d3d11/decoder.c
@@ -68,7 +68,7 @@ static ULONG STDMETHODCALLTYPE d3d11_video_decoder_Release(ID3D11VideoDecoder *i
     if (!refcount)
     {
         wined3d_decoder_decref(decoder->wined3d_decoder);
-        ID3D11Device2_Release(&decoder->device->ID3D11Device2_iface);
+        ID3D11Device3_Release(&decoder->device->ID3D11Device3_iface);
         wined3d_private_store_cleanup(&decoder->private_store);
         free(decoder);
     }
@@ -205,7 +205,7 @@ HRESULT d3d_video_decoder_create(struct d3d_device *device, const D3D11_VIDEO_DE

wined3d_private_store_init(&object->private_store);
     object->device = device;
-    ID3D11Device2_AddRef(&device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(&device->ID3D11Device3_iface);

TRACE("Created video decoder %p.\n", object);
     *decoder = object;
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index cf62e5151ef..608e7e9ce0a 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -114,7 +114,7 @@ static ULONG STDMETHODCALLTYPE d3d_device_context_state_AddRef(ID3DDeviceContext
     if (refcount == 1)
     {
         d3d_device_context_state_private_addref(state);
-        ID3D11Device2_AddRef(state->device);
+        ID3D11Device3_AddRef(state->device);
     }

return refcount;
@@ -173,7 +173,7 @@ static ULONG STDMETHODCALLTYPE d3d_device_context_state_Release(ID3DDeviceContex

if (!refcount)
     {
-        ID3D11Device2_Release(state->device);
+        ID3D11Device3_Release(state->device);
         d3d_device_context_state_private_release(state);
     }

@@ -325,7 +325,7 @@ static void d3d_device_context_state_init(struct d3d_device_context_state *state
     state->feature_level = feature_level;
     state->emulated_interface = *emulated_interface;
     wined3d_device_incref(state->wined3d_device = device->wined3d_device);
-    state->device = &device->ID3D11Device2_iface;
+    state->device = &device->ID3D11Device3_iface;

d3d_device_context_state_AddRef(&state->ID3DDeviceContextState_iface);
 }
@@ -377,7 +377,7 @@ static ULONG STDMETHODCALLTYPE d3d11_command_list_Release(ID3D11CommandList *ifa
     {
         wined3d_command_list_decref(list->wined3d_list);
         wined3d_private_store_cleanup(&list->private_store);
-        ID3D11Device2_Release(list->device);
+        ID3D11Device3_Release(list->device);
         free(list);
     }

@@ -391,7 +391,7 @@ static void STDMETHODCALLTYPE d3d11_command_list_GetDevice(ID3D11CommandList *if
     TRACE("iface %p, device %p.\n", iface, device);

*device = (ID3D11Device *)list->device;
-    ID3D11Device2_AddRef(list->device);
+    ID3D11Device3_AddRef(list->device);
 }

static HRESULT STDMETHODCALLTYPE d3d11_command_list_GetPrivateData(ID3D11CommandList *iface, REFGUID guid,
@@ -512,7 +512,7 @@ static ULONG STDMETHODCALLTYPE d3d11_device_context_AddRef(ID3D11DeviceContext1

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(&context->device->ID3D11Device2_iface);
+        ID3D11Device3_AddRef(&context->device->ID3D11Device3_iface);
     }

return refcount;
@@ -527,14 +527,14 @@ static ULONG STDMETHODCALLTYPE d3d11_device_context_Release(ID3D11DeviceContext1

if (!refcount)
     {
-        ID3D11Device2 *device = &context->device->ID3D11Device2_iface;
+        ID3D11Device3 *device = &context->device->ID3D11Device3_iface;
         if (context->type != D3D11_DEVICE_CONTEXT_IMMEDIATE)
         {
             wined3d_deferred_context_destroy(context->wined3d_context);
             d3d11_device_context_cleanup(context);
             free(context);
         }
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -672,7 +672,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_GetDevice(ID3D11DeviceContext

TRACE("iface %p, device %p.\n", iface, device);

-    *device = (ID3D11Device *)&context->device->ID3D11Device2_iface;
+    *device = (ID3D11Device *)&context->device->ID3D11Device3_iface;
     ID3D11Device_AddRef(*device);
 }

@@ -2721,10 +2721,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_context_FinishCommandList(ID3D11De

object->ID3D11CommandList_iface.lpVtbl = &d3d11_command_list_vtbl;
     object->refcount = 1;
-    object->device = &context->device->ID3D11Device2_iface;
+    object->device = &context->device->ID3D11Device3_iface;
     wined3d_private_store_init(&object->private_store);

-    ID3D11Device2_AddRef(object->device);
+    ID3D11Device3_AddRef(object->device);

TRACE("Created command list %p.\n", object);
     *command_list = &object->ID3D11CommandList_iface;
@@ -3867,35 +3867,35 @@ static void d3d11_device_context_init(struct d3d11_device_context *context, stru
     context->type = type;

context->device = device;
-    ID3D11Device2_AddRef(&device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(&device->ID3D11Device3_iface);

wined3d_private_store_init(&context->private_store);
 }

/* ID3D11Device methods */

-static HRESULT STDMETHODCALLTYPE d3d11_device_QueryInterface(ID3D11Device2 *iface, REFIID iid, void **out)
+static HRESULT STDMETHODCALLTYPE d3d11_device_QueryInterface(ID3D11Device3 *iface, REFIID iid, void **out)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     return IUnknown_QueryInterface(device->outer_unk, iid, out);
 }

-static ULONG STDMETHODCALLTYPE d3d11_device_AddRef(ID3D11Device2 *iface)
+static ULONG STDMETHODCALLTYPE d3d11_device_AddRef(ID3D11Device3 *iface)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     return IUnknown_AddRef(device->outer_unk);
 }

-static ULONG STDMETHODCALLTYPE d3d11_device_Release(ID3D11Device2 *iface)
+static ULONG STDMETHODCALLTYPE d3d11_device_Release(ID3D11Device3 *iface)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     return IUnknown_Release(device->outer_unk);
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBuffer(ID3D11Device2 *iface, const D3D11_BUFFER_DESC *desc,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBuffer(ID3D11Device3 *iface, const D3D11_BUFFER_DESC *desc,
         const D3D11_SUBRESOURCE_DATA *data, ID3D11Buffer **buffer)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_buffer *object;
     HRESULT hr;

@@ -3909,10 +3909,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBuffer(ID3D11Device2 *iface,
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture1D(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture1D(ID3D11Device3 *iface,
         const D3D11_TEXTURE1D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, ID3D11Texture1D **texture)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_texture1d *object;
     HRESULT hr;

@@ -3926,10 +3926,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture1D(ID3D11Device2 *ifa
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture2D(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture2D(ID3D11Device3 *iface,
         const D3D11_TEXTURE2D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, ID3D11Texture2D **texture)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_texture2d *object;
     HRESULT hr;

@@ -3943,10 +3943,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture2D(ID3D11Device2 *ifa
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture3D(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture3D(ID3D11Device3 *iface,
         const D3D11_TEXTURE3D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, ID3D11Texture3D **texture)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_texture3d *object;
     HRESULT hr;

@@ -3960,10 +3960,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture3D(ID3D11Device2 *ifa
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateShaderResourceView(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateShaderResourceView(ID3D11Device3 *iface,
         ID3D11Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11ShaderResourceView **view)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_shader_resource_view *object;
     HRESULT hr;

@@ -3982,10 +3982,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateShaderResourceView(ID3D11Dev
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateUnorderedAccessView(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateUnorderedAccessView(ID3D11Device3 *iface,
         ID3D11Resource *resource, const D3D11_UNORDERED_ACCESS_VIEW_DESC *desc, ID3D11UnorderedAccessView **view)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d11_unordered_access_view *object;
     HRESULT hr;

@@ -4001,10 +4001,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateUnorderedAccessView(ID3D11De
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Device3 *iface,
         ID3D11Resource *resource, const D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11RenderTargetView **view)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_rendertarget_view *object;
     HRESULT hr;

@@ -4023,10 +4023,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Devic
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilView(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilView(ID3D11Device3 *iface,
         ID3D11Resource *resource, const D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11DepthStencilView **view)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_depthstencil_view *object;
     HRESULT hr;

@@ -4042,11 +4042,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilView(ID3D11Devic
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateInputLayout(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateInputLayout(ID3D11Device3 *iface,
         const D3D11_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code,
         SIZE_T shader_byte_code_length, ID3D11InputLayout **input_layout)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_input_layout *object;
     HRESULT hr;

@@ -4063,10 +4063,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateInputLayout(ID3D11Device2 *i
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateVertexShader(ID3D11Device2 *iface, const void *byte_code,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateVertexShader(ID3D11Device3 *iface, const void *byte_code,
         SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11VertexShader **shader)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_vertex_shader *object;
     HRESULT hr;

@@ -4086,10 +4086,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateVertexShader(ID3D11Device2 *
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShader(ID3D11Device2 *iface, const void *byte_code,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShader(ID3D11Device3 *iface, const void *byte_code,
         SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11GeometryShader **shader)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_geometry_shader *object;
     HRESULT hr;

@@ -4110,12 +4110,12 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShader(ID3D11Device2
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShaderWithStreamOutput(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShaderWithStreamOutput(ID3D11Device3 *iface,
         const void *byte_code, SIZE_T byte_code_length, const D3D11_SO_DECLARATION_ENTRY *so_entries,
         UINT entry_count, const UINT *buffer_strides, UINT strides_count, UINT rasterizer_stream,
         ID3D11ClassLinkage *class_linkage, ID3D11GeometryShader **shader)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_geometry_shader *object;
     HRESULT hr;

@@ -4140,10 +4140,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShaderWithStreamOutp
     return hr;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePixelShader(ID3D11Device2 *iface, const void *byte_code,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePixelShader(ID3D11Device3 *iface, const void *byte_code,
         SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11PixelShader **shader)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_pixel_shader *object;
     HRESULT hr;

@@ -4163,10 +4163,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePixelShader(ID3D11Device2 *i
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateHullShader(ID3D11Device2 *iface, const void *byte_code,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateHullShader(ID3D11Device3 *iface, const void *byte_code,
         SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11HullShader **shader)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d11_hull_shader *object;
     HRESULT hr;

@@ -4186,10 +4186,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateHullShader(ID3D11Device2 *if
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device2 *iface, const void *byte_code,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device3 *iface, const void *byte_code,
         SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11DomainShader **shader)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d11_domain_shader *object;
     HRESULT hr;

@@ -4209,10 +4209,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device2 *
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device2 *iface, const void *byte_code,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device3 *iface, const void *byte_code,
         SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11ComputeShader **shader)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d11_compute_shader *object;
     HRESULT hr;

@@ -4232,10 +4232,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device2
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateClassLinkage(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateClassLinkage(ID3D11Device3 *iface,
         ID3D11ClassLinkage **class_linkage)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d11_class_linkage *object;
     HRESULT hr;

@@ -4249,10 +4249,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateClassLinkage(ID3D11Device2 *
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState1(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState1(ID3D11Device3 *iface,
         const D3D11_BLEND_DESC1 *desc, ID3D11BlendState1 **state)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_blend_state *object;
     HRESULT hr;

@@ -4266,7 +4266,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState1(ID3D11Device2 *i
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device3 *iface,
         const D3D11_BLEND_DESC *desc, ID3D11BlendState **blend_state)
 {
     D3D11_BLEND_DESC1 d3d11_1_desc;
@@ -4296,10 +4296,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device2 *if
     return d3d11_device_CreateBlendState1(iface, &d3d11_1_desc, (ID3D11BlendState1 **)blend_state);
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilState(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilState(ID3D11Device3 *iface,
         const D3D11_DEPTH_STENCIL_DESC *desc, ID3D11DepthStencilState **depth_stencil_state)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_depthstencil_state *object;
     HRESULT hr;

@@ -4313,10 +4313,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilState(ID3D11Devi
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device3 *iface,
         const D3D11_RASTERIZER_DESC *desc, ID3D11RasterizerState **rasterizer_state)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_rasterizer_state *object;
     D3D11_RASTERIZER_DESC1 desc1;
     HRESULT hr;
@@ -4337,10 +4337,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateSamplerState(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateSamplerState(ID3D11Device3 *iface,
         const D3D11_SAMPLER_DESC *desc, ID3D11SamplerState **sampler_state)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_sampler_state *object;
     HRESULT hr;

@@ -4354,10 +4354,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateSamplerState(ID3D11Device2 *
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateQuery(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateQuery(ID3D11Device3 *iface,
         const D3D11_QUERY_DESC *desc, ID3D11Query **query)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_query *object;
     HRESULT hr;

@@ -4376,10 +4376,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateQuery(ID3D11Device2 *iface,
     return S_FALSE;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePredicate(ID3D11Device2 *iface, const D3D11_QUERY_DESC *desc,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePredicate(ID3D11Device3 *iface, const D3D11_QUERY_DESC *desc,
         ID3D11Predicate **predicate)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_query *object;
     HRESULT hr;

@@ -4398,7 +4398,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePredicate(ID3D11Device2 *ifa
     return S_FALSE;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateCounter(ID3D11Device2 *iface, const D3D11_COUNTER_DESC *desc,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateCounter(ID3D11Device3 *iface, const D3D11_COUNTER_DESC *desc,
         ID3D11Counter **counter)
 {
     FIXME("iface %p, desc %p, counter %p stub!\n", iface, desc, counter);
@@ -4432,10 +4432,10 @@ static HRESULT d3d11_deferred_context_create(struct d3d_device *device,
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device2 *iface, UINT flags,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device3 *iface, UINT flags,
         ID3D11DeviceContext **context)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d11_device_context *object;
     HRESULT hr;

@@ -4448,7 +4448,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource(ID3D11Device2 *iface, HANDLE resource, REFIID iid,
+static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource(ID3D11Device3 *iface, HANDLE resource, REFIID iid,
         void **out)
 {
     FIXME("iface %p, resource %p, iid %s, out %p stub!\n", iface, resource, debugstr_guid(iid), out);
@@ -4456,10 +4456,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource(ID3D11Device2 *
     return E_NOTIMPL;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 *iface, DXGI_FORMAT format,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device3 *iface, DXGI_FORMAT format,
         UINT *format_support)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct wined3d_device_creation_parameters params;
     struct wined3d_adapter *wined3d_adapter;
     enum wined3d_format_id wined3d_format;
@@ -4563,10 +4563,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 *
     return *format_support ? S_OK : E_FAIL;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CheckMultisampleQualityLevels(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CheckMultisampleQualityLevels(ID3D11Device3 *iface,
         DXGI_FORMAT format, UINT sample_count, UINT *quality_level_count)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct wined3d_device_creation_parameters params;
     struct wined3d_adapter *wined3d_adapter;
     struct wined3d *wined3d;
@@ -4605,12 +4605,12 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckMultisampleQualityLevels(ID3D
     return hr;
 }

-static void STDMETHODCALLTYPE d3d11_device_CheckCounterInfo(ID3D11Device2 *iface, D3D11_COUNTER_INFO *info)
+static void STDMETHODCALLTYPE d3d11_device_CheckCounterInfo(ID3D11Device3 *iface, D3D11_COUNTER_INFO *info)
 {
     FIXME("iface %p, info %p stub!\n", iface, info);
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CheckCounter(ID3D11Device2 *iface, const D3D11_COUNTER_DESC *desc,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CheckCounter(ID3D11Device3 *iface, const D3D11_COUNTER_DESC *desc,
         D3D11_COUNTER_TYPE *type, UINT *active_counter_count, char *name, UINT *name_length,
         char *units, UINT *units_length, char *description, UINT *description_length)
 {
@@ -4622,10 +4622,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckCounter(ID3D11Device2 *iface,
     return E_NOTIMPL;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 *iface, D3D11_FEATURE feature,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device3 *iface, D3D11_FEATURE feature,
         void *feature_support_data, UINT feature_support_data_size)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct wined3d_caps wined3d_caps;
     HRESULT hr;

@@ -4868,7 +4868,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2
     }
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_GetPrivateData(ID3D11Device2 *iface, REFGUID guid,
+static HRESULT STDMETHODCALLTYPE d3d11_device_GetPrivateData(ID3D11Device3 *iface, REFGUID guid,
         UINT *data_size, void *data)
 {
     IDXGIDevice *dxgi_device;
@@ -4876,7 +4876,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_GetPrivateData(ID3D11Device2 *ifac

TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data);

-    if (FAILED(hr = ID3D11Device2_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device)))
+    if (FAILED(hr = ID3D11Device3_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device)))
         return hr;
     hr = IDXGIDevice_GetPrivateData(dxgi_device, guid, data_size, data);
     IDXGIDevice_Release(dxgi_device);
@@ -4884,7 +4884,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_GetPrivateData(ID3D11Device2 *ifac
     return hr;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateData(ID3D11Device2 *iface, REFGUID guid,
+static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateData(ID3D11Device3 *iface, REFGUID guid,
         UINT data_size, const void *data)
 {
     IDXGIDevice *dxgi_device;
@@ -4892,7 +4892,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateData(ID3D11Device2 *ifac

TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data);

-    if (FAILED(hr = ID3D11Device2_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device)))
+    if (FAILED(hr = ID3D11Device3_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device)))
         return hr;
     hr = IDXGIDevice_SetPrivateData(dxgi_device, guid, data_size, data);
     IDXGIDevice_Release(dxgi_device);
@@ -4900,7 +4900,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateData(ID3D11Device2 *ifac
     return hr;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateDataInterface(ID3D11Device2 *iface, REFGUID guid,
+static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateDataInterface(ID3D11Device3 *iface, REFGUID guid,
         const IUnknown *data)
 {
     IDXGIDevice *dxgi_device;
@@ -4908,7 +4908,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateDataInterface(ID3D11Devi

TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);

-    if (FAILED(hr = ID3D11Device2_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device)))
+    if (FAILED(hr = ID3D11Device3_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device)))
         return hr;
     hr = IDXGIDevice_SetPrivateDataInterface(dxgi_device, guid, data);
     IDXGIDevice_Release(dxgi_device);
@@ -4916,33 +4916,33 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateDataInterface(ID3D11Devi
     return hr;
 }

-static D3D_FEATURE_LEVEL STDMETHODCALLTYPE d3d11_device_GetFeatureLevel(ID3D11Device2 *iface)
+static D3D_FEATURE_LEVEL STDMETHODCALLTYPE d3d11_device_GetFeatureLevel(ID3D11Device3 *iface)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);

TRACE("iface %p.\n", iface);

return device->state->feature_level;
 }

-static UINT STDMETHODCALLTYPE d3d11_device_GetCreationFlags(ID3D11Device2 *iface)
+static UINT STDMETHODCALLTYPE d3d11_device_GetCreationFlags(ID3D11Device3 *iface)
 {
     FIXME("iface %p stub!\n", iface);

return 0;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_GetDeviceRemovedReason(ID3D11Device2 *iface)
+static HRESULT STDMETHODCALLTYPE d3d11_device_GetDeviceRemovedReason(ID3D11Device3 *iface)
 {
     WARN("iface %p stub!\n", iface);

return S_OK;
 }

-static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext(ID3D11Device2 *iface,
+static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext(ID3D11Device3 *iface,
         ID3D11DeviceContext **immediate_context)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);

TRACE("iface %p, immediate_context %p.\n", iface, immediate_context);

@@ -4950,24 +4950,24 @@ static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext(ID3D11Device2 *if
     ID3D11DeviceContext_AddRef(*immediate_context);
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_SetExceptionMode(ID3D11Device2 *iface, UINT flags)
+static HRESULT STDMETHODCALLTYPE d3d11_device_SetExceptionMode(ID3D11Device3 *iface, UINT flags)
 {
     FIXME("iface %p, flags %#x stub!\n", iface, flags);

return E_NOTIMPL;
 }

-static UINT STDMETHODCALLTYPE d3d11_device_GetExceptionMode(ID3D11Device2 *iface)
+static UINT STDMETHODCALLTYPE d3d11_device_GetExceptionMode(ID3D11Device3 *iface)
 {
     FIXME("iface %p stub!\n", iface);

return 0;
 }

-static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext1(ID3D11Device2 *iface,
+static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext1(ID3D11Device3 *iface,
         ID3D11DeviceContext1 **immediate_context)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);

TRACE("iface %p, immediate_context %p.\n", iface, immediate_context);

@@ -4975,10 +4975,10 @@ static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext1(ID3D11Device2 *i
     ID3D11DeviceContext1_AddRef(*immediate_context);
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext1(ID3D11Device2 *iface, UINT flags,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext1(ID3D11Device3 *iface, UINT flags,
         ID3D11DeviceContext1 **context)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d11_device_context *object;
     HRESULT hr;

@@ -4991,10 +4991,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext1(ID3D11Devic
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState1(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState1(ID3D11Device3 *iface,
         const D3D11_RASTERIZER_DESC1 *desc, ID3D11RasterizerState1 **state)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_rasterizer_state *object;
     HRESULT hr;

@@ -5011,11 +5011,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState1(ID3D11Devic
     return S_OK;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Device2 *iface, UINT flags,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Device3 *iface, UINT flags,
         const D3D_FEATURE_LEVEL *feature_levels, UINT feature_level_count, UINT sdk_version,
         REFIID emulated_interface, D3D_FEATURE_LEVEL *chosen_feature_level, ID3DDeviceContextState **state)
 {
-    struct d3d_device *device = impl_from_ID3D11Device2(iface);
+    struct d3d_device *device = impl_from_ID3D11Device3(iface);
     struct d3d_device_context_state *state_impl;
     struct wined3d_state *wined3d_state;
     D3D_FEATURE_LEVEL feature_level;
@@ -5080,7 +5080,7 @@ fail:
     return hr;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource1(ID3D11Device2 *iface, HANDLE handle,
+static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource1(ID3D11Device3 *iface, HANDLE handle,
         REFIID iid, void **resource)
 {
     FIXME("iface %p, handle %p, iid %s, resource %p stub!\n", iface, handle, debugstr_guid(iid), resource);
@@ -5088,7 +5088,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource1(ID3D11Device2
     return E_NOTIMPL;
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResourceByName(ID3D11Device2 *iface, const WCHAR *name,
+static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResourceByName(ID3D11Device3 *iface, const WCHAR *name,
         DWORD access, REFIID iid, void **resource)
 {
     FIXME("iface %p, name %s, access %#lx, iid %s, resource %p stub!\n", iface, debugstr_w(name), access,
@@ -5097,13 +5097,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResourceByName(ID3D11Dev
     return E_NOTIMPL;
 }

-static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext2(ID3D11Device2 *iface,
+static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext2(ID3D11Device3 *iface,
         ID3D11DeviceContext2 **context)
 {
     FIXME("iface %p, context %p stub!\n", iface, context);
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext2(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext2(ID3D11Device3 *iface,
         UINT flags, ID3D11DeviceContext2 **context)
 {
     FIXME("iface %p, flags %#x, context %p stub!\n", iface, flags, context);
@@ -5111,7 +5111,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext2(ID3D11Devic
     return E_NOTIMPL;
 }

-static void STDMETHODCALLTYPE d3d11_device_GetResourceTiling(ID3D11Device2 *iface,
+static void STDMETHODCALLTYPE d3d11_device_GetResourceTiling(ID3D11Device3 *iface,
         ID3D11Resource *resource, UINT *tile_count, D3D11_PACKED_MIP_DESC *mip_desc,
         D3D11_TILE_SHAPE *tile_shape, UINT *subresource_tiling_count, UINT first_subresource_tiling,
         D3D11_SUBRESOURCE_TILING *subresource_tiling)
@@ -5122,7 +5122,7 @@ static void STDMETHODCALLTYPE d3d11_device_GetResourceTiling(ID3D11Device2 *ifac
             subresource_tiling_count, first_subresource_tiling, subresource_tiling);
 }

-static HRESULT STDMETHODCALLTYPE d3d11_device_CheckMultisampleQualityLevels1(ID3D11Device2 *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_device_CheckMultisampleQualityLevels1(ID3D11Device3 *iface,
         DXGI_FORMAT format, UINT sample_count, UINT flags, UINT *quality_level_count)
 {
     FIXME("iface %p, format %#x, sample_count %u, flags %#x, quality_level_count %p stub!\n",
@@ -5131,7 +5131,100 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckMultisampleQualityLevels1(ID3
     return E_NOTIMPL;
 }

-static const struct ID3D11Device2Vtbl d3d11_device_vtbl =
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture2D1(ID3D11Device3 *iface,
+        const D3D11_TEXTURE2D_DESC1 *desc, const D3D11_SUBRESOURCE_DATA *initial_data,
+        ID3D11Texture2D1 **texture)
+{
+    FIXME("iface %p, desc %p, initial_data %p, texture %p stub!\n", iface, desc, initial_data, texture);
+
+    return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture3D1(ID3D11Device3 *iface,
+        const D3D11_TEXTURE3D_DESC1 *desc, const D3D11_SUBRESOURCE_DATA *initial_data,
+        ID3D11Texture3D1 **texture)
+{
+    FIXME("iface %p, desc %p, initial_data %p, texture %p stub!\n", iface, desc, initial_data, texture);
+
+    return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState2(ID3D11Device3 *iface,
+        const D3D11_RASTERIZER_DESC2 *desc, ID3D11RasterizerState2 **state)
+{
+    FIXME("iface %p, desc %p, state %p stub!\n", iface, desc, state);
+
+    return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateShaderResourceView1(ID3D11Device3 *iface,
+        ID3D11Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC1 *desc,
+        ID3D11ShaderResourceView1 **view)
+{
+    FIXME("iface %p, resource %p, desc %p, view %p stub!\n", iface, resource, desc, view);
+
+    return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateUnorderedAccessView1(ID3D11Device3 *iface,
+        ID3D11Resource *resource, const D3D11_UNORDERED_ACCESS_VIEW_DESC1 *desc,
+        ID3D11UnorderedAccessView1 **view)
+{
+    FIXME("iface %p, resource %p, desc %p, view %p stub!\n", iface, resource, desc, view);
+
+    return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView1(ID3D11Device3 *iface,
+        ID3D11Resource *resource, const D3D11_RENDER_TARGET_VIEW_DESC1 *desc,
+        ID3D11RenderTargetView1 **view)
+{
+    FIXME("iface %p, resource %p, desc %p, view %p stub!\n", iface, resource, desc, view);
+
+    return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateQuery1(ID3D11Device3 *iface,
+        const D3D11_QUERY_DESC1 *desc, ID3D11Query1 **query)
+{
+    FIXME("iface %p, desc %p, query %p stub!\n", iface, desc, query);
+
+    return E_NOTIMPL;
+}
+
+static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext3(ID3D11Device3 *iface,
+        ID3D11DeviceContext3 **context)
+{
+    FIXME("iface %p, context %p stub!\n", iface, context);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext3(ID3D11Device3 *iface,
+        UINT flags, ID3D11DeviceContext3 **context)
+{
+    FIXME("iface %p, flags %#x, context %p stub!\n", iface, flags, context);
+
+    return E_NOTIMPL;
+}
+
+static void STDMETHODCALLTYPE d3d11_device_WriteToSubresource(ID3D11Device3 *iface,
+        ID3D11Resource *dst_resource, UINT dst_subresource, const D3D11_BOX *dst_box,
+        const void *src_data, UINT src_row_pitch, UINT src_depth_pitch)
+{
+    FIXME("iface %p, dst_resource %p, dst_subresource %u, dst_box %p, src_data %p, src_row_pitch %u, "
+            "src_depth_pitch %u stub!\n", iface, dst_resource, dst_subresource, dst_box, src_data,
+            src_row_pitch, src_depth_pitch);
+}
+
+static void STDMETHODCALLTYPE d3d11_device_ReadFromSubresource(ID3D11Device3 *iface,
+        void *dst_data, UINT dst_row_pitch, UINT dst_depth_pitch, ID3D11Resource *src_resource,
+        UINT src_subresource, const D3D11_BOX *src_box)
+{
+    FIXME("iface %p, dst_data %p, dst_row_pitch %u, dst_depth_pitch %u, src_resource %p, "
+            "src_subresource %u, src_box %p stub!\n", iface, dst_data, dst_row_pitch, dst_depth_pitch,
+            src_resource, src_subresource, src_box);
+}
+
+static const struct ID3D11Device3Vtbl d3d11_device_vtbl =
 {
     /* IUnknown methods */
     d3d11_device_QueryInterface,
@@ -5191,6 +5284,18 @@ static const struct ID3D11Device2Vtbl d3d11_device_vtbl =
     d3d11_device_CreateDeferredContext2,
     d3d11_device_GetResourceTiling,
     d3d11_device_CheckMultisampleQualityLevels1,
+    /* ID3D11Device3 methods */
+    d3d11_device_CreateTexture2D1,
+    d3d11_device_CreateTexture3D1,
+    d3d11_device_CreateRasterizerState2,
+    d3d11_device_CreateShaderResourceView1,
+    d3d11_device_CreateUnorderedAccessView1,
+    d3d11_device_CreateRenderTargetView1,
+    d3d11_device_CreateQuery1,
+    d3d11_device_GetImmediateContext3,
+    d3d11_device_CreateDeferredContext3,
+    d3d11_device_WriteToSubresource,
+    d3d11_device_ReadFromSubresource,
 };

/* Inner IUnknown methods */
@@ -5206,12 +5311,13 @@ static HRESULT STDMETHODCALLTYPE d3d_device_inner_QueryInterface(IUnknown *iface

TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);

-    if (IsEqualGUID(riid, &IID_ID3D11Device2)
+    if (IsEqualGUID(riid, &IID_ID3D11Device3)
+            || IsEqualGUID(riid, &IID_ID3D11Device2)
             || IsEqualGUID(riid, &IID_ID3D11Device1)
             || IsEqualGUID(riid, &IID_ID3D11Device)
             || IsEqualGUID(riid, &IID_IUnknown))
     {
-        *out = &device->ID3D11Device2_iface;
+        *out = &device->ID3D11Device3_iface;
     }
     else if (!device->d3d11_only
             && (IsEqualGUID(riid, &IID_ID3D10Device1)
@@ -6561,7 +6667,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_GetPrivateData(ID3D10Device1 *ifac

TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data);

-    return d3d11_device_GetPrivateData(&device->ID3D11Device2_iface, guid, data_size, data);
+    return d3d11_device_GetPrivateData(&device->ID3D11Device3_iface, guid, data_size, data);
 }

static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateData(ID3D10Device1 *iface,
@@ -6571,7 +6677,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateData(ID3D10Device1 *ifac

TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data);

-    return d3d11_device_SetPrivateData(&device->ID3D11Device2_iface, guid, data_size, data);
+    return d3d11_device_SetPrivateData(&device->ID3D11Device3_iface, guid, data_size, data);
 }

static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateDataInterface(ID3D10Device1 *iface,
@@ -6581,7 +6687,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateDataInterface(ID3D10Devi

TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);

-    return d3d11_device_SetPrivateDataInterface(&device->ID3D11Device2_iface, guid, data);
+    return d3d11_device_SetPrivateDataInterface(&device->ID3D11Device3_iface, guid, data);
 }

static void STDMETHODCALLTYPE d3d10_device_ClearState(ID3D10Device1 *iface)
@@ -6982,7 +7088,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState1(ID3D10Device1 *i

TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state);

-    if (FAILED(hr = d3d11_device_CreateBlendState(&device->ID3D11Device2_iface, (const D3D11_BLEND_DESC *)desc, &object)))
+    if (FAILED(hr = d3d11_device_CreateBlendState(&device->ID3D11Device3_iface, (const D3D11_BLEND_DESC *)desc, &object)))
         return hr;

*blend_state = &impl_from_ID3D11BlendState1((ID3D11BlendState1 *)object)->ID3D10BlendState1_iface;
@@ -7142,7 +7248,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CheckFormatSupport(ID3D10Device1 *
     TRACE("iface %p, format %s, format_support %p.\n",
             iface, debug_dxgi_format(format), format_support);

-    return d3d11_device_CheckFormatSupport(&device->ID3D11Device2_iface, format, format_support);
+    return d3d11_device_CheckFormatSupport(&device->ID3D11Device3_iface, format, format_support);
 }

static HRESULT STDMETHODCALLTYPE d3d10_device_CheckMultisampleQualityLevels(ID3D10Device1 *iface,
@@ -7153,7 +7259,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CheckMultisampleQualityLevels(ID3D
     TRACE("iface %p, format %s, sample_count %u, quality_level_count %p.\n",
             iface, debug_dxgi_format(format), sample_count, quality_level_count);

-    return d3d11_device_CheckMultisampleQualityLevels(&device->ID3D11Device2_iface, format,
+    return d3d11_device_CheckMultisampleQualityLevels(&device->ID3D11Device3_iface, format,
             sample_count, quality_level_count);
 }

@@ -7764,7 +7870,7 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par
     }

d3d_device_context_state_init(state, device, feature_level,
-            device->d3d11_only ? &IID_ID3D11Device2 : &IID_ID3D10Device1);
+            device->d3d11_only ? &IID_ID3D11Device3 : &IID_ID3D10Device1);

device->state = state;
     if (!d3d_device_context_state_add_entry(state, device, wined3d_state))
@@ -7841,7 +7947,7 @@ static int d3d_rasterizer_state_compare(const void *key, const struct wine_rb_en
 void d3d_device_init(struct d3d_device *device, void *outer_unknown)
 {
     device->IUnknown_inner.lpVtbl = &d3d_device_inner_unknown_vtbl;
-    device->ID3D11Device2_iface.lpVtbl = &d3d11_device_vtbl;
+    device->ID3D11Device3_iface.lpVtbl = &d3d11_device_vtbl;
     device->ID3D10Device1_iface.lpVtbl = &d3d10_device1_vtbl;
     device->ID3D10Multithread_iface.lpVtbl = &d3d10_multithread_vtbl;
     device->ID3D11VideoDevice1_iface.lpVtbl = &d3d11_video_device1_vtbl;
diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c
index 9f26ef4032b..230937e33a1 100644
--- a/dlls/d3d11/inputlayout.c
+++ b/dlls/d3d11/inputlayout.c
@@ -160,7 +160,7 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_AddRef(ID3D11InputLayout *ifac

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(layout->device);
+        ID3D11Device3_AddRef(layout->device);
         wined3d_vertex_declaration_incref(layout->wined3d_decl);
     }

@@ -176,9 +176,9 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_Release(ID3D11InputLayout *ifa

if (!refcount)
     {
-        ID3D11Device2 *device = layout->device;
+        ID3D11Device3 *device = layout->device;
         wined3d_vertex_declaration_decref(layout->wined3d_decl);
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -282,7 +282,7 @@ static void STDMETHODCALLTYPE d3d10_input_layout_GetDevice(ID3D10InputLayout *if

TRACE("iface %p, device %p.\n", iface, device);

-    ID3D11Device2_QueryInterface(layout->device, &IID_ID3D10Device, (void **)device);
+    ID3D11Device3_QueryInterface(layout->device, &IID_ID3D10Device, (void **)device);
 }

static HRESULT STDMETHODCALLTYPE d3d10_input_layout_GetPrivateData(ID3D10InputLayout *iface,
@@ -377,7 +377,7 @@ static HRESULT d3d_input_layout_init(struct d3d_input_layout *layout, struct d3d
     }
     wined3d_mutex_unlock();

-    ID3D11Device2_AddRef(layout->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(layout->device = &device->ID3D11Device3_iface);

return S_OK;
 }
diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c
index 31e3aae3582..57c6b0066bd 100644
--- a/dlls/d3d11/shader.c
+++ b/dlls/d3d11/shader.c
@@ -68,7 +68,7 @@ static ULONG STDMETHODCALLTYPE d3d11_vertex_shader_AddRef(ID3D11VertexShader *if

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(shader->device);
+        ID3D11Device3_AddRef(shader->device);
         wined3d_shader_incref(shader->wined3d_shader);
     }

@@ -84,12 +84,12 @@ static ULONG STDMETHODCALLTYPE d3d11_vertex_shader_Release(ID3D11VertexShader *i

if (!refcount)
     {
-        ID3D11Device2 *device = shader->device;
+        ID3D11Device3 *device = shader->device;

wined3d_shader_decref(shader->wined3d_shader);
         /* Release the device last, it may cause the wined3d device to be
          * destroyed. */
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -194,7 +194,7 @@ static void STDMETHODCALLTYPE d3d10_vertex_shader_GetDevice(ID3D10VertexShader *

TRACE("iface %p, device %p.\n", iface, device);

-    ID3D11Device2_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device);
+    ID3D11Device3_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device);
 }

static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_GetPrivateData(ID3D10VertexShader *iface,
@@ -279,7 +279,7 @@ static HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d
     }
     wined3d_mutex_unlock();

-    ID3D11Device2_AddRef(shader->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(shader->device = &device->ID3D11Device3_iface);

return S_OK;
 }
@@ -360,7 +360,7 @@ static ULONG STDMETHODCALLTYPE d3d11_hull_shader_AddRef(ID3D11HullShader *iface)

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(shader->device);
+        ID3D11Device3_AddRef(shader->device);
         wined3d_shader_incref(shader->wined3d_shader);
     }

@@ -376,11 +376,11 @@ static ULONG STDMETHODCALLTYPE d3d11_hull_shader_Release(ID3D11HullShader *iface

if (!refcount)
     {
-        ID3D11Device2 *device = shader->device;
+        ID3D11Device3 *device = shader->device;
         wined3d_shader_decref(shader->wined3d_shader);
         /* Release the device last, it may cause the wined3d device to be
          * destroyed. */
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -476,7 +476,7 @@ static HRESULT d3d11_hull_shader_init(struct d3d11_hull_shader *shader, struct d
     }
     wined3d_mutex_unlock();

-    ID3D11Device2_AddRef(shader->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(shader->device = &device->ID3D11Device3_iface);

return S_OK;
 }
@@ -547,7 +547,7 @@ static ULONG STDMETHODCALLTYPE d3d11_domain_shader_AddRef(ID3D11DomainShader *if

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(shader->device);
+        ID3D11Device3_AddRef(shader->device);
         wined3d_shader_incref(shader->wined3d_shader);
     }

@@ -563,11 +563,11 @@ static ULONG STDMETHODCALLTYPE d3d11_domain_shader_Release(ID3D11DomainShader *i

if (!refcount)
     {
-        ID3D11Device2 *device = shader->device;
+        ID3D11Device3 *device = shader->device;
         wined3d_shader_decref(shader->wined3d_shader);
         /* Release the device last, it may cause the wined3d device to be
          * destroyed. */
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -663,7 +663,7 @@ static HRESULT d3d11_domain_shader_init(struct d3d11_domain_shader *shader, stru
     }
     wined3d_mutex_unlock();

-    ID3D11Device2_AddRef(shader->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(shader->device = &device->ID3D11Device3_iface);

return S_OK;
 }
@@ -744,7 +744,7 @@ static ULONG STDMETHODCALLTYPE d3d11_geometry_shader_AddRef(ID3D11GeometryShader

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(shader->device);
+        ID3D11Device3_AddRef(shader->device);
         wined3d_shader_incref(shader->wined3d_shader);
     }

@@ -760,11 +760,11 @@ static ULONG STDMETHODCALLTYPE d3d11_geometry_shader_Release(ID3D11GeometryShade

if (!refcount)
     {
-        ID3D11Device2 *device = shader->device;
+        ID3D11Device3 *device = shader->device;
         wined3d_shader_decref(shader->wined3d_shader);
         /* Release the device last, it may cause the wined3d device to be
          * destroyed. */
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -869,7 +869,7 @@ static void STDMETHODCALLTYPE d3d10_geometry_shader_GetDevice(ID3D10GeometryShad

TRACE("iface %p, device %p.\n", iface, device);

-    ID3D11Device2_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device);
+    ID3D11Device3_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device);
 }

static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_GetPrivateData(ID3D10GeometryShader *iface,
@@ -1148,7 +1148,7 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader,
     }
     wined3d_mutex_unlock();

-    ID3D11Device2_AddRef(shader->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(shader->device = &device->ID3D11Device3_iface);

return S_OK;
 }
@@ -1242,7 +1242,7 @@ static ULONG STDMETHODCALLTYPE d3d11_pixel_shader_AddRef(ID3D11PixelShader *ifac

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(shader->device);
+        ID3D11Device3_AddRef(shader->device);
         wined3d_shader_incref(shader->wined3d_shader);
     }

@@ -1258,11 +1258,11 @@ static ULONG STDMETHODCALLTYPE d3d11_pixel_shader_Release(ID3D11PixelShader *ifa

if (!refcount)
     {
-        ID3D11Device2 *device = shader->device;
+        ID3D11Device3 *device = shader->device;
         wined3d_shader_decref(shader->wined3d_shader);
         /* Release the device last, it may cause the wined3d device to be
          * destroyed. */
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -1367,7 +1367,7 @@ static void STDMETHODCALLTYPE d3d10_pixel_shader_GetDevice(ID3D10PixelShader *if

TRACE("iface %p, device %p.\n", iface, device);

-    ID3D11Device2_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device);
+    ID3D11Device3_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device);
 }

static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_GetPrivateData(ID3D10PixelShader *iface,
@@ -1452,7 +1452,7 @@ static HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d
     }
     wined3d_mutex_unlock();

-    ID3D11Device2_AddRef(shader->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(shader->device = &device->ID3D11Device3_iface);

return S_OK;
 }
@@ -1532,7 +1532,7 @@ static ULONG STDMETHODCALLTYPE d3d11_compute_shader_AddRef(ID3D11ComputeShader *

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(shader->device);
+        ID3D11Device3_AddRef(shader->device);
         wined3d_shader_incref(shader->wined3d_shader);
     }

@@ -1548,11 +1548,11 @@ static ULONG STDMETHODCALLTYPE d3d11_compute_shader_Release(ID3D11ComputeShader

if (!refcount)
     {
-        ID3D11Device2 *device = shader->device;
+        ID3D11Device3 *device = shader->device;
         wined3d_shader_decref(shader->wined3d_shader);
         /* Release the device last, it may cause the wined3d device to be
          * destroyed. */
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -1647,7 +1647,7 @@ static HRESULT d3d11_compute_shader_init(struct d3d11_compute_shader *shader, st
     }
     wined3d_mutex_unlock();

-    ID3D11Device2_AddRef(shader->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(shader->device = &device->ID3D11Device3_iface);

return S_OK;
 }
@@ -1727,12 +1727,12 @@ static ULONG STDMETHODCALLTYPE d3d11_class_linkage_Release(ID3D11ClassLinkage *i

if (!refcount)
     {
-        ID3D11Device2 *device = class_linkage->device;
+        ID3D11Device3 *device = class_linkage->device;

wined3d_private_store_cleanup(&class_linkage->private_store);
         free(class_linkage);

-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -1826,7 +1826,7 @@ HRESULT d3d11_class_linkage_create(struct d3d_device *device, struct d3d11_class
     object->refcount = 1;
     wined3d_private_store_init(&object->private_store);

-    ID3D11Device2_AddRef(object->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(object->device = &device->ID3D11Device3_iface);

TRACE("Created class linkage %p.\n", object);
     *class_linkage = object;
diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c
index 4f3d9f2bc94..880dfb71e1e 100644
--- a/dlls/d3d11/state.c
+++ b/dlls/d3d11/state.c
@@ -64,7 +64,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState1 *iface

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(state->device);
+        ID3D11Device3_AddRef(state->device);
         wined3d_blend_state_incref(state->wined3d_state);
     }

@@ -80,9 +80,9 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState1 *ifac

if (!refcount)
     {
-        ID3D11Device2 *device = state->device;
+        ID3D11Device3 *device = state->device;
         wined3d_blend_state_decref(state->wined3d_state);
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -223,7 +223,7 @@ static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState1 *ifa

TRACE("iface %p, device %p.\n", iface, device);

-    ID3D11Device2_QueryInterface(state->device, &IID_ID3D10Device, (void **)device);
+    ID3D11Device3_QueryInterface(state->device, &IID_ID3D10Device, (void **)device);
 }

static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendState1 *iface,
@@ -321,7 +321,7 @@ static const struct ID3D10BlendState1Vtbl d3d10_blend_state_vtbl =
 static void STDMETHODCALLTYPE d3d_blend_state_wined3d_object_destroyed(void *parent)
 {
     struct d3d_blend_state *state = parent;
-    struct d3d_device *device = impl_from_ID3D11Device2(state->device);
+    struct d3d_device *device = impl_from_ID3D11Device3(state->device);

wine_rb_remove(&device->blend_states, &state->entry);
     wined3d_private_store_cleanup(&state->private_store);
@@ -458,7 +458,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC
     }
     wined3d_mutex_unlock();

-    ID3D11Device2_AddRef(object->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(object->device = &device->ID3D11Device3_iface);

TRACE("Created blend state %p.\n", object);
     *state = object;
@@ -525,7 +525,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_AddRef(ID3D11DepthStenci

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(state->device);
+        ID3D11Device3_AddRef(state->device);
         wined3d_depth_stencil_state_incref(state->wined3d_state);
     }

@@ -541,10 +541,10 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStenc

if (!refcount)
     {
-        ID3D11Device2 *device = state->device;
+        ID3D11Device3 *device = state->device;

wined3d_depth_stencil_state_decref(state->wined3d_state);
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -661,7 +661,7 @@ static void STDMETHODCALLTYPE d3d10_depthstencil_state_GetDevice(ID3D10DepthSten

TRACE("iface %p, device %p.\n", iface, device);

-    ID3D11Device2_QueryInterface(state->device, &IID_ID3D10Device, (void **)device);
+    ID3D11Device3_QueryInterface(state->device, &IID_ID3D10Device, (void **)device);
 }

static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_GetPrivateData(ID3D10DepthStencilState *iface,
@@ -726,7 +726,7 @@ static const struct ID3D10DepthStencilStateVtbl d3d10_depthstencil_state_vtbl =
 static void STDMETHODCALLTYPE d3d_depthstencil_state_wined3d_object_destroyed(void *parent)
 {
     struct d3d_depthstencil_state *state = parent;
-    struct d3d_device *device = impl_from_ID3D11Device2(state->device);
+    struct d3d_device *device = impl_from_ID3D11Device3(state->device);

wine_rb_remove(&device->depthstencil_states, &state->entry);
     wined3d_private_store_cleanup(&state->private_store);
@@ -859,7 +859,7 @@ HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEP
     }
     wined3d_mutex_unlock();

-    ID3D11Device2_AddRef(object->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(object->device = &device->ID3D11Device3_iface);

TRACE("Created depth/stencil state %p.\n", object);
     *state = object;
@@ -932,7 +932,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_AddRef(ID3D11RasterizerSta

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(state->device);
+        ID3D11Device3_AddRef(state->device);
         wined3d_rasterizer_state_incref(state->wined3d_state);
     }

@@ -948,9 +948,9 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerSt

if (!refcount)
     {
-        ID3D11Device2 *device = state->device;
+        ID3D11Device3 *device = state->device;
         wined3d_rasterizer_state_decref(state->wined3d_state);
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -1079,7 +1079,7 @@ static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDevice(ID3D10RasterizerS

TRACE("iface %p, device %p.\n", iface, device);

-    ID3D11Device2_QueryInterface(state->device, &IID_ID3D10Device, (void **)device);
+    ID3D11Device3_QueryInterface(state->device, &IID_ID3D10Device, (void **)device);
 }

static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_GetPrivateData(ID3D10RasterizerState *iface,
@@ -1144,7 +1144,7 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl =
 static void STDMETHODCALLTYPE d3d_rasterizer_state_wined3d_object_destroyed(void *parent)
 {
     struct d3d_rasterizer_state *state = parent;
-    struct d3d_device *device = impl_from_ID3D11Device2(state->device);
+    struct d3d_device *device = impl_from_ID3D11Device3(state->device);

wine_rb_remove(&device->rasterizer_states, &state->entry);
     wined3d_private_store_cleanup(&state->private_store);
@@ -1220,7 +1220,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str
         return hr;
     }

-    ID3D11Device2_AddRef(state->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(state->device = &device->ID3D11Device3_iface);

return S_OK;
 }
@@ -1330,7 +1330,7 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_AddRef(ID3D11SamplerState *if

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(state->device);
+        ID3D11Device3_AddRef(state->device);
         wined3d_sampler_incref(state->wined3d_sampler);
     }

@@ -1346,9 +1346,9 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_Release(ID3D11SamplerState *i

if (!refcount)
     {
-        ID3D11Device2 *device = state->device;
+        ID3D11Device3 *device = state->device;
         wined3d_sampler_decref(state->wined3d_sampler);
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -1465,7 +1465,7 @@ static void STDMETHODCALLTYPE d3d10_sampler_state_GetDevice(ID3D10SamplerState *

TRACE("iface %p, device %p.\n", iface, device);

-    ID3D11Device2_QueryInterface(state->device, &IID_ID3D10Device, (void **)device);
+    ID3D11Device3_QueryInterface(state->device, &IID_ID3D10Device, (void **)device);
 }

static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_GetPrivateData(ID3D10SamplerState *iface,
@@ -1530,7 +1530,7 @@ static const struct ID3D10SamplerStateVtbl d3d10_sampler_state_vtbl =
 static void STDMETHODCALLTYPE d3d_sampler_wined3d_object_destroyed(void *parent)
 {
     struct d3d_sampler_state *state = parent;
-    struct d3d_device *device = impl_from_ID3D11Device2(state->device);
+    struct d3d_device *device = impl_from_ID3D11Device3(state->device);

wine_rb_remove(&device->sampler_states, &state->entry);
     wined3d_private_store_cleanup(&state->private_store);
@@ -1619,7 +1619,7 @@ static HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3
         return hr;
     }

-    ID3D11Device2_AddRef(state->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(state->device = &device->ID3D11Device3_iface);

return S_OK;
 }
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 10f29d38bb5..98f9f96a7e4 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -2367,7 +2367,6 @@ static void test_device_interfaces(const D3D_FEATURE_LEVEL feature_level)
     check_interface(device, &IID_IUnknown, TRUE, FALSE);
     check_interface(device, &IID_ID3D11Device, TRUE, FALSE);
     check_interface(device, &IID_ID3D11Device2, TRUE, TRUE); /* Not available on all Windows versions. */
-    todo_wine
     check_interface(device, &IID_ID3D11Device3, TRUE, TRUE); /* Not available on all Windows versions. */
     todo_wine
     check_interface(device, &IID_ID3D11Device4, TRUE, TRUE); /* Not available on all Windows versions. */
diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c
index 1221fa035ba..17cc70814c7 100644
--- a/dlls/d3d11/texture.c
+++ b/dlls/d3d11/texture.c
@@ -75,7 +75,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture1d_AddRef(ID3D11Texture1D *iface)

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(texture->device);
+        ID3D11Device3_AddRef(texture->device);
         wined3d_texture_incref(texture->wined3d_texture);
     }

@@ -91,11 +91,11 @@ static ULONG STDMETHODCALLTYPE d3d11_texture1d_Release(ID3D11Texture1D *iface)

if (!refcount)
     {
-        ID3D11Device2 *device = texture->device;
+        ID3D11Device3 *device = texture->device;
         wined3d_texture_decref(texture->wined3d_texture);
         /* Release the device last, it may cause the wined3d device to be
          * destroyed. */
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -272,7 +272,7 @@ static void STDMETHODCALLTYPE d3d10_texture1d_GetDevice(ID3D10Texture1D *iface,

TRACE("iface %p, device %p.\n", iface, device);

-    ID3D11Device2_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device);
+    ID3D11Device3_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device);
 }

static HRESULT STDMETHODCALLTYPE d3d10_texture1d_GetPrivateData(ID3D10Texture1D *iface,
@@ -501,7 +501,7 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE
     }
     wined3d_mutex_unlock();

-    ID3D11Device2_AddRef(texture->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(texture->device = &device->ID3D11Device3_iface);

TRACE("Created texture %p.\n", texture);
     *out = texture;
@@ -556,7 +556,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_AddRef(ID3D11Texture2D *iface)

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(texture->device);
+        ID3D11Device3_AddRef(texture->device);
         wined3d_texture_incref(texture->wined3d_texture);
         if (texture->swapchain)
             wined3d_swapchain_incref(texture->swapchain);
@@ -574,7 +574,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_Release(ID3D11Texture2D *iface)

if (!refcount)
     {
-        ID3D11Device2 *device = texture->device;
+        ID3D11Device3 *device = texture->device;
         if (texture->swapchain)
             wined3d_swapchain_decref(texture->swapchain);
         /* Releasing the texture may free the d3d11 object, so do not access it
@@ -582,7 +582,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_Release(ID3D11Texture2D *iface)
         wined3d_texture_decref(texture->wined3d_texture);
         /* Release the device last, it may cause the wined3d device to be
          * destroyed. */
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -773,7 +773,7 @@ static void STDMETHODCALLTYPE d3d10_texture2d_GetDevice(ID3D10Texture2D *iface,

TRACE("iface %p, device %p.\n", iface, device);

-    ID3D11Device2_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device);
+    ID3D11Device3_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device);
 }

static HRESULT STDMETHODCALLTYPE d3d10_texture2d_GetPrivateData(ID3D10Texture2D *iface,
@@ -1046,7 +1046,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE
     }
     wined3d_mutex_unlock();

-    ID3D11Device2_AddRef(texture->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(texture->device = &device->ID3D11Device3_iface);

TRACE("Created texture %p.\n", texture);
     *out = texture;
@@ -1106,7 +1106,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_AddRef(ID3D11Texture3D *iface)

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(texture->device);
+        ID3D11Device3_AddRef(texture->device);
         wined3d_texture_incref(texture->wined3d_texture);
     }

@@ -1131,12 +1131,12 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_Release(ID3D11Texture3D *iface)

if (!refcount)
     {
-        ID3D11Device2 *device = texture->device;
+        ID3D11Device3 *device = texture->device;

wined3d_texture_decref(texture->wined3d_texture);
         /* Release the device last, it may cause the wined3d device to be
          * destroyed. */
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -1294,7 +1294,7 @@ static void STDMETHODCALLTYPE d3d10_texture3d_GetDevice(ID3D10Texture3D *iface,

TRACE("iface %p, device %p.\n", iface, device);

-    ID3D11Device2_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device);
+    ID3D11Device3_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device);
 }

static HRESULT STDMETHODCALLTYPE d3d10_texture3d_GetPrivateData(ID3D10Texture3D *iface,
@@ -1506,7 +1506,7 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi
     wined3d_mutex_unlock();
     texture->desc.MipLevels = levels;

-    ID3D11Device2_AddRef(texture->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(texture->device = &device->ID3D11Device3_iface);

return S_OK;
 }
diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c
index ea7d6c5563c..4f2ec997c83 100644
--- a/dlls/d3d11/view.c
+++ b/dlls/d3d11/view.c
@@ -962,7 +962,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_AddRef(ID3D11DepthStencil

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(view->device);
+        ID3D11Device3_AddRef(view->device);
         wined3d_rendertarget_view_incref(view->wined3d_view);
     }

@@ -978,9 +978,9 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStenci

if (!refcount)
     {
-        ID3D11Device2 *device = view->device;
+        ID3D11Device3 *device = view->device;
         wined3d_rendertarget_view_decref(view->wined3d_view);
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -1110,7 +1110,7 @@ static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetDevice(ID3D10DepthStenc

TRACE("iface %p, device %p.\n", iface, device);

-    ID3D11Device2_QueryInterface(view->device, &IID_ID3D10Device, (void **)device);
+    ID3D11Device3_QueryInterface(view->device, &IID_ID3D10Device, (void **)device);
 }

static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_GetPrivateData(ID3D10DepthStencilView *iface,
@@ -1307,7 +1307,7 @@ static HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, st
     wined3d_private_store_init(&view->private_store);
     wined3d_mutex_unlock();
     view->resource = resource;
-    ID3D11Device2_AddRef(view->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(view->device = &device->ID3D11Device3_iface);

return S_OK;
 }
@@ -1400,7 +1400,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_AddRef(ID3D11RenderTarget

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(view->device);
+        ID3D11Device3_AddRef(view->device);
         wined3d_rendertarget_view_incref(view->wined3d_view);
     }

@@ -1416,9 +1416,9 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_Release(ID3D11RenderTarge

if (!refcount)
     {
-        ID3D11Device2 *device = view->device;
+        ID3D11Device3 *device = view->device;
         wined3d_rendertarget_view_decref(view->wined3d_view);
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -1548,7 +1548,7 @@ static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDevice(ID3D10RenderTarg

TRACE("iface %p, device %p.\n", iface, device);

-    ID3D11Device2_QueryInterface(view->device, &IID_ID3D10Device, (void **)device);
+    ID3D11Device3_QueryInterface(view->device, &IID_ID3D10Device, (void **)device);
 }

static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_GetPrivateData(ID3D10RenderTargetView *iface,
@@ -1748,7 +1748,7 @@ static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, st
     wined3d_private_store_init(&view->private_store);
     wined3d_mutex_unlock();
     view->resource = resource;
-    ID3D11Device2_AddRef(view->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(view->device = &device->ID3D11Device3_iface);

return S_OK;
 }
@@ -1842,7 +1842,7 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_AddRef(ID3D11ShaderRes

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(view->device);
+        ID3D11Device3_AddRef(view->device);
         wined3d_shader_resource_view_incref(view->wined3d_view);
     }

@@ -1858,9 +1858,9 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe

if (!refcount)
     {
-        ID3D11Device2 *device = view->device;
+        ID3D11Device3 *device = view->device;
         wined3d_shader_resource_view_decref(view->wined3d_view);
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -1991,7 +1991,7 @@ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDevice(ID3D10ShaderR

TRACE("iface %p, device %p.\n", iface, device);

-    ID3D11Device2_QueryInterface(view->device, &IID_ID3D10Device, (void **)device);
+    ID3D11Device3_QueryInterface(view->device, &IID_ID3D10Device, (void **)device);
 }

static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_GetPrivateData(ID3D10ShaderResourceView1 *iface,
@@ -2242,7 +2242,7 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi
     wined3d_private_store_init(&view->private_store);
     wined3d_mutex_unlock();
     view->resource = resource;
-    ID3D11Device2_AddRef(view->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(view->device = &device->ID3D11Device3_iface);

return S_OK;
 }
@@ -2321,7 +2321,7 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_AddRef(ID3D11Unordere

if (refcount == 1)
     {
-        ID3D11Device2_AddRef(view->device);
+        ID3D11Device3_AddRef(view->device);
         wined3d_unordered_access_view_incref(view->wined3d_view);
     }

@@ -2337,9 +2337,9 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_Release(ID3D11Unorder

if (!refcount)
     {
-        ID3D11Device2 *device = view->device;
+        ID3D11Device3 *device = view->device;
         wined3d_unordered_access_view_decref(view->wined3d_view);
-        ID3D11Device2_Release(device);
+        ID3D11Device3_Release(device);
     }

return refcount;
@@ -2545,7 +2545,7 @@ static HRESULT d3d11_unordered_access_view_init(struct d3d11_unordered_access_vi
     wined3d_private_store_init(&view->private_store);
     wined3d_mutex_unlock();
     view->resource = resource;
-    ID3D11Device2_AddRef(view->device = &device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(view->device = &device->ID3D11Device3_iface);

return S_OK;
 }
@@ -2626,7 +2626,7 @@ static ULONG STDMETHODCALLTYPE d3d11_video_decoder_output_view_Release(ID3D11Vid
     if (!refcount)
     {
         wined3d_decoder_output_view_decref(view->wined3d_view);
-        ID3D11Device2_Release(&view->device->ID3D11Device2_iface);
+        ID3D11Device3_Release(&view->device->ID3D11Device3_iface);
         wined3d_private_store_cleanup(&view->private_store);
         free(view);
     }
@@ -2769,7 +2769,7 @@ static HRESULT d3d_video_decoder_output_view_init(struct d3d_video_decoder_outpu
     wined3d_mutex_unlock();
     view->resource = resource;
     view->device = device;
-    ID3D11Device2_AddRef(&device->ID3D11Device2_iface);
+    ID3D11Device3_AddRef(&device->ID3D11Device3_iface);

return S_OK;
 }