March 2019 - Wine-devel - list.winehq.org

[PATCH v2 02/10] d3dx9: Merge the d3dx_effect_GetIntArray() helper
by Michael Stefaniuc 11 Mar '19

11 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: resent dlls/d3dx9_36/effect.c | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5d0be346b8..7425c7b9a1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1426,30 +1426,6 @@ static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_int_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, INT *n, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (n && param && (param->class == D3DXPC_SCALAR - || param->class == D3DXPC_VECTOR - || param->class == D3DXPC_MATRIX_ROWS - || param->class == D3DXPC_MATRIX_COLUMNS)) - { - UINT i, size = min(count, param->bytes / sizeof(DWORD)); - - for (i = 0; i < size; ++i) - { - set_number(&n[i], D3DXPT_INT, (DWORD *)param->data + i, param->type); - } - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -3431,10 +3407,25 @@ static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE par static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count); - return d3dx9_base_effect_get_int_array(&effect->base_effect, parameter, n, count); + if (n && param && (param->class == D3DXPC_SCALAR + || param->class == D3DXPC_VECTOR + || param->class == D3DXPC_MATRIX_ROWS + || param->class == D3DXPC_MATRIX_COLUMNS)) + { + unsigned int i, size = min(count, param->bytes / sizeof(DWORD)); + + for (i = 0; i < size; ++i) + set_number(&n[i], D3DXPT_INT, (DWORD *)param->data + i, param->type); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float f) -- 2.20.1

3 3

[PATCH v2 7/7] user32/tests: Use calculated EC_USEFONTINFO margins in the CJK case.
by Akihiro Sagawa 11 Mar '19

11 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 94 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 79 insertions(+), 15 deletions(-)

2 1

[PATCH v2 6/7] user32: Implement EC_USEFONTINFO margins in the CJK case.
by Akihiro Sagawa 11 Mar '19

11 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/edit.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 3 deletions(-)

2 1

[PATCH v2 4/7] user32/tests: Add Unicode version tests for Edit control margins.
by Akihiro Sagawa 11 Mar '19

11 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)

2 1

[PATCH v2 3/7] user32/tests: Move the default margin size tests into a separate function.
by Akihiro Sagawa 11 Mar '19

11 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 82 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 65 insertions(+), 17 deletions(-)

2 1

[PATCH vkd3d 2/2] tests: Introduce assert_that().
by Józef Kucia 11 Mar '19

