mirror of
https://github.com/reactos/wine.git
synced 2025-02-04 02:56:31 +00:00
d3d11: Add ID3D11DeviceContext stub interface.
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:
parent
a865b14aed
commit
1d10c79af0
@ -360,6 +360,14 @@ HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d_device *device,
|
||||
const D3D10_QUERY_DESC *desc, BOOL predicate) DECLSPEC_HIDDEN;
|
||||
struct d3d10_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN;
|
||||
|
||||
/* ID3D11DeviceContext - immediate context */
|
||||
struct d3d11_immediate_context
|
||||
{
|
||||
ID3D11DeviceContext ID3D11DeviceContext_iface;
|
||||
LONG refcount;
|
||||
ID3D11Device *device;
|
||||
};
|
||||
|
||||
/* ID3D11Device, ID3D10Device1 */
|
||||
struct d3d_device
|
||||
{
|
||||
@ -371,6 +379,8 @@ struct d3d_device
|
||||
IUnknown *outer_unk;
|
||||
LONG refcount;
|
||||
|
||||
struct d3d11_immediate_context immediate_context;
|
||||
|
||||
struct wined3d_device_parent device_parent;
|
||||
struct wined3d_device *wined3d_device;
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -61,7 +61,7 @@ static void test_create_device(void)
|
||||
{
|
||||
D3D_FEATURE_LEVEL feature_level, supported_feature_level;
|
||||
DXGI_SWAP_CHAIN_DESC swapchain_desc, obtained_desc;
|
||||
ID3D11DeviceContext *immediate_context = NULL;
|
||||
ID3D11DeviceContext *immediate_context;
|
||||
IDXGISwapChain *swapchain;
|
||||
ID3D11Device *device;
|
||||
ULONG refcount;
|
||||
@ -72,7 +72,7 @@ static void test_create_device(void)
|
||||
NULL, NULL);
|
||||
if (FAILED(hr))
|
||||
{
|
||||
skip("Failed to create HAL device, skipping tests.\n");
|
||||
skip("Failed to create HAL device.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -92,19 +92,16 @@ static void test_create_device(void)
|
||||
&immediate_context);
|
||||
ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr);
|
||||
|
||||
todo_wine ok(!!immediate_context, "Immediate context is NULL.\n");
|
||||
if (immediate_context)
|
||||
{
|
||||
refcount = get_refcount((IUnknown *)immediate_context);
|
||||
ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount);
|
||||
ok(!!immediate_context, "Expected immediate device context pointer, got NULL.\n");
|
||||
refcount = get_refcount((IUnknown *)immediate_context);
|
||||
ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount);
|
||||
|
||||
ID3D11DeviceContext_GetDevice(immediate_context, &device);
|
||||
refcount = ID3D11Device_Release(device);
|
||||
ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount);
|
||||
ID3D11DeviceContext_GetDevice(immediate_context, &device);
|
||||
refcount = ID3D11Device_Release(device);
|
||||
ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount);
|
||||
|
||||
refcount = ID3D11DeviceContext_Release(immediate_context);
|
||||
ok(!refcount, "ID3D11DeviceContext has %u references left.\n", refcount);
|
||||
}
|
||||
refcount = ID3D11DeviceContext_Release(immediate_context);
|
||||
ok(!refcount, "ID3D11DeviceContext has %u references left.\n", refcount);
|
||||
|
||||
device = (ID3D11Device *)0xdeadbeef;
|
||||
feature_level = 0xdeadbeef;
|
||||
@ -114,7 +111,7 @@ static void test_create_device(void)
|
||||
todo_wine ok(hr == E_INVALIDARG, "D3D11CreateDevice returned %#x.\n", hr);
|
||||
ok(!device, "Got unexpected device pointer %p.\n", device);
|
||||
ok(!feature_level, "Got unexpected feature level %#x.\n", feature_level);
|
||||
ok(!immediate_context, "Got unexpected immediate_context pointer %p.\n", immediate_context);
|
||||
ok(!immediate_context, "Got unexpected immediate context pointer %p.\n", immediate_context);
|
||||
|
||||
window = CreateWindowA("static", "d3d11_test", 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user