ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d11: Add ID3D11Device2 stub. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-05-16 11:55:27 +02:00 committed by Alexandre Julliard
parent ce12b09159
commit bf293b70c9
10 changed files with 264 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/d3d11/async.c
View File

@ -74,7 +74,7 @@ static ULONG STDMETHODCALLTYPE d3d11_query_AddRef(ID3D11Query *iface)
if (refcount == 1)
{
ID3D11Device1_AddRef(query->device);
ID3D11Device2_AddRef(query->device);
wined3d_mutex_lock();
wined3d_query_incref(query->wined3d_query);
wined3d_mutex_unlock();
@ -92,13 +92,13 @@ static ULONG STDMETHODCALLTYPE d3d11_query_Release(ID3D11Query *iface)
if (!refcount)
{
ID3D11Device1 *device = query->device;
ID3D11Device2 *device = query->device;
wined3d_mutex_lock();
wined3d_query_decref(query->wined3d_query);
wined3d_mutex_unlock();
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -254,7 +254,7 @@ static void STDMETHODCALLTYPE d3d10_query_GetDevice(ID3D10Query *iface, ID3D10De
TRACE("iface %p, device %p.\n", iface, device);
ID3D11Device1_QueryInterface(query->device, &IID_ID3D10Device, (void **)device);
ID3D11Device2_QueryInterface(query->device, &IID_ID3D10Device, (void **)device);
}
static HRESULT STDMETHODCALLTYPE d3d10_query_GetPrivateData(ID3D10Query *iface,
@ -470,8 +470,7 @@ static HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device
wined3d_mutex_unlock();
query->predicate = predicate;
query->device = &device->ID3D11Device1_iface;
ID3D11Device1_AddRef(query->device);
ID3D11Device2_AddRef(query->device = &device->ID3D11Device2_iface);
return S_OK;
}

11
dlls/d3d11/buffer.c
View File

@ -71,7 +71,7 @@ static ULONG STDMETHODCALLTYPE d3d11_buffer_AddRef(ID3D11Buffer *iface)
if (refcount == 1)
{
ID3D11Device1_AddRef(buffer->device);
ID3D11Device2_AddRef(buffer->device);
wined3d_mutex_lock();
wined3d_buffer_incref(buffer->wined3d_buffer);
wined3d_mutex_unlock();
@ -89,14 +89,14 @@ static ULONG STDMETHODCALLTYPE d3d11_buffer_Release(ID3D11Buffer *iface)
if (!refcount)
{
ID3D11Device1 *device = buffer->device;
ID3D11Device2 *device = buffer->device;
wined3d_mutex_lock();
wined3d_buffer_decref(buffer->wined3d_buffer);
wined3d_mutex_unlock();
/* Release the device last, it may cause the wined3d device to be
* destroyed. */
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -242,7 +242,7 @@ static void STDMETHODCALLTYPE d3d10_buffer_GetDevice(ID3D10Buffer *iface, ID3D10
TRACE("iface %p, device %p.\n", iface, device);
ID3D11Device1_QueryInterface(buffer->device, &IID_ID3D10Device, (void **)device);
ID3D11Device2_QueryInterface(buffer->device, &IID_ID3D10Device, (void **)device);
}
static HRESULT STDMETHODCALLTYPE d3d10_buffer_GetPrivateData(ID3D10Buffer *iface,
@ -470,8 +470,7 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev
}
wined3d_mutex_unlock();
buffer->device = &device->ID3D11Device1_iface;
ID3D11Device1_AddRef(buffer->device);
ID3D11Device2_AddRef(buffer->device = &device->ID3D11Device2_iface);
return S_OK;
}

48
dlls/d3d11/d3d11_private.h
View File

@ -125,7 +125,7 @@ struct d3d_texture1d
IUnknown *dxgi_surface;
struct wined3d_texture *wined3d_texture;
D3D11_TEXTURE1D_DESC desc;
ID3D11Device1 *device;
ID3D11Device2 *device;
};
HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DESC *desc,
@ -144,7 +144,7 @@ struct d3d_texture2d
IUnknown *dxgi_surface;
struct wined3d_texture *wined3d_texture;
D3D11_TEXTURE2D_DESC desc;
ID3D11Device1 *device;
ID3D11Device2 *device;
};
static inline struct d3d_texture2d *impl_from_ID3D11Texture2D(ID3D11Texture2D *iface)
@ -167,7 +167,7 @@ struct d3d_texture3d
struct wined3d_private_store private_store;
struct wined3d_texture *wined3d_texture;
D3D11_TEXTURE3D_DESC desc;
ID3D11Device1 *device;
ID3D11Device2 *device;
};
HRESULT d3d_texture3d_create(struct d3d_device *device, const D3D11_TEXTURE3D_DESC *desc,
@ -185,7 +185,7 @@ struct d3d_buffer
struct wined3d_private_store private_store;
struct wined3d_buffer *wined3d_buffer;
D3D11_BUFFER_DESC desc;
ID3D11Device1 *device;
ID3D11Device2 *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;
ID3D11Device1 *device;
ID3D11Device2 *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;
ID3D11Device1 *device;
ID3D11Device2 *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;
ID3D11Device1 *device;
ID3D11Device2 *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;
ID3D11Device1 *device;
ID3D11Device2 *device;
};
HRESULT d3d11_unordered_access_view_create(struct d3d_device *device, ID3D11Resource *resource,
@ -279,7 +279,7 @@ struct d3d_input_layout
struct wined3d_private_store private_store;
struct wined3d_vertex_declaration *wined3d_decl;
ID3D11Device1 *device;
ID3D11Device2 *device;
};
HRESULT d3d_input_layout_create(struct d3d_device *device,
@ -298,7 +298,7 @@ struct d3d_vertex_shader
struct wined3d_private_store private_store;
struct wined3d_shader *wined3d_shader;
ID3D11Device1 *device;
ID3D11Device2 *device;
};
HRESULT d3d_vertex_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length,
@ -314,7 +314,7 @@ struct d3d11_hull_shader
struct wined3d_private_store private_store;
struct wined3d_shader *wined3d_shader;
ID3D11Device1 *device;
ID3D11Device2 *device;
};
HRESULT d3d11_hull_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length,
@ -329,7 +329,7 @@ struct d3d11_domain_shader
struct wined3d_private_store private_store;
struct wined3d_shader *wined3d_shader;
ID3D11Device1 *device;
ID3D11Device2 *device;
};
HRESULT d3d11_domain_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length,
@ -345,7 +345,7 @@ struct d3d_geometry_shader
struct wined3d_private_store private_store;
struct wined3d_shader *wined3d_shader;
ID3D11Device1 *device;
ID3D11Device2 *device;
};
HRESULT d3d_geometry_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length,
@ -364,7 +364,7 @@ struct d3d_pixel_shader
struct wined3d_private_store private_store;
struct wined3d_shader *wined3d_shader;
ID3D11Device1 *device;
ID3D11Device2 *device;
};
HRESULT d3d_pixel_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length,
@ -380,7 +380,7 @@ struct d3d11_compute_shader
struct wined3d_private_store private_store;
struct wined3d_shader *wined3d_shader;
ID3D11Device1 *device;
ID3D11Device2 *device;
};
HRESULT d3d11_compute_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length,
@ -400,7 +400,7 @@ struct d3d11_class_linkage
LONG refcount;
struct wined3d_private_store private_store;
ID3D11Device1 *device;
ID3D11Device2 *device;
};
HRESULT d3d11_class_linkage_create(struct d3d_device *device,
@ -417,7 +417,7 @@ struct d3d_blend_state
struct wined3d_blend_state *wined3d_state;
D3D11_BLEND_DESC desc;
struct wine_rb_entry entry;
ID3D11Device1 *device;
ID3D11Device2 *device;
};
static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendState *iface)
@ -440,7 +440,7 @@ struct d3d_depthstencil_state
struct wined3d_private_store private_store;
D3D11_DEPTH_STENCIL_DESC desc;
struct wine_rb_entry entry;
ID3D11Device1 *device;
ID3D11Device2 *device;
};
static inline struct d3d_depthstencil_state *impl_from_ID3D11DepthStencilState(ID3D11DepthStencilState *iface)
@ -466,7 +466,7 @@ struct d3d_rasterizer_state
struct wined3d_rasterizer_state *wined3d_state;
D3D11_RASTERIZER_DESC desc;
struct wine_rb_entry entry;
ID3D11Device1 *device;
ID3D11Device2 *device;
};
HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc,
@ -485,7 +485,7 @@ struct d3d_sampler_state
struct wined3d_sampler *wined3d_sampler;
D3D11_SAMPLER_DESC desc;
struct wine_rb_entry entry;
ID3D11Device1 *device;
ID3D11Device2 *device;
};
HRESULT d3d_sampler_state_create(struct d3d_device *device, const D3D11_SAMPLER_DESC *desc,
@ -504,7 +504,7 @@ struct d3d_query
struct wined3d_query *wined3d_query;
BOOL predicate;
D3D11_QUERY_DESC desc;
ID3D11Device1 *device;
ID3D11Device2 *device;
};
HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc, BOOL predicate,
@ -526,7 +526,7 @@ struct d3d11_immediate_context
struct d3d_device
{
IUnknown IUnknown_inner;
ID3D11Device1 ID3D11Device1_iface;
ID3D11Device2 ID3D11Device2_iface;
ID3D10Device1 ID3D10Device1_iface;
ID3D10Multithread ID3D10Multithread_iface;
IWineDXGIDeviceParent IWineDXGIDeviceParent_iface;
@ -550,9 +550,9 @@ struct d3d_device
UINT stencil_ref;
};
static inline struct d3d_device *impl_from_ID3D11Device1(ID3D11Device1 *iface)
static inline struct d3d_device *impl_from_ID3D11Device2(ID3D11Device2 *iface)
{
return CONTAINING_RECORD(iface, struct d3d_device, ID3D11Device1_iface);
return CONTAINING_RECORD(iface, struct d3d_device, ID3D11Device2_iface);
}
static inline struct d3d_device *impl_from_ID3D10Device(ID3D10Device1 *iface)

238
dlls/d3d11/device.c
View File

@ -75,7 +75,7 @@ static ULONG STDMETHODCALLTYPE d3d11_immediate_context_AddRef(ID3D11DeviceContex
if (refcount == 1)
{
ID3D11Device1_AddRef(&device->ID3D11Device1_iface);
ID3D11Device2_AddRef(&device->ID3D11Device2_iface);
}
return refcount;
@ -91,7 +91,7 @@ static ULONG STDMETHODCALLTYPE d3d11_immediate_context_Release(ID3D11DeviceConte
if (!refcount)
{
ID3D11Device1_Release(&device->ID3D11Device1_iface);
ID3D11Device2_Release(&device->ID3D11Device2_iface);
}
return refcount;
@ -103,7 +103,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GetDevice(ID3D11DeviceCont
TRACE("iface %p, device %p.\n", iface, device);
*device = (ID3D11Device *)&device_object->ID3D11Device1_iface;
*device = (ID3D11Device *)&device_object->ID3D11Device2_iface;
ID3D11Device_AddRef(*device);
}
@ -2900,7 +2900,7 @@ static void d3d11_immediate_context_init(struct d3d11_immediate_context *context
context->ID3D11DeviceContext1_iface.lpVtbl = &d3d11_immediate_context_vtbl;
context->refcount = 1;
ID3D11Device1_AddRef(&device->ID3D11Device1_iface);
ID3D11Device2_AddRef(&device->ID3D11Device2_iface);
wined3d_private_store_init(&context->private_store);
}
@ -2912,28 +2912,28 @@ static void d3d11_immediate_context_destroy(struct d3d11_immediate_context *cont
/* ID3D11Device methods */
static HRESULT STDMETHODCALLTYPE d3d11_device_QueryInterface(ID3D11Device1 *iface, REFIID riid, void **out)
static HRESULT STDMETHODCALLTYPE d3d11_device_QueryInterface(ID3D11Device2 *iface, REFIID riid, void **out)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
return IUnknown_QueryInterface(device->outer_unk, riid, out);
}
static ULONG STDMETHODCALLTYPE d3d11_device_AddRef(ID3D11Device1 *iface)
static ULONG STDMETHODCALLTYPE d3d11_device_AddRef(ID3D11Device2 *iface)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
return IUnknown_AddRef(device->outer_unk);
}
static ULONG STDMETHODCALLTYPE d3d11_device_Release(ID3D11Device1 *iface)
static ULONG STDMETHODCALLTYPE d3d11_device_Release(ID3D11Device2 *iface)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
return IUnknown_Release(device->outer_unk);
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBuffer(ID3D11Device1 *iface, const D3D11_BUFFER_DESC *desc,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBuffer(ID3D11Device2 *iface, const D3D11_BUFFER_DESC *desc,
const D3D11_SUBRESOURCE_DATA *data, ID3D11Buffer **buffer)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d_buffer *object;
HRESULT hr;
@ -2947,10 +2947,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBuffer(ID3D11Device1 *iface,
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture1D(ID3D11Device1 *iface,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture1D(ID3D11Device2 *iface,
const D3D11_TEXTURE1D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, ID3D11Texture1D **texture)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d_texture1d *object;
HRESULT hr;
@ -2964,10 +2964,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture1D(ID3D11Device1 *ifa
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture2D(ID3D11Device1 *iface,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture2D(ID3D11Device2 *iface,
const D3D11_TEXTURE2D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, ID3D11Texture2D **texture)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d_texture2d *object;
HRESULT hr;
@ -2981,10 +2981,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture2D(ID3D11Device1 *ifa
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture3D(ID3D11Device1 *iface,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture3D(ID3D11Device2 *iface,
const D3D11_TEXTURE3D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, ID3D11Texture3D **texture)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d_texture3d *object;
HRESULT hr;
@ -2998,10 +2998,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture3D(ID3D11Device1 *ifa
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateShaderResourceView(ID3D11Device1 *iface,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateShaderResourceView(ID3D11Device2 *iface,
ID3D11Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11ShaderResourceView **view)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d_shader_resource_view *object;
HRESULT hr;
@ -3018,10 +3018,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateShaderResourceView(ID3D11Dev
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateUnorderedAccessView(ID3D11Device1 *iface,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateUnorderedAccessView(ID3D11Device2 *iface,
ID3D11Resource *resource, const D3D11_UNORDERED_ACCESS_VIEW_DESC *desc, ID3D11UnorderedAccessView **view)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d11_unordered_access_view *object;
HRESULT hr;
@ -3035,10 +3035,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateUnorderedAccessView(ID3D11De
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Device1 *iface,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Device2 *iface,
ID3D11Resource *resource, const D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11RenderTargetView **view)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d_rendertarget_view *object;
HRESULT hr;
@ -3055,10 +3055,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Devic
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilView(ID3D11Device1 *iface,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilView(ID3D11Device2 *iface,
ID3D11Resource *resource, const D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11DepthStencilView **view)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d_depthstencil_view *object;
HRESULT hr;
@ -3072,11 +3072,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilView(ID3D11Devic
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateInputLayout(ID3D11Device1 *iface,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateInputLayout(ID3D11Device2 *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_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d_input_layout *object;
HRESULT hr;
@ -3093,10 +3093,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateInputLayout(ID3D11Device1 *i
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateVertexShader(ID3D11Device1 *iface, const void *byte_code,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateVertexShader(ID3D11Device2 *iface, const void *byte_code,
SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11VertexShader **shader)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d_vertex_shader *object;
HRESULT hr;
@ -3114,10 +3114,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateVertexShader(ID3D11Device1 *
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShader(ID3D11Device1 *iface, const void *byte_code,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShader(ID3D11Device2 *iface, const void *byte_code,
SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11GeometryShader **shader)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d_geometry_shader *object;
HRESULT hr;
@ -3136,12 +3136,12 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShader(ID3D11Device1
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShaderWithStreamOutput(ID3D11Device1 *iface,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShaderWithStreamOutput(ID3D11Device2 *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_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d_geometry_shader *object;
HRESULT hr;
@ -3165,10 +3165,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShaderWithStreamOutp
return hr;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePixelShader(ID3D11Device1 *iface, const void *byte_code,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePixelShader(ID3D11Device2 *iface, const void *byte_code,
SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11PixelShader **shader)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d_pixel_shader *object;
HRESULT hr;
@ -3186,10 +3186,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePixelShader(ID3D11Device1 *i
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateHullShader(ID3D11Device1 *iface, const void *byte_code,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateHullShader(ID3D11Device2 *iface, const void *byte_code,
SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11HullShader **shader)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d11_hull_shader *object;
HRESULT hr;
@ -3207,10 +3207,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateHullShader(ID3D11Device1 *if
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device1 *iface, const void *byte_code,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device2 *iface, const void *byte_code,
SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11DomainShader **shader)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d11_domain_shader *object;
HRESULT hr;
@ -3228,10 +3228,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device1 *
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device1 *iface, const void *byte_code,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device2 *iface, const void *byte_code,
SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11ComputeShader **shader)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d11_compute_shader *object;
HRESULT hr;
@ -3249,10 +3249,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device1
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateClassLinkage(ID3D11Device1 *iface,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateClassLinkage(ID3D11Device2 *iface,
ID3D11ClassLinkage **class_linkage)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d11_class_linkage *object;
HRESULT hr;
@ -3266,10 +3266,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateClassLinkage(ID3D11Device1 *
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device1 *iface,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device2 *iface,
const D3D11_BLEND_DESC *desc, ID3D11BlendState **blend_state)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d_blend_state *object;
HRESULT hr;
@ -3283,10 +3283,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device1 *if
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilState(ID3D11Device1 *iface,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilState(ID3D11Device2 *iface,
const D3D11_DEPTH_STENCIL_DESC *desc, ID3D11DepthStencilState **depth_stencil_state)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d_depthstencil_state *object;
HRESULT hr;
@ -3300,10 +3300,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilState(ID3D11Devi
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device1 *iface,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device2 *iface,
const D3D11_RASTERIZER_DESC *desc, ID3D11RasterizerState **rasterizer_state)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d_rasterizer_state *object;
HRESULT hr;
@ -3317,10 +3317,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateSamplerState(ID3D11Device1 *iface,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateSamplerState(ID3D11Device2 *iface,
const D3D11_SAMPLER_DESC *desc, ID3D11SamplerState **sampler_state)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d_sampler_state *object;
HRESULT hr;
@ -3334,10 +3334,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateSamplerState(ID3D11Device1 *
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateQuery(ID3D11Device1 *iface,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateQuery(ID3D11Device2 *iface,
const D3D11_QUERY_DESC *desc, ID3D11Query **query)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d_query *object;
HRESULT hr;
@ -3356,10 +3356,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateQuery(ID3D11Device1 *iface,
return S_FALSE;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePredicate(ID3D11Device1 *iface, const D3D11_QUERY_DESC *desc,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePredicate(ID3D11Device2 *iface, const D3D11_QUERY_DESC *desc,
ID3D11Predicate **predicate)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct d3d_query *object;
HRESULT hr;
@ -3378,7 +3378,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePredicate(ID3D11Device1 *ifa
return S_FALSE;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateCounter(ID3D11Device1 *iface, const D3D11_COUNTER_DESC *desc,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateCounter(ID3D11Device2 *iface, const D3D11_COUNTER_DESC *desc,
ID3D11Counter **counter)
{
FIXME("iface %p, desc %p, counter %p stub!\n", iface, desc, counter);
@ -3386,7 +3386,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateCounter(ID3D11Device1 *iface
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device1 *iface, UINT flags,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device2 *iface, UINT flags,
ID3D11DeviceContext **context)
{
FIXME("iface %p, flags %#x, context %p stub!\n", iface, flags, context);
@ -3394,7 +3394,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource(ID3D11Device1 *iface, HANDLE resource, REFIID riid,
static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource(ID3D11Device2 *iface, HANDLE resource, REFIID riid,
void **out)
{
FIXME("iface %p, resource %p, riid %s, out %p stub!\n", iface, resource, debugstr_guid(riid), out);
@ -3402,10 +3402,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource(ID3D11Device1 *
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device1 *iface, DXGI_FORMAT format,
static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 *iface, DXGI_FORMAT format,
UINT *format_support)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct wined3d_device_creation_parameters params;
enum wined3d_format_id wined3d_format;
struct wined3d *wined3d;
@ -3461,10 +3461,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device1 *
return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CheckMultisampleQualityLevels(ID3D11Device1 *iface,
static HRESULT STDMETHODCALLTYPE d3d11_device_CheckMultisampleQualityLevels(ID3D11Device2 *iface,
DXGI_FORMAT format, UINT sample_count, UINT *quality_level_count)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
struct wined3d_device_creation_parameters params;
struct wined3d *wined3d;
HRESULT hr;
@ -3501,12 +3501,12 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckMultisampleQualityLevels(ID3D
return hr;
}
static void STDMETHODCALLTYPE d3d11_device_CheckCounterInfo(ID3D11Device1 *iface, D3D11_COUNTER_INFO *info)
static void STDMETHODCALLTYPE d3d11_device_CheckCounterInfo(ID3D11Device2 *iface, D3D11_COUNTER_INFO *info)
{
FIXME("iface %p, info %p stub!\n", iface, info);
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CheckCounter(ID3D11Device1 *iface, const D3D11_COUNTER_DESC *desc,
static HRESULT STDMETHODCALLTYPE d3d11_device_CheckCounter(ID3D11Device2 *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)
{
@ -3518,10 +3518,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckCounter(ID3D11Device1 *iface,
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device1 *iface, D3D11_FEATURE feature,
static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 *iface, D3D11_FEATURE feature,
void *feature_support_data, UINT feature_support_data_size)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
WINED3DCAPS wined3d_caps;
HRESULT hr;
@ -3646,7 +3646,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device1
}
}
static HRESULT STDMETHODCALLTYPE d3d11_device_GetPrivateData(ID3D11Device1 *iface, REFGUID guid,
static HRESULT STDMETHODCALLTYPE d3d11_device_GetPrivateData(ID3D11Device2 *iface, REFGUID guid,
UINT *data_size, void *data)
{
IDXGIDevice *dxgi_device;
@ -3654,7 +3654,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_GetPrivateData(ID3D11Device1 *ifac
TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data);
if (FAILED(hr = ID3D11Device1_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device)))
if (FAILED(hr = ID3D11Device2_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device)))
return hr;
hr = IDXGIDevice_GetPrivateData(dxgi_device, guid, data_size, data);
IDXGIDevice_Release(dxgi_device);
@ -3662,7 +3662,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_GetPrivateData(ID3D11Device1 *ifac
return hr;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateData(ID3D11Device1 *iface, REFGUID guid,
static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateData(ID3D11Device2 *iface, REFGUID guid,
UINT data_size, const void *data)
{
IDXGIDevice *dxgi_device;
@ -3670,7 +3670,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateData(ID3D11Device1 *ifac
TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data);
if (FAILED(hr = ID3D11Device1_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device)))
if (FAILED(hr = ID3D11Device2_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device)))
return hr;
hr = IDXGIDevice_SetPrivateData(dxgi_device, guid, data_size, data);
IDXGIDevice_Release(dxgi_device);
@ -3678,7 +3678,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateData(ID3D11Device1 *ifac
return hr;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateDataInterface(ID3D11Device1 *iface, REFGUID guid,
static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateDataInterface(ID3D11Device2 *iface, REFGUID guid,
const IUnknown *data)
{
IDXGIDevice *dxgi_device;
@ -3686,7 +3686,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateDataInterface(ID3D11Devi
TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);
if (FAILED(hr = ID3D11Device1_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device)))
if (FAILED(hr = ID3D11Device2_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device)))
return hr;
hr = IDXGIDevice_SetPrivateDataInterface(dxgi_device, guid, data);
IDXGIDevice_Release(dxgi_device);
@ -3694,33 +3694,33 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateDataInterface(ID3D11Devi
return hr;
}
static D3D_FEATURE_LEVEL STDMETHODCALLTYPE d3d11_device_GetFeatureLevel(ID3D11Device1 *iface)
static D3D_FEATURE_LEVEL STDMETHODCALLTYPE d3d11_device_GetFeatureLevel(ID3D11Device2 *iface)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
TRACE("iface %p.\n", iface);
return device->feature_level;
}
static UINT STDMETHODCALLTYPE d3d11_device_GetCreationFlags(ID3D11Device1 *iface)
static UINT STDMETHODCALLTYPE d3d11_device_GetCreationFlags(ID3D11Device2 *iface)
{
FIXME("iface %p stub!\n", iface);
return 0;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_GetDeviceRemovedReason(ID3D11Device1 *iface)
static HRESULT STDMETHODCALLTYPE d3d11_device_GetDeviceRemovedReason(ID3D11Device2 *iface)
{
WARN("iface %p stub!\n", iface);
return S_OK;
}
static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext(ID3D11Device1 *iface,
static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext(ID3D11Device2 *iface,
ID3D11DeviceContext **immediate_context)
{
struct d3d_device *device = impl_from_ID3D11Device1(iface);
struct d3d_device *device = impl_from_ID3D11Device2(iface);
TRACE("iface %p, immediate_context %p.\n", iface, immediate_context);
@ -3728,26 +3728,26 @@ static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext(ID3D11Device1 *if
ID3D11DeviceContext_AddRef(*immediate_context);
}
static HRESULT STDMETHODCALLTYPE d3d11_device_SetExceptionMode(ID3D11Device1 *iface, UINT flags)
static HRESULT STDMETHODCALLTYPE d3d11_device_SetExceptionMode(ID3D11Device2 *iface, UINT flags)
{
FIXME("iface %p, flags %#x stub!\n", iface, flags);
return E_NOTIMPL;
}
static UINT STDMETHODCALLTYPE d3d11_device_GetExceptionMode(ID3D11Device1 *iface)
static UINT STDMETHODCALLTYPE d3d11_device_GetExceptionMode(ID3D11Device2 *iface)
{
FIXME("iface %p stub!\n", iface);
return 0;
}
static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext1(ID3D11Device1 *iface, ID3D11DeviceContext1 **context)
static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext1(ID3D11Device2 *iface, ID3D11DeviceContext1 **context)
{
FIXME("iface %p, context %p stub!\n", iface, context);
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext1(ID3D11Device1 *iface, UINT flags,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext1(ID3D11Device2 *iface, UINT flags,
ID3D11DeviceContext1 **context)
{
FIXME("iface %p, flags %#x, context %p stub!\n", iface, flags, context);
@ -3755,7 +3755,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext1(ID3D11Devic
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState1(ID3D11Device1 *iface,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState1(ID3D11Device2 *iface,
const D3D11_BLEND_DESC1 *desc, ID3D11BlendState1 **state)
{
FIXME("iface %p, desc %p, state %p stub!\n", iface, desc, state);
@ -3763,7 +3763,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState1(ID3D11Device1 *i
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState1(ID3D11Device1 *iface,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState1(ID3D11Device2 *iface,
const D3D11_RASTERIZER_DESC1 *desc, ID3D11RasterizerState1 **state)
{
FIXME("iface %p, desc %p, state %p stub!\n", iface, desc, state);
@ -3771,7 +3771,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState1(ID3D11Devic
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Device1 *iface, UINT flags,
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Device2 *iface, UINT flags,
const D3D_FEATURE_LEVEL *feature_levels, UINT feature_levels_count, UINT sdk_version,
REFIID emulated_interface, D3D_FEATURE_LEVEL *chosen_feature_level, ID3DDeviceContextState **state)
{
@ -3782,7 +3782,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Dev
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource1(ID3D11Device1 *iface, HANDLE handle,
static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource1(ID3D11Device2 *iface, HANDLE handle,
REFIID riid, void **resource)
{
FIXME("iface %p, handle %p, riid %s, resource %p stub!\n", iface, handle, debugstr_guid(riid), resource);
@ -3790,7 +3790,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource1(ID3D11Device1
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResourceByName(ID3D11Device1 *iface, const WCHAR *name,
static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResourceByName(ID3D11Device2 *iface, const WCHAR *name,
DWORD access, REFIID riid, void **resource)
{
FIXME("iface %p, name %s, access %#x, riid %s, resource %p stub!\n", iface, debugstr_w(name), access,
@ -3799,7 +3799,41 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResourceByName(ID3D11Dev
return E_NOTIMPL;
}
static const struct ID3D11Device1Vtbl d3d11_device_vtbl =
static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext2(ID3D11Device2 *iface,
ID3D11DeviceContext2 **context)
{
FIXME("iface %p, context %p stub!\n", iface, context);
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext2(ID3D11Device2 *iface,
UINT flags, ID3D11DeviceContext2 **context)
{
FIXME("iface %p, flags %#x, context %p stub!\n", iface, flags, context);
return E_NOTIMPL;
}
static void STDMETHODCALLTYPE d3d11_device_GetResourceTiling(ID3D11Device2 *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)
{
FIXME("iface %p, resource %p, tile_count %p, mip_desc %p, tile_shape %p, "
"subresource_tiling_count %p, first_subresource_tiling %u, subresource_tiling %p stub!\n",
iface, resource, tile_count, mip_desc, tile_shape,
subresource_tiling_count, first_subresource_tiling, subresource_tiling);
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CheckMultisampleQualityLevels1(ID3D11Device2 *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",
iface, format, sample_count, flags, quality_level_count);
return E_NOTIMPL;
}
static const struct ID3D11Device2Vtbl d3d11_device_vtbl =
{
/* IUnknown methods */
d3d11_device_QueryInterface,
@ -3854,6 +3888,11 @@ static const struct ID3D11Device1Vtbl d3d11_device_vtbl =
d3d11_device_CreateDeviceContextState,
d3d11_device_OpenSharedResource1,
d3d11_device_OpenSharedResourceByName,
/* ID3D11Device2 methods */
d3d11_device_GetImmediateContext2,
d3d11_device_CreateDeferredContext2,
d3d11_device_GetResourceTiling,
d3d11_device_CheckMultisampleQualityLevels1,
};
/* Inner IUnknown methods */
@ -3869,11 +3908,12 @@ 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_ID3D11Device1)
if (IsEqualGUID(riid, &IID_ID3D11Device2)
|| IsEqualGUID(riid, &IID_ID3D11Device1)
|| IsEqualGUID(riid, &IID_ID3D11Device)
|| IsEqualGUID(riid, &IID_IUnknown))
{
*out = &device->ID3D11Device1_iface;
*out = &device->ID3D11Device2_iface;
}
else if (IsEqualGUID(riid, &IID_ID3D10Device1)
|| IsEqualGUID(riid, &IID_ID3D10Device))
@ -5245,7 +5285,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->ID3D11Device1_iface, guid, data_size, data);
return d3d11_device_GetPrivateData(&device->ID3D11Device2_iface, guid, data_size, data);
}
static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateData(ID3D10Device1 *iface,
@ -5255,7 +5295,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->ID3D11Device1_iface, guid, data_size, data);
return d3d11_device_SetPrivateData(&device->ID3D11Device2_iface, guid, data_size, data);
}
static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateDataInterface(ID3D10Device1 *iface,
@ -5265,7 +5305,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->ID3D11Device1_iface, guid, data);
return d3d11_device_SetPrivateDataInterface(&device->ID3D11Device2_iface, guid, data);
}
static void STDMETHODCALLTYPE d3d10_device_ClearState(ID3D10Device1 *iface)
@ -5803,7 +5843,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->ID3D11Device1_iface, format, format_support);
return d3d11_device_CheckFormatSupport(&device->ID3D11Device2_iface, format, format_support);
}
static HRESULT STDMETHODCALLTYPE d3d10_device_CheckMultisampleQualityLevels(ID3D10Device1 *iface,
@ -5814,7 +5854,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->ID3D11Device1_iface, format,
return d3d11_device_CheckMultisampleQualityLevels(&device->ID3D11Device2_iface, format,
sample_count, quality_level_count);
}
@ -6176,7 +6216,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic
if (texture_flags)
FIXME("Unhandled flags %#x.\n", texture_flags);
if (FAILED(hr = d3d11_device_CreateTexture2D(&device->ID3D11Device1_iface,
if (FAILED(hr = d3d11_device_CreateTexture2D(&device->ID3D11Device2_iface,
&desc, NULL, &texture_iface)))
{
WARN("Failed to create 2D texture, hr %#x.\n", hr);
@ -6201,7 +6241,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent
TRACE("device_parent %p, desc %p, swapchain %p.\n", device_parent, desc, swapchain);
if (FAILED(hr = d3d11_device_QueryInterface(&device->ID3D11Device1_iface,
if (FAILED(hr = d3d11_device_QueryInterface(&device->ID3D11Device2_iface,
&IID_IWineDXGIDevice, (void **)&wine_device)))
{
ERR("Device should implement IWineDXGIDevice.\n");
@ -6265,7 +6305,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->ID3D11Device1_iface.lpVtbl = &d3d11_device_vtbl;
device->ID3D11Device2_iface.lpVtbl = &d3d11_device_vtbl;
device->ID3D10Device1_iface.lpVtbl = &d3d10_device1_vtbl;
device->ID3D10Multithread_iface.lpVtbl = &d3d10_multithread_vtbl;
device->IWineDXGIDeviceParent_iface.lpVtbl = &d3d_dxgi_device_parent_vtbl;

10
dlls/d3d11/inputlayout.c
View File

@ -134,7 +134,7 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_AddRef(ID3D11InputLayout *ifac
if (refcount == 1)
{
ID3D11Device1_AddRef(layout->device);
ID3D11Device2_AddRef(layout->device);
wined3d_mutex_lock();
wined3d_vertex_declaration_incref(layout->wined3d_decl);
wined3d_mutex_unlock();
@ -152,13 +152,13 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_Release(ID3D11InputLayout *ifa
if (!refcount)
{
ID3D11Device1 *device = layout->device;
ID3D11Device2 *device = layout->device;
wined3d_mutex_lock();
wined3d_vertex_declaration_decref(layout->wined3d_decl);
wined3d_mutex_unlock();
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -262,7 +262,7 @@ static void STDMETHODCALLTYPE d3d10_input_layout_GetDevice(ID3D10InputLayout *if
TRACE("iface %p, device %p.\n", iface, device);
ID3D11Device1_QueryInterface(layout->device, &IID_ID3D10Device, (void **)device);
ID3D11Device2_QueryInterface(layout->device, &IID_ID3D10Device, (void **)device);
}
static HRESULT STDMETHODCALLTYPE d3d10_input_layout_GetPrivateData(ID3D10InputLayout *iface,
@ -357,7 +357,7 @@ static HRESULT d3d_input_layout_init(struct d3d_input_layout *layout, struct d3d
}
wined3d_mutex_unlock();
ID3D11Device1_AddRef(layout->device = &device->ID3D11Device1_iface);
ID3D11Device2_AddRef(layout->device = &device->ID3D11Device2_iface);
return S_OK;
}

65
dlls/d3d11/shader.c
View File

@ -330,7 +330,7 @@ static ULONG STDMETHODCALLTYPE d3d11_vertex_shader_AddRef(ID3D11VertexShader *if
if (refcount == 1)
{
ID3D11Device1_AddRef(shader->device);
ID3D11Device2_AddRef(shader->device);
wined3d_mutex_lock();
wined3d_shader_incref(shader->wined3d_shader);
wined3d_mutex_unlock();
@ -348,14 +348,14 @@ static ULONG STDMETHODCALLTYPE d3d11_vertex_shader_Release(ID3D11VertexShader *i
if (!refcount)
{
ID3D11Device1 *device = shader->device;
ID3D11Device2 *device = shader->device;
wined3d_mutex_lock();
wined3d_shader_decref(shader->wined3d_shader);
wined3d_mutex_unlock();
/* Release the device last, it may cause the wined3d device to be
* destroyed. */
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -460,7 +460,7 @@ static void STDMETHODCALLTYPE d3d10_vertex_shader_GetDevice(ID3D10VertexShader *
TRACE("iface %p, device %p.\n", iface, device);
ID3D11Device1_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device);
ID3D11Device2_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device);
}
static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_GetPrivateData(ID3D10VertexShader *iface,
@ -575,8 +575,7 @@ static HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d
}
wined3d_mutex_unlock();
shader->device = &device->ID3D11Device1_iface;
ID3D11Device1_AddRef(shader->device);
ID3D11Device2_AddRef(shader->device = &device->ID3D11Device2_iface);
return S_OK;
}
@ -657,7 +656,7 @@ static ULONG STDMETHODCALLTYPE d3d11_hull_shader_AddRef(ID3D11HullShader *iface)
if (refcount == 1)
{
ID3D11Device1_AddRef(shader->device);
ID3D11Device2_AddRef(shader->device);
wined3d_mutex_lock();
wined3d_shader_incref(shader->wined3d_shader);
wined3d_mutex_unlock();
@ -675,7 +674,7 @@ static ULONG STDMETHODCALLTYPE d3d11_hull_shader_Release(ID3D11HullShader *iface
if (!refcount)
{
ID3D11Device1 *device = shader->device;
ID3D11Device2 *device = shader->device;
wined3d_mutex_lock();
wined3d_shader_decref(shader->wined3d_shader);
@ -683,7 +682,7 @@ static ULONG STDMETHODCALLTYPE d3d11_hull_shader_Release(ID3D11HullShader *iface
/* Release the device last, it may cause the wined3d device to be
* destroyed. */
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -788,8 +787,7 @@ static HRESULT d3d11_hull_shader_init(struct d3d11_hull_shader *shader, struct d
}
wined3d_mutex_unlock();
shader->device = &device->ID3D11Device1_iface;
ID3D11Device1_AddRef(shader->device);
ID3D11Device2_AddRef(shader->device = &device->ID3D11Device2_iface);
return S_OK;
}
@ -860,7 +858,7 @@ static ULONG STDMETHODCALLTYPE d3d11_domain_shader_AddRef(ID3D11DomainShader *if
if (refcount == 1)
{
ID3D11Device1_AddRef(shader->device);
ID3D11Device2_AddRef(shader->device);
wined3d_mutex_lock();
wined3d_shader_incref(shader->wined3d_shader);
wined3d_mutex_unlock();
@ -878,7 +876,7 @@ static ULONG STDMETHODCALLTYPE d3d11_domain_shader_Release(ID3D11DomainShader *i
if (!refcount)
{
ID3D11Device1 *device = shader->device;
ID3D11Device2 *device = shader->device;
wined3d_mutex_lock();
wined3d_shader_decref(shader->wined3d_shader);
@ -886,7 +884,7 @@ static ULONG STDMETHODCALLTYPE d3d11_domain_shader_Release(ID3D11DomainShader *i
/* Release the device last, it may cause the wined3d device to be
* destroyed. */
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -991,8 +989,7 @@ static HRESULT d3d11_domain_shader_init(struct d3d11_domain_shader *shader, stru
}
wined3d_mutex_unlock();
shader->device = &device->ID3D11Device1_iface;
ID3D11Device1_AddRef(shader->device);
ID3D11Device2_AddRef(shader->device = &device->ID3D11Device2_iface);
return S_OK;
}
@ -1073,7 +1070,7 @@ static ULONG STDMETHODCALLTYPE d3d11_geometry_shader_AddRef(ID3D11GeometryShader
if (refcount == 1)
{
ID3D11Device1_AddRef(shader->device);
ID3D11Device2_AddRef(shader->device);
wined3d_mutex_lock();
wined3d_shader_incref(shader->wined3d_shader);
wined3d_mutex_unlock();
@ -1091,7 +1088,7 @@ static ULONG STDMETHODCALLTYPE d3d11_geometry_shader_Release(ID3D11GeometryShade
if (!refcount)
{
ID3D11Device1 *device = shader->device;
ID3D11Device2 *device = shader->device;
wined3d_mutex_lock();
wined3d_shader_decref(shader->wined3d_shader);
@ -1099,7 +1096,7 @@ static ULONG STDMETHODCALLTYPE d3d11_geometry_shader_Release(ID3D11GeometryShade
/* Release the device last, it may cause the wined3d device to be
* destroyed. */
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -1204,7 +1201,7 @@ static void STDMETHODCALLTYPE d3d10_geometry_shader_GetDevice(ID3D10GeometryShad
TRACE("iface %p, device %p.\n", iface, device);
ID3D11Device1_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device);
ID3D11Device2_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device);
}
static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_GetPrivateData(ID3D10GeometryShader *iface,
@ -1530,8 +1527,7 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader,
}
wined3d_mutex_unlock();
shader->device = &device->ID3D11Device1_iface;
ID3D11Device1_AddRef(shader->device);
ID3D11Device2_AddRef(shader->device = &device->ID3D11Device2_iface);
return S_OK;
}
@ -1625,7 +1621,7 @@ static ULONG STDMETHODCALLTYPE d3d11_pixel_shader_AddRef(ID3D11PixelShader *ifac
if (refcount == 1)
{
ID3D11Device1_AddRef(shader->device);
ID3D11Device2_AddRef(shader->device);
wined3d_mutex_lock();
wined3d_shader_incref(shader->wined3d_shader);
wined3d_mutex_unlock();
@ -1643,14 +1639,14 @@ static ULONG STDMETHODCALLTYPE d3d11_pixel_shader_Release(ID3D11PixelShader *ifa
if (!refcount)
{
ID3D11Device1 *device = shader->device;
ID3D11Device2 *device = shader->device;
wined3d_mutex_lock();
wined3d_shader_decref(shader->wined3d_shader);
wined3d_mutex_unlock();
/* Release the device last, it may cause the wined3d device to be
* destroyed. */
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -1755,7 +1751,7 @@ static void STDMETHODCALLTYPE d3d10_pixel_shader_GetDevice(ID3D10PixelShader *if
TRACE("iface %p, device %p.\n", iface, device);
ID3D11Device1_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device);
ID3D11Device2_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device);
}
static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_GetPrivateData(ID3D10PixelShader *iface,
@ -1849,8 +1845,7 @@ static HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d
}
wined3d_mutex_unlock();
shader->device = &device->ID3D11Device1_iface;
ID3D11Device1_AddRef(shader->device);
ID3D11Device2_AddRef(shader->device = &device->ID3D11Device2_iface);
return S_OK;
}
@ -1930,7 +1925,7 @@ static ULONG STDMETHODCALLTYPE d3d11_compute_shader_AddRef(ID3D11ComputeShader *
if (refcount == 1)
{
ID3D11Device1_AddRef(shader->device);
ID3D11Device2_AddRef(shader->device);
wined3d_mutex_lock();
wined3d_shader_incref(shader->wined3d_shader);
wined3d_mutex_unlock();
@ -1948,7 +1943,7 @@ static ULONG STDMETHODCALLTYPE d3d11_compute_shader_Release(ID3D11ComputeShader
if (!refcount)
{
ID3D11Device1 *device = shader->device;
ID3D11Device2 *device = shader->device;
wined3d_mutex_lock();
wined3d_shader_decref(shader->wined3d_shader);
@ -1956,7 +1951,7 @@ static ULONG STDMETHODCALLTYPE d3d11_compute_shader_Release(ID3D11ComputeShader
/* Release the device last, it may cause the wined3d device to be
* destroyed. */
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -2060,7 +2055,7 @@ static HRESULT d3d11_compute_shader_init(struct d3d11_compute_shader *shader, st
}
wined3d_mutex_unlock();
ID3D11Device1_AddRef(shader->device = &device->ID3D11Device1_iface);
ID3D11Device2_AddRef(shader->device = &device->ID3D11Device2_iface);
return S_OK;
}
@ -2140,12 +2135,12 @@ static ULONG STDMETHODCALLTYPE d3d11_class_linkage_Release(ID3D11ClassLinkage *i
if (!refcount)
{
ID3D11Device1 *device = class_linkage->device;
ID3D11Device2 *device = class_linkage->device;
wined3d_private_store_cleanup(&class_linkage->private_store);
heap_free(class_linkage);
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -2239,7 +2234,7 @@ HRESULT d3d11_class_linkage_create(struct d3d_device *device, struct d3d11_class
object->refcount = 1;
wined3d_private_store_init(&object->private_store);
ID3D11Device1_AddRef(object->device = &device->ID3D11Device1_iface);
ID3D11Device2_AddRef(object->device = &device->ID3D11Device2_iface);
TRACE("Created class linkage %p.\n", object);
*class_linkage = object;

46
dlls/d3d11/state.c
View File

@ -66,7 +66,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState *iface)
if (refcount == 1)
{
ID3D11Device1_AddRef(state->device);
ID3D11Device2_AddRef(state->device);
wined3d_mutex_lock();
wined3d_blend_state_incref(state->wined3d_state);
wined3d_mutex_unlock();
@ -84,13 +84,13 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface
if (!refcount)
{
ID3D11Device1 *device = state->device;
ID3D11Device2 *device = state->device;
wined3d_mutex_lock();
wined3d_blend_state_decref(state->wined3d_state);
wined3d_mutex_unlock();
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -206,7 +206,7 @@ static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState1 *ifa
TRACE("iface %p, device %p.\n", iface, device);
ID3D11Device1_QueryInterface(state->device, &IID_ID3D10Device, (void **)device);
ID3D11Device2_QueryInterface(state->device, &IID_ID3D10Device, (void **)device);
}
static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendState1 *iface,
@ -294,7 +294,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_ID3D11Device1(state->device);
struct d3d_device *device = impl_from_ID3D11Device2(state->device);
wine_rb_remove(&device->blend_states, &state->entry);
wined3d_private_store_cleanup(&state->private_store);
@ -395,7 +395,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC
}
wined3d_mutex_unlock();
ID3D11Device1_AddRef(object->device = &device->ID3D11Device1_iface);
ID3D11Device2_AddRef(object->device = &device->ID3D11Device2_iface);
TRACE("Created blend state %p.\n", object);
*state = object;
@ -466,7 +466,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_AddRef(ID3D11DepthStenci
static void d3d_depthstencil_state_cleanup(struct d3d_depthstencil_state *state)
{
wined3d_private_store_cleanup(&state->private_store);
ID3D11Device1_Release(state->device);
ID3D11Device2_Release(state->device);
}
static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStencilState *iface)
@ -478,7 +478,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStenc
if (!refcount)
{
struct d3d_device *device = impl_from_ID3D11Device1(state->device);
struct d3d_device *device = impl_from_ID3D11Device2(state->device);
wined3d_mutex_lock();
wine_rb_remove(&device->depthstencil_states, &state->entry);
d3d_depthstencil_state_cleanup(state);
@ -600,7 +600,7 @@ static void STDMETHODCALLTYPE d3d10_depthstencil_state_GetDevice(ID3D10DepthSten
TRACE("iface %p, device %p.\n", iface, device);
ID3D11Device1_QueryInterface(state->device, &IID_ID3D10Device, (void **)device);
ID3D11Device2_QueryInterface(state->device, &IID_ID3D10Device, (void **)device);
}
static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_GetPrivateData(ID3D10DepthStencilState *iface,
@ -671,8 +671,7 @@ static HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state,
wined3d_private_store_init(&state->private_store);
state->desc = *desc;
state->device = &device->ID3D11Device1_iface;
ID3D11Device1_AddRef(state->device);
ID3D11Device2_AddRef(state->device = &device->ID3D11Device2_iface);
return S_OK;
}
@ -831,7 +830,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_AddRef(ID3D11RasterizerSta
if (refcount == 1)
{
ID3D11Device1_AddRef(state->device);
ID3D11Device2_AddRef(state->device);
wined3d_mutex_lock();
wined3d_rasterizer_state_incref(state->wined3d_state);
wined3d_mutex_unlock();
@ -849,13 +848,13 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerSt
if (!refcount)
{
ID3D11Device1 *device = state->device;
ID3D11Device2 *device = state->device;
wined3d_mutex_lock();
wined3d_rasterizer_state_decref(state->wined3d_state);
wined3d_mutex_unlock();
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -972,7 +971,7 @@ static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDevice(ID3D10RasterizerS
TRACE("iface %p, device %p.\n", iface, device);
ID3D11Device1_QueryInterface(state->device, &IID_ID3D10Device, (void **)device);
ID3D11Device2_QueryInterface(state->device, &IID_ID3D10Device, (void **)device);
}
static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_GetPrivateData(ID3D10RasterizerState *iface,
@ -1037,7 +1036,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_ID3D11Device1(state->device);
struct d3d_device *device = impl_from_ID3D11Device2(state->device);
wine_rb_remove(&device->rasterizer_states, &state->entry);
wined3d_private_store_cleanup(&state->private_store);
@ -1081,7 +1080,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str
return hr;
}
ID3D11Device1_AddRef(state->device = &device->ID3D11Device1_iface);
ID3D11Device2_AddRef(state->device = &device->ID3D11Device2_iface);
return S_OK;
}
@ -1194,7 +1193,7 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_AddRef(ID3D11SamplerState *if
if (refcount == 1)
{
ID3D11Device1_AddRef(state->device);
ID3D11Device2_AddRef(state->device);
wined3d_mutex_lock();
wined3d_sampler_incref(state->wined3d_sampler);
wined3d_mutex_unlock();
@ -1212,13 +1211,13 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_Release(ID3D11SamplerState *i
if (!refcount)
{
ID3D11Device1 *device = state->device;
ID3D11Device2 *device = state->device;
wined3d_mutex_lock();
wined3d_sampler_decref(state->wined3d_sampler);
wined3d_mutex_unlock();
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -1335,7 +1334,7 @@ static void STDMETHODCALLTYPE d3d10_sampler_state_GetDevice(ID3D10SamplerState *
TRACE("iface %p, device %p.\n", iface, device);
ID3D11Device1_QueryInterface(state->device, &IID_ID3D10Device, (void **)device);
ID3D11Device2_QueryInterface(state->device, &IID_ID3D10Device, (void **)device);
}
static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_GetPrivateData(ID3D10SamplerState *iface,
@ -1400,7 +1399,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_ID3D11Device1(state->device);
struct d3d_device *device = impl_from_ID3D11Device2(state->device);
wine_rb_remove(&device->sampler_states, &state->entry);
wined3d_private_store_cleanup(&state->private_store);
@ -1494,8 +1493,7 @@ static HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3
return hr;
}
state->device = &device->ID3D11Device1_iface;
ID3D11Device1_AddRef(state->device);
ID3D11Device2_AddRef(state->device = &device->ID3D11Device2_iface);
return S_OK;
}

4
dlls/d3d11/tests/d3d11.c
View File

@ -1236,10 +1236,6 @@ static BOOL is_d3d11_2_runtime(ID3D11Device *device)
ID3D11Device2 *device2;
HRESULT hr;
/* FIXME: Wine doesn't implement required interfaces yet, but we want to test new behavior. */
if (!strcmp(winetest_platform, "wine"))
return TRUE;
hr = ID3D11Device_QueryInterface(device, &IID_ID3D11Device2, (void **)&device2);
if (SUCCEEDED(hr))
ID3D11Device2_Release(device2);

32
dlls/d3d11/texture.c
View File

@ -78,7 +78,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture1d_AddRef(ID3D11Texture1D *iface)
if (refcount == 1)
{
ID3D11Device1_AddRef(texture->device);
ID3D11Device2_AddRef(texture->device);
wined3d_mutex_lock();
wined3d_texture_incref(texture->wined3d_texture);
wined3d_mutex_unlock();
@ -96,14 +96,14 @@ static ULONG STDMETHODCALLTYPE d3d11_texture1d_Release(ID3D11Texture1D *iface)
if (!refcount)
{
ID3D11Device1 *device = texture->device;
ID3D11Device2 *device = texture->device;
wined3d_mutex_lock();
wined3d_texture_decref(texture->wined3d_texture);
wined3d_mutex_unlock();
/* Release the device last, it may cause the wined3d device to be
* destroyed. */
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -287,7 +287,7 @@ static void STDMETHODCALLTYPE d3d10_texture1d_GetDevice(ID3D10Texture1D *iface,
TRACE("iface %p, device %p.\n", iface, device);
ID3D11Device1_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device);
ID3D11Device2_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device);
}
static HRESULT STDMETHODCALLTYPE d3d10_texture1d_GetPrivateData(ID3D10Texture1D *iface,
@ -510,8 +510,7 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE
}
wined3d_mutex_unlock();
texture->device = &device->ID3D11Device1_iface;
ID3D11Device1_AddRef(texture->device);
ID3D11Device2_AddRef(texture->device = &device->ID3D11Device2_iface);
TRACE("Created texture %p.\n", texture);
*out = texture;
@ -566,7 +565,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_AddRef(ID3D11Texture2D *iface)
if (refcount == 1)
{
ID3D11Device1_AddRef(texture->device);
ID3D11Device2_AddRef(texture->device);
wined3d_mutex_lock();
wined3d_texture_incref(texture->wined3d_texture);
wined3d_mutex_unlock();
@ -584,14 +583,14 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_Release(ID3D11Texture2D *iface)
if (!refcount)
{
ID3D11Device1 *device = texture->device;
ID3D11Device2 *device = texture->device;
wined3d_mutex_lock();
wined3d_texture_decref(texture->wined3d_texture);
wined3d_mutex_unlock();
/* Release the device last, it may cause the wined3d device to be
* destroyed. */
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -789,7 +788,7 @@ static void STDMETHODCALLTYPE d3d10_texture2d_GetDevice(ID3D10Texture2D *iface,
TRACE("iface %p, device %p.\n", iface, device);
ID3D11Device1_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device);
ID3D11Device2_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device);
}
static HRESULT STDMETHODCALLTYPE d3d10_texture2d_GetPrivateData(ID3D10Texture2D *iface,
@ -1066,7 +1065,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE
}
wined3d_mutex_unlock();
ID3D11Device1_AddRef(texture->device = &device->ID3D11Device1_iface);
ID3D11Device2_AddRef(texture->device = &device->ID3D11Device2_iface);
TRACE("Created texture %p.\n", texture);
*out = texture;
@ -1120,7 +1119,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_AddRef(ID3D11Texture3D *iface)
if (refcount == 1)
{
ID3D11Device1_AddRef(texture->device);
ID3D11Device2_AddRef(texture->device);
wined3d_mutex_lock();
wined3d_texture_incref(texture->wined3d_texture);
wined3d_mutex_unlock();
@ -1146,14 +1145,14 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_Release(ID3D11Texture3D *iface)
if (!refcount)
{
ID3D11Device1 *device = texture->device;
ID3D11Device2 *device = texture->device;
wined3d_mutex_lock();
wined3d_texture_decref(texture->wined3d_texture);
wined3d_mutex_unlock();
/* Release the device last, it may cause the wined3d device to be
* destroyed. */
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -1287,7 +1286,7 @@ static void STDMETHODCALLTYPE d3d10_texture3d_GetDevice(ID3D10Texture3D *iface,
TRACE("iface %p, device %p.\n", iface, device);
ID3D11Device1_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device);
ID3D11Device2_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device);
}
static HRESULT STDMETHODCALLTYPE d3d10_texture3d_GetPrivateData(ID3D10Texture3D *iface,
@ -1495,8 +1494,7 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi
wined3d_mutex_unlock();
texture->desc.MipLevels = levels;
texture->device = &device->ID3D11Device1_iface;
ID3D11Device1_AddRef(texture->device);
ID3D11Device2_AddRef(texture->device = &device->ID3D11Device2_iface);
return S_OK;
}

41
dlls/d3d11/view.c
View File

@ -1006,7 +1006,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_AddRef(ID3D11DepthStencil
if (refcount == 1)
{
ID3D11Device1_AddRef(view->device);
ID3D11Device2_AddRef(view->device);
wined3d_mutex_lock();
wined3d_rendertarget_view_incref(view->wined3d_view);
wined3d_mutex_unlock();
@ -1024,13 +1024,13 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStenci
if (!refcount)
{
ID3D11Device1 *device = view->device;
ID3D11Device2 *device = view->device;
wined3d_mutex_lock();
wined3d_rendertarget_view_decref(view->wined3d_view);
wined3d_mutex_unlock();
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -1160,7 +1160,7 @@ static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetDevice(ID3D10DepthStenc
TRACE("iface %p, device %p.\n", iface, device);
ID3D11Device1_QueryInterface(view->device, &IID_ID3D10Device, (void **)device);
ID3D11Device2_QueryInterface(view->device, &IID_ID3D10Device, (void **)device);
}
static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_GetPrivateData(ID3D10DepthStencilView *iface,
@ -1355,8 +1355,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;
view->device = &device->ID3D11Device1_iface;
ID3D11Device1_AddRef(view->device);
ID3D11Device2_AddRef(view->device = &device->ID3D11Device2_iface);
return S_OK;
}
@ -1449,7 +1448,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_AddRef(ID3D11RenderTarget
if (refcount == 1)
{
ID3D11Device1_AddRef(view->device);
ID3D11Device2_AddRef(view->device);
wined3d_mutex_lock();
wined3d_rendertarget_view_incref(view->wined3d_view);
wined3d_mutex_unlock();
@ -1467,13 +1466,13 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_Release(ID3D11RenderTarge
if (!refcount)
{
ID3D11Device1 *device = view->device;
ID3D11Device2 *device = view->device;
wined3d_mutex_lock();
wined3d_rendertarget_view_decref(view->wined3d_view);
wined3d_mutex_unlock();
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -1603,7 +1602,7 @@ static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDevice(ID3D10RenderTarg
TRACE("iface %p, device %p.\n", iface, device);
ID3D11Device1_QueryInterface(view->device, &IID_ID3D10Device, (void **)device);
ID3D11Device2_QueryInterface(view->device, &IID_ID3D10Device, (void **)device);
}
static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_GetPrivateData(ID3D10RenderTargetView *iface,
@ -1803,8 +1802,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;
view->device = &device->ID3D11Device1_iface;
ID3D11Device1_AddRef(view->device);
ID3D11Device2_AddRef(view->device = &device->ID3D11Device2_iface);
return S_OK;
}
@ -1898,7 +1896,7 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_AddRef(ID3D11ShaderRes
if (refcount == 1)
{
ID3D11Device1_AddRef(view->device);
ID3D11Device2_AddRef(view->device);
wined3d_mutex_lock();
wined3d_shader_resource_view_incref(view->wined3d_view);
wined3d_mutex_unlock();
@ -1916,13 +1914,13 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe
if (!refcount)
{
ID3D11Device1 *device = view->device;
ID3D11Device2 *device = view->device;
wined3d_mutex_lock();
wined3d_shader_resource_view_decref(view->wined3d_view);
wined3d_mutex_unlock();
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -2053,7 +2051,7 @@ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDevice(ID3D10ShaderR
TRACE("iface %p, device %p.\n", iface, device);
ID3D11Device1_QueryInterface(view->device, &IID_ID3D10Device, (void **)device);
ID3D11Device2_QueryInterface(view->device, &IID_ID3D10Device, (void **)device);
}
static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_GetPrivateData(ID3D10ShaderResourceView1 *iface,
@ -2304,8 +2302,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;
view->device = &device->ID3D11Device1_iface;
ID3D11Device1_AddRef(view->device);
ID3D11Device2_AddRef(view->device = &device->ID3D11Device2_iface);
return S_OK;
}
@ -2384,7 +2381,7 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_AddRef(ID3D11Unordere
if (refcount == 1)
{
ID3D11Device1_AddRef(view->device);
ID3D11Device2_AddRef(view->device);
wined3d_mutex_lock();
wined3d_unordered_access_view_incref(view->wined3d_view);
wined3d_mutex_unlock();
@ -2402,13 +2399,13 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_Release(ID3D11Unorder
if (!refcount)
{
ID3D11Device1 *device = view->device;
ID3D11Device2 *device = view->device;
wined3d_mutex_lock();
wined3d_unordered_access_view_decref(view->wined3d_view);
wined3d_mutex_unlock();
ID3D11Device1_Release(device);
ID3D11Device2_Release(device);
}
return refcount;
@ -2614,7 +2611,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;
ID3D11Device1_AddRef(view->device = &device->ID3D11Device1_iface);
ID3D11Device2_AddRef(view->device = &device->ID3D11Device2_iface);
return S_OK;
}