11 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> This allows us to put a bug_if() or todo_if() in the front of functions that check other conditions not directly related to the actual test. assert_that() is similar to ok(). The main difference is that it ignores bug_if() and todo_if(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_test.h | 53 ++++++++++++++++++++++++++++++------ tests/d3d12.c | 14 ++-------- tests/d3d12_crosstest.h | 6 ++-- tests/d3d12_test_utils.h | 12 ++++---- 4 files changed, 56 insertions(+), 29 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index d7593e2649ff..53afdd90358d 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -40,10 +40,26 @@ static void vkd3d_test_end_todo(void); static const char *vkd3d_test_name = #name; \ static void vkd3d_test_main(int argc, char **argv) +/* + * Use assert_that() for conditions that should always be true. + * todo_if() and bug_if() do not influence assert_that(). + */ +#define assert_that assert_that_(__LINE__) + #define ok ok_(__LINE__) + #define skip skip_(__LINE__) + #define trace trace_(__LINE__) +#define assert_that_(line) \ + do { \ + unsigned int vkd3d_line = line; \ + VKD3D_TEST_ASSERT_THAT + +#define VKD3D_TEST_ASSERT_THAT(args...) \ + vkd3d_test_assert_that(vkd3d_line, args); } while (0) + #define ok_(line) \ do { \ unsigned int vkd3d_line = line; \ @@ -116,6 +132,33 @@ broken(bool condition) return condition && vkd3d_test_platform_is_windows(); } +static void +vkd3d_test_check_assert_that(unsigned int line, bool result, const char *fmt, va_list args) +{ + if (result) + { + InterlockedIncrement(&vkd3d_test_state.success_count); + if (vkd3d_test_state.debug_level > 1) + printf("%s:%d%s: Test succeeded.\n", vkd3d_test_name, line, vkd3d_test_state.context); + } + else + { + InterlockedIncrement(&vkd3d_test_state.failure_count); + printf("%s:%d%s: Test failed: ", vkd3d_test_name, line, vkd3d_test_state.context); + vprintf(fmt, args); + } +} + +static void VKD3D_PRINTF_FUNC(3, 4) VKD3D_UNUSED +vkd3d_test_assert_that(unsigned int line, bool result, const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + vkd3d_test_check_assert_that(line, result, fmt, args); + va_end(args); +} + static void vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list args) { @@ -147,17 +190,9 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg } vprintf(fmt, args); } - else if (result) - { - InterlockedIncrement(&vkd3d_test_state.success_count); - if (vkd3d_test_state.debug_level > 1) - printf("%s:%d%s: Test succeeded.\n", vkd3d_test_name, line, vkd3d_test_state.context); - } else { - InterlockedIncrement(&vkd3d_test_state.failure_count); - printf("%s:%d%s: Test failed: ", vkd3d_test_name, line, vkd3d_test_state.context); - vprintf(fmt, args); + vkd3d_test_check_assert_that(line, result, fmt, args); } } diff --git a/tests/d3d12.c b/tests/d3d12.c index e044a5385b21..e3e86e8afa07 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5606,7 +5606,6 @@ static void test_draw_uav_only(void) D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle; D3D12_ROOT_PARAMETER root_parameter; struct test_context_desc desc; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *resource; @@ -5688,10 +5687,8 @@ static void test_draw_uav_only(void) transition_resource_state(command_list, resource, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); - get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list); bug_if(is_radv_device(context.device)) - check_readback_data_uint(&rb, NULL, 500, 0); - release_resource_readback(&rb); + check_sub_resource_uint(resource, 0, queue, command_list, 500, 0); ID3D12DescriptorHeap_Release(cpu_descriptor_heap); ID3D12DescriptorHeap_Release(descriptor_heap); @@ -7906,7 +7903,7 @@ static void test_shader_instructions(void) struct ivec4 i; } output; bool skip_on_warp; - bool skip_on_mesa; + bool is_mesa_bug; } tests[] = { @@ -8671,12 +8668,6 @@ static void test_shader_instructions(void) continue; } - if (tests[i].skip_on_mesa && is_mesa_device(context.device)) - { - skip("Skipping shader '%s' test on Mesa.\n", tests[i].ps->name); - continue; - } - if (current_ps != tests[i].ps) { if (context.pipeline_state) @@ -8704,6 +8695,7 @@ static void test_shader_instructions(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(tests[i].is_mesa_bug && is_mesa_device(context.device)) check_sub_resource_vec4(context.render_target, 0, queue, command_list, &tests[i].output.f, 2); reset_command_list(command_list, context.allocator); diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index ae49bf4c68f9..74b8301ca278 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -220,12 +220,12 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); - ok_(line)(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + assert_that_(line)(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); hr = ID3D12CommandQueue_Signal(queue, fence, 1); - ok_(line)(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + assert_that_(line)(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); hr = wait_for_fence(fence, 1); - ok_(line)(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); + assert_that_(line)(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); ID3D12Fence_Release(fence); } diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 1b2aec5959f0..53fa0e763ea3 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -121,7 +121,7 @@ static ID3D12Resource *create_buffer_(unsigned int line, ID3D12Device *device, hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, initial_resource_state, NULL, &IID_ID3D12Resource, (void **)&buffer); - ok_(line)(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + assert_that_(line)(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); return buffer; } @@ -291,10 +291,10 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi HRESULT hr; hr = ID3D12Resource_GetDevice(texture, &IID_ID3D12Device, (void **)&device); - ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); + assert_that(hr == S_OK, "Failed to get device, hr %#x.\n", hr); resource_desc = ID3D12Resource_GetDesc(texture); - ok(resource_desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER, + assert_that(resource_desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER, "Resource %p is not texture.\n", texture); miplevel = sub_resource % resource_desc.MipLevels; @@ -317,7 +317,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RESOLVE_DEST, NULL, &IID_ID3D12Resource, (void **)&src_resource); - ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + assert_that(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); ID3D12GraphicsCommandList_ResolveSubresource(command_list, src_resource, 0, texture, sub_resource, resource_desc.Format); @@ -348,7 +348,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, NULL); hr = ID3D12GraphicsCommandList_Close(command_list); - ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + assert_that(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); exec_command_list(queue, command_list); wait_queue_idle(device, queue); @@ -360,7 +360,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi read_range.Begin = 0; read_range.End = resource_desc.Width; hr = ID3D12Resource_Map(rb->resource, 0, &read_range, &rb->data); - ok(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); + assert_that(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); } static void *get_readback_data(struct resource_readback *rb, -- 2.19.2

2 1

[PATCH vkd3d 1/2] vkd3d: Fix feature queries for depth/stencil formats.
by Józef Kucia 11 Mar '19

11 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 4 ++++ tests/d3d12.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3d9d90cb6558..204489c2993a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1801,6 +1801,8 @@ static HRESULT d3d12_device_check_multisample_quality_levels(struct d3d12_device goto done; if (!(format = vkd3d_get_format(data->Format, false))) + format = vkd3d_get_format(data->Format, true); + if (!format) { FIXME("Unhandled format %#x.\n", data->Format); return E_INVALIDARG; @@ -1934,6 +1936,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * data->Support1 = D3D12_FORMAT_SUPPORT1_NONE; data->Support2 = D3D12_FORMAT_SUPPORT2_NONE; if (!(format = vkd3d_get_format(data->Format, false))) + format = vkd3d_get_format(data->Format, true); + if (!format) { FIXME("Unhandled format %#x.\n", data->Format); return E_INVALIDARG; diff --git a/tests/d3d12.c b/tests/d3d12.c index 173c576e1855..e044a5385b21 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -343,6 +343,22 @@ static unsigned int format_block_height(DXGI_FORMAT format) } } +static const DXGI_FORMAT depth_stencil_formats[] = +{ + DXGI_FORMAT_R32G8X24_TYPELESS, + DXGI_FORMAT_D32_FLOAT_S8X24_UINT, + DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS, + DXGI_FORMAT_X32_TYPELESS_G8X24_UINT, + DXGI_FORMAT_R32_TYPELESS, + DXGI_FORMAT_D32_FLOAT, + DXGI_FORMAT_R24G8_TYPELESS, + DXGI_FORMAT_D24_UNORM_S8_UINT, + DXGI_FORMAT_R24_UNORM_X8_TYPELESS, + DXGI_FORMAT_X24_TYPELESS_G8_UINT, + DXGI_FORMAT_R16_TYPELESS, + DXGI_FORMAT_D16_UNORM, +}; + static void get_buffer_readback_with_command_list(ID3D12Resource *buffer, DXGI_FORMAT format, struct resource_readback *rb, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) { @@ -1172,6 +1188,15 @@ static void test_format_support(void) format_support.Support2 & unsupported_format_features[i].f.Support2); } + for (i = 0; i < ARRAY_SIZE(depth_stencil_formats); ++i) + { + memset(&format_support, 0, sizeof(format_support)); + format_support.Format = depth_stencil_formats[i]; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_SUPPORT, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } @@ -1292,6 +1317,17 @@ static void test_multisample_quality_levels(void) ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags); ok(format_support.NumQualityLevels >= 1, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + for (i = 0; i < ARRAY_SIZE(depth_stencil_formats); ++i) + { + memset(&format_support, 0, sizeof(format_support)); + format_support.Format = depth_stencil_formats[i]; + format_support.SampleCount = 4; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -- 2.19.2

2 1

[PATCH v2 2/7] user32: Fix minimum control size conditions when using EC_USEFONTINFO.
by Akihiro Sagawa 11 Mar '19

11 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/edit.c | 47 +++++++++++++---------------------------------- dlls/user32/tests/edit.c | 1 - 2 files changed, 13 insertions(+), 35 deletions(-)

2 1

[PATCH 5/5] d3d12: Set ordinal for D3D12CreateDevice().
by Józef Kucia 11 Mar '19

11 Mar '19

It seems that D3D12CreateDevice() is imported by ordinal on Windows. Reported by Sveinar Søpler. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/d3d12.spec | 2 +- dlls/d3d12/tests/d3d12.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec index 5c4f4cfecf8a..63c8db8d235f 100644 --- a/dlls/d3d12/d3d12.spec +++ b/dlls/d3d12/d3d12.spec @@ -1,5 +1,5 @@ @ stub GetBehaviorValue -@ stdcall D3D12CreateDevice(ptr long ptr ptr) +101 stdcall D3D12CreateDevice(ptr long ptr ptr) @ stdcall D3D12GetDebugInterface(ptr ptr) @ stub D3D12CoreCreateLayeredDevice @ stub D3D12CoreGetLayeredDeviceSize diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 6b6f056e8770..76efb561c4f7 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -774,6 +774,21 @@ static void check_sub_resource_uint_(unsigned int line, ID3D12Resource *texture, release_resource_readback(&rb); } +static void test_ordinals(void) +{ + PFN_D3D12_CREATE_DEVICE pfn_D3D12CreateDevice, pfn_101; + HMODULE d3d12; + + d3d12 = GetModuleHandleA("d3d12.dll"); + ok(!!d3d12, "Failed to get module handle.\n"); + + pfn_D3D12CreateDevice = (void *)GetProcAddress(d3d12, "D3D12CreateDevice"); + ok(!!pfn_D3D12CreateDevice, "Failed to get D3D12CreateDevice() proc address.\n"); + + pfn_101 = (void *)GetProcAddress(d3d12, (const char *)101); + ok(pfn_101 == pfn_D3D12CreateDevice, "Got %p, expected %p.\n", pfn_101, pfn_D3D12CreateDevice); +} + static void test_interfaces(void) { D3D12_COMMAND_QUEUE_DESC desc; @@ -1368,6 +1383,7 @@ START_TEST(d3d12) print_adapter_info(); + test_ordinals(); test_interfaces(); test_create_device(); test_draw(); -- 2.19.2

3 2

[PATCH 4/5] d3d12: Add test for creating device with adapter.
by Józef Kucia 11 Mar '19

11 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 156 ++++++++++++++++++++++++++++++++------- 1 file changed, 131 insertions(+), 25 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 205f13fd10c7..6b6f056e8770 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -40,6 +40,11 @@ static BOOL compare_color(DWORD c1, DWORD c2, unsigned int max_diff) return TRUE; } +static BOOL equal_luid(LUID a, LUID b) +{ + return a.LowPart == b.LowPart && a.HighPart == b.HighPart; +} + static unsigned int format_size(DXGI_FORMAT format) { switch (format) @@ -282,6 +287,25 @@ static ID3D12PipelineState *create_pipeline_state_(unsigned int line, ID3D12Devi return pipeline_state; } +#define create_command_queue(a, b) create_command_queue_(__LINE__, a, b) +static ID3D12CommandQueue *create_command_queue_(unsigned int line, + ID3D12Device *device, D3D12_COMMAND_LIST_TYPE type) +{ + D3D12_COMMAND_QUEUE_DESC command_queue_desc; + ID3D12CommandQueue *queue; + HRESULT hr; + + command_queue_desc.Type = type; + command_queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; + command_queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; + command_queue_desc.NodeMask = 0; + hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, + &IID_ID3D12CommandQueue, (void **)&queue); + ok_(__FILE__, line)(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); + + return queue; +} + struct test_context_desc { BOOL no_pipeline; @@ -381,7 +405,6 @@ static void create_render_target_(unsigned int line, struct test_context *contex static BOOL init_test_context_(unsigned int line, struct test_context *context, const struct test_context_desc *desc) { - D3D12_COMMAND_QUEUE_DESC command_queue_desc; D3D12_DESCRIPTOR_HEAP_DESC rtv_heap_desc; unsigned int rtv_size; ID3D12Device *device; @@ -397,13 +420,7 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context, } device = context->device; - command_queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; - command_queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; - command_queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; - command_queue_desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, - &IID_ID3D12CommandQueue, (void **)&context->queue); - ok_(__FILE__, line)(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); + context->queue = create_command_queue_(line, device, D3D12_COMMAND_LIST_TYPE_DIRECT); for (i = 0; i < ARRAY_SIZE(context->allocator); ++i) { @@ -577,11 +594,9 @@ static HWND create_window(DWORD style) return CreateWindowA("static", "d3d12_test", style, 0, 0, 256, 256, NULL, NULL, NULL, NULL); } -static IDXGISwapChain3 *create_swapchain(struct test_context *context, HWND window, - unsigned int buffer_count, DXGI_FORMAT format, unsigned int width, unsigned int height) +static IDXGISwapChain3 *create_swapchain(struct test_context *context, ID3D12CommandQueue *queue, + HWND window, unsigned int buffer_count, DXGI_FORMAT format, unsigned int width, unsigned int height) { - ID3D12CommandQueue *queue = context->queue; - ID3D12Device *device = context->device; IDXGISwapChain1 *swapchain1; DXGI_SWAP_CHAIN_DESC1 desc; IDXGISwapChain3 *swapchain; @@ -591,7 +606,8 @@ static IDXGISwapChain3 *create_swapchain(struct test_context *context, HWND wind assert(buffer_count <= MAX_FRAME_COUNT); - destroy_render_targets(context); + if (context) + destroy_render_targets(context); hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); @@ -617,15 +633,18 @@ static IDXGISwapChain3 *create_swapchain(struct test_context *context, HWND wind ok(hr == S_OK, "Failed to query IDXGISwapChain3, hr %#x.\n", hr); IDXGISwapChain1_Release(swapchain1); - for (i = 0; i < buffer_count; ++i) + if (context) { - hr = IDXGISwapChain3_GetBuffer(swapchain, i, &IID_ID3D12Resource, (void **)&context->render_target[i]); - ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", i, hr); - ID3D12Device_CreateRenderTargetView(device, context->render_target[i], NULL, context->rtv[i]); - } + set_viewport(&context->viewport, 0.0f, 0.0f, width, height, 0.0f, 1.0f); + SetRect(&context->scissor_rect, 0, 0, width, height); - set_viewport(&context->viewport, 0.0f, 0.0f, width, height, 0.0f, 1.0f); - SetRect(&context->scissor_rect, 0, 0, width, height); + for (i = 0; i < buffer_count; ++i) + { + hr = IDXGISwapChain3_GetBuffer(swapchain, i, &IID_ID3D12Resource, (void **)&context->render_target[i]); + ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", i, hr); + ID3D12Device_CreateRenderTargetView(context->device, context->render_target[i], NULL, context->rtv[i]); + } + } return swapchain; } @@ -808,6 +827,90 @@ static void test_interfaces(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_device(void) +{ + DXGI_ADAPTER_DESC adapter_desc; + IDXGISwapChain3 *swapchain; + ID3D12CommandQueue *queue; + LUID adapter_luid, luid; + IDXGIFactory4 *factory; + IDXGIAdapter *adapter; + ID3D12Device *device; + IDXGIOutput *output; + ULONG refcount; + HWND window; + HRESULT hr; + RECT rect; + BOOL ret; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory4_EnumAdapters(factory, 0, &adapter); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IDXGIFactory4_Release(factory); + + hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + adapter_luid = adapter_desc.AdapterLuid; + + refcount = get_refcount(adapter); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + hr = D3D12CreateDevice((IUnknown *)adapter, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDXGIAdapter_Release(adapter); + ok(refcount >= 1, "Got unexpected refcount %u.\n", refcount); + adapter = NULL; + + luid = ID3D12Device_GetAdapterLuid(device); + ok(equal_luid(luid, adapter_luid), "Got LUID %08x:%08x, expected %08x:%08x.\n", + luid.HighPart, luid.LowPart, adapter_luid.HighPart, adapter_luid.LowPart); + + queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT); + window = create_window(WS_VISIBLE); + ret = GetClientRect(window, &rect); + ok(ret, "Failed to get client rect.\n"); + swapchain = create_swapchain(NULL, queue, window, 2, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + + hr = IDXGISwapChain3_GetContainingOutput(swapchain, &output); + if (hr != DXGI_ERROR_UNSUPPORTED) + { + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIOutput_GetParent(output, &IID_IDXGIAdapter, (void **)&adapter); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IDXGIOutput_Release(output); + + memset(&adapter_desc, 0, sizeof(adapter_desc)); + hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + ok(equal_luid(adapter_desc.AdapterLuid, adapter_luid), + "Got LUID %08x:%08x, expected %08x:%08x.\n", + adapter_desc.AdapterLuid.HighPart, adapter_desc.AdapterLuid.LowPart, + adapter_luid.HighPart, adapter_luid.LowPart); + } + else + { + skip("GetContaingOutput() is not supported.\n"); + } + + refcount = IDXGISwapChain3_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + DestroyWindow(window); + ID3D12CommandQueue_Release(queue); + + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_draw(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -909,7 +1012,7 @@ static void test_swapchain_draw(void) context.pipeline_state = create_pipeline_state(device, context.root_signature, tests[i].format, &ps); - swapchain = create_swapchain(&context, window, 2, tests[i].format, rect.right, rect.bottom); + swapchain = create_swapchain(&context, queue, window, 2, tests[i].format, rect.right, rect.bottom); index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); backbuffer = context.render_target[index]; rtv = context.rtv[index]; @@ -977,7 +1080,8 @@ static void test_swapchain_refcount(void) window = create_window(WS_VISIBLE); ret = GetClientRect(window, &rect); ok(ret, "Failed to get client rect.\n"); - swapchain = create_swapchain(&context, window, buffer_count, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + swapchain = create_swapchain(&context, context.queue, window, + buffer_count, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); for (i = 0; i < buffer_count; ++i) { @@ -1054,7 +1158,7 @@ static void test_swapchain_size_mismatch(void) queue = context.queue; window = CreateWindowA("static", "d3d12_test", WS_VISIBLE, 0, 0, 200, 200, NULL, NULL, NULL, NULL); - swapchain = create_swapchain(&context, window, 2, DXGI_FORMAT_B8G8R8A8_UNORM, 400, 400); + swapchain = create_swapchain(&context, queue, window, 2, DXGI_FORMAT_B8G8R8A8_UNORM, 400, 400); index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); backbuffer = context.render_target[index]; rtv = context.rtv[index]; @@ -1087,7 +1191,7 @@ static void test_swapchain_size_mismatch(void) window = create_window(WS_VISIBLE); ret = GetClientRect(window, &rect); ok(ret, "Failed to get client rect.\n"); - swapchain = create_swapchain(&context, window, 4, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + swapchain = create_swapchain(&context, queue, window, 4, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); @@ -1177,7 +1281,8 @@ static void test_swapchain_backbuffer_index(void) window = create_window(WS_VISIBLE); ret = GetClientRect(window, &rect); ok(ret, "Failed to get client rect.\n"); - swapchain = create_swapchain(&context, window, buffer_count, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + swapchain = create_swapchain(&context, queue, window, + buffer_count, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); @@ -1264,6 +1369,7 @@ START_TEST(d3d12) print_adapter_info(); test_interfaces(); + test_create_device(); test_draw(); test_swapchain_draw(); test_swapchain_refcount(); -- 2.19.2

3 2