December 2018 - Wine-commits

Nikolay Sivov : msxml3: Fix uri object leak on error path (Valgrind).
by Alexandre Julliard 17 Dec '18

17 Dec '18

Module: wine Branch: master Commit: 5825ad56f65ae052e6ed26f73c6672357c8af59d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5825ad56f65ae052e6ed26f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 17 08:16:14 2018 +0300 msxml3: Fix uri object leak on error path (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 445caae..76d3fdb 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2292,8 +2292,8 @@ static HRESULT WINAPI domdoc_load( if ( filename ) { + IUri *uri = NULL; IMoniker *mon; - IUri *uri; if (This->properties->uri) { @@ -2310,15 +2310,19 @@ static HRESULT WINAPI domdoc_load( IMoniker_Release(mon); } - if ( FAILED(hr) ) - This->error = E_FAIL; - else + if (SUCCEEDED(hr)) { get_doc(This)->name = (char *)xmlchar_from_wcharn(filename, -1, TRUE); This->properties->uri = uri; hr = This->error = S_OK; *isSuccessful = VARIANT_TRUE; } + else + { + if (uri) + IUri_Release(uri); + This->error = E_FAIL; + } } if(!filename || FAILED(hr)) {

1 0

Nikolay Sivov : oledb32/tests: Fix string leaks (Valgrind).
by Alexandre Julliard 17 Dec '18

17 Dec '18

Module: wine Branch: master Commit: 1d52cfc47f2565d5ccd69cca64c48757abccfda2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d52cfc47f2565d5ccd69cca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 17 08:16:13 2018 +0300 oledb32/tests: Fix string leaks (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/convert.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 4416240..5dab9ff 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3786,6 +3786,7 @@ static void test_converttonumeric(void) todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); todo_wine test_numeric_val(&dst, &result5); + SysFreeString(bstr); bstr = SysAllocString(largeW); dst_status = 0; @@ -3798,6 +3799,7 @@ static void test_converttonumeric(void) todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); todo_wine test_numeric_val(&dst, &result6); + SysFreeString(bstr); } START_TEST(convert)

1 0

Nikolay Sivov : dwrite/tests: Fix another factory leak (Valgrind).
by Alexandre Julliard 17 Dec '18

17 Dec '18

Module: wine Branch: master Commit: 3d100f7d56fafd1c0bd1f6ecf2304e2e96457abf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d100f7d56fafd1c0bd1f6ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 17 08:16:12 2018 +0300 dwrite/tests: Fix another factory leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index aa1562e..3f41289 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -8887,6 +8887,8 @@ static void test_localfontfileloader(void) IDWriteFontFileLoader_Release(loader2); ref = IDWriteFactory_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); + ref = IDWriteFactory_Release(factory2); + ok(ref == 0, "factory not released, %u\n", ref); DELETE_FONTFILE(path); }

1 0

Alexandre Julliard : packaging: Add Android packaging script.
by Alexandre Julliard 17 Dec '18

17 Dec '18

Module: tools Branch: master Commit: 071a30963b3ca080b35075809176d52ae3792436 URL: https://source.winehq.org/git/tools.git/?a=commit;h=071a30963b3ca080b350758… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 17 18:57:17 2018 +0100 packaging: Add Android packaging script. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/android/LICENSE.txt | 58 ++++++++ packaging/android/build-apks | 313 ++++++++++++++++++++++++++++++++++++++++++ packaging/android/cups.diff | 142 +++++++++++++++++++ 3 files changed, 513 insertions(+) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=071a30963b3ca080b35…

1 0

Józef Kucia : vkd3d-shader: Add support for dual source blending.
by Alexandre Julliard 17 Dec '18

17 Dec '18

Module: vkd3d Branch: master Commit: 5b0ed414a15aafc7bcd4fa79d2b2d7da552ff14f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5b0ed414a15aafc7bcd4fa7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 13 10:28:36 2018 +0100 vkd3d-shader: Add support for dual source blending. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 7d9bf70..1153fde 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -165,6 +165,7 @@ struct vkd3d_shader_compile_arguments const void *next; enum vkd3d_shader_target target; + bool dual_source_blending; const unsigned int *output_swizzles; unsigned int output_swizzle_count; }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ec7cab6..a24585c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3400,6 +3400,14 @@ static unsigned int get_shader_output_swizzle(const struct vkd3d_dxbc_compiler * return compile_args->output_swizzles[register_idx]; } +static bool is_dual_source_blending(const struct vkd3d_dxbc_compiler *compiler) +{ + const struct vkd3d_shader_compile_arguments *compile_args = compiler->compile_args; + + return compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL + && compile_args && compile_args->dual_source_blending; +} + static void calculate_clip_or_cull_distance_mask(const struct vkd3d_shader_signature_element *e, uint32_t *mask) { @@ -3544,7 +3552,16 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler } else { - vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, reg->idx[0].offset); + if (is_dual_source_blending(compiler) && reg->idx[0].offset < 2) + { + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, 0); + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationIndex, reg->idx[0].offset); + } + else + { + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, reg->idx[0].offset); + } + if (component_idx) vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationComponent, component_idx); }

1 0

Józef Kucia : vkd3d: Implement dual source blending.
by Alexandre Julliard 17 Dec '18

17 Dec '18

Module: vkd3d Branch: master Commit: c93d9bc714d7062eff268327436acbeac613ba15 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c93d9bc714d7062eff26832… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 13 10:28:37 2018 +0100 vkd3d: Implement dual source blending. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 64c2158..9c2d3ac 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1783,6 +1783,21 @@ static void blend_attachment_from_d3d12(struct VkPipelineColorBlendAttachmentSta FIXME("Ignoring LogicOpEnable %#x.\n", d3d12_desc->LogicOpEnable); } +static bool is_dual_source_blending_blend(D3D12_BLEND b) +{ + return b == D3D12_BLEND_SRC1_COLOR || b == D3D12_BLEND_INV_SRC1_COLOR + || b == D3D12_BLEND_SRC1_ALPHA || b == D3D12_BLEND_INV_SRC1_ALPHA; +} + +static bool is_dual_source_blending(const D3D12_RENDER_TARGET_BLEND_DESC *desc) +{ + return desc->BlendEnable + && (is_dual_source_blending_blend(desc->SrcBlend) + || is_dual_source_blending_blend(desc->DestBlend) + || is_dual_source_blending_blend(desc->SrcBlendAlpha) + || is_dual_source_blending_blend(desc->DestBlendAlpha)); +} + static HRESULT compute_input_layout_offsets(const D3D12_INPUT_LAYOUT_DESC *input_layout_desc, uint32_t *offsets) { @@ -2063,9 +2078,29 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ps_compile_args.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS; ps_compile_args.next = NULL; ps_compile_args.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; + ps_compile_args.dual_source_blending = is_dual_source_blending(&desc->BlendState.RenderTarget[0]); ps_compile_args.output_swizzles = ps_output_swizzle; ps_compile_args.output_swizzle_count = rt_count; + if (ps_compile_args.dual_source_blending && rt_count > 1) + { + WARN("Only one render target is allowed when dual source blending is used.\n"); + hr = E_INVALIDARG; + goto fail; + } + if (ps_compile_args.dual_source_blending && desc->BlendState.IndependentBlendEnable) + { + for (i = 1; i < ARRAY_SIZE(desc->BlendState.RenderTarget); ++i) + { + if (desc->BlendState.RenderTarget[i].BlendEnable) + { + WARN("Blend enable cannot be set for render target %u when dual source blending is used.\n", i); + hr = E_INVALIDARG; + goto fail; + } + } + } + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE; shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping;

1 0

Józef Kucia : tests: Add test for dual source blending.
by Alexandre Julliard 17 Dec '18

17 Dec '18

Module: vkd3d Branch: master Commit: 46034d4069f3368f37336ce98f91910c28535063 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=46034d4069f3368f37336ce… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 13 10:28:38 2018 +0100 tests: Add test for dual source blending. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 463e304..420d751 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21488,6 +21488,136 @@ static void test_blend_factor(void) destroy_test_context(&context); } +static void test_dual_source_blending(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + unsigned int i; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + float4 c0; + float4 c1; + + void main(out float4 o0 : SV_Target0, out float4 o1 : SV_Target1) + { + o0 = c0; + o1 = c1; + } +#endif + 0x43425844, 0x823a4ecf, 0xd409abf6, 0xe76697ab, 0x9b53c9a5, 0x00000001, 0x000000f8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000088, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000044, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x00000038, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, 0x545f5653, + 0x65677261, 0xabab0074, 0x58454853, 0x00000068, 0x00000050, 0x0000001a, 0x0100086a, 0x04000059, + 0x00208e46, 0x00000000, 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, + 0x00000001, 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x06000036, + 0x001020f2, 0x00000001, 0x00208e46, 0x00000000, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const struct + { + struct + { + struct vec4 c0; + struct vec4 c1; + } constants; + unsigned int expected_color; + } + tests[] = + { + {{{0.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f, 0.0f}}, 0x00000000}, + {{{0.0f, 0.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 0.0f, 1.0f}}, 0xff0000ff}, + {{{1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 0.0f, 0.0f}}, 0xff0000ff}, + {{{1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 1.0f, 1.0f, 0.0f}}, 0xffffffff}, + }; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_32bit_constants_root_signature(context.device, + 0, sizeof(tests->constants) / sizeof(uint32_t), D3D12_SHADER_VISIBILITY_PIXEL); + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, NULL, &ps, NULL); + pso_desc.BlendState.RenderTarget[0].BlendEnable = TRUE; + pso_desc.BlendState.RenderTarget[0].SrcBlend = D3D12_BLEND_SRC_COLOR; + pso_desc.BlendState.RenderTarget[0].DestBlend = D3D12_BLEND_SRC1_COLOR; + pso_desc.BlendState.RenderTarget[0].BlendOp = D3D12_BLEND_OP_ADD; + pso_desc.BlendState.RenderTarget[0].SrcBlendAlpha = D3D12_BLEND_SRC_ALPHA; + pso_desc.BlendState.RenderTarget[0].DestBlendAlpha = D3D12_BLEND_SRC1_ALPHA; + pso_desc.BlendState.RenderTarget[0].BlendOpAlpha = D3D12_BLEND_OP_ADD; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 8, &tests[i].constants, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, tests[i].expected_color, 1); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + ID3D12PipelineState_Release(context.pipeline_state); + pso_desc.BlendState.IndependentBlendEnable = TRUE; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + ID3D12PipelineState_Release(context.pipeline_state); + context.pipeline_state = NULL; + + pso_desc.BlendState.RenderTarget[1] = pso_desc.BlendState.RenderTarget[0]; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + pso_desc.BlendState.RenderTarget[1].DestBlendAlpha = D3D12_BLEND_SRC_ALPHA; + pso_desc.BlendState.RenderTarget[1].DestBlend = D3D12_BLEND_SRC_COLOR; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + context.pipeline_state = NULL; + + pso_desc.NumRenderTargets = 2; + pso_desc.RTVFormats[1] = pso_desc.RTVFormats[0]; + pso_desc.BlendState.IndependentBlendEnable = FALSE; + pso_desc.BlendState.RenderTarget[0].BlendEnable = TRUE; + pso_desc.BlendState.RenderTarget[0].SrcBlend = D3D12_BLEND_SRC_COLOR; + pso_desc.BlendState.RenderTarget[0].DestBlend = D3D12_BLEND_SRC1_COLOR; + pso_desc.BlendState.RenderTarget[0].BlendOp = D3D12_BLEND_OP_ADD; + pso_desc.BlendState.RenderTarget[0].SrcBlendAlpha = D3D12_BLEND_SRC_ALPHA; + pso_desc.BlendState.RenderTarget[0].DestBlendAlpha = D3D12_BLEND_SRC1_ALPHA; + pso_desc.BlendState.RenderTarget[0].BlendOpAlpha = D3D12_BLEND_OP_ADD; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + destroy_test_context(&context); +} + static void test_multisample_rendering(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -21949,6 +22079,7 @@ START_TEST(d3d12) run_test(test_suballocate_small_textures); run_test(test_command_list_initial_pipeline_state); run_test(test_blend_factor); + run_test(test_dual_source_blending); run_test(test_multisample_rendering); run_test(test_primitive_restart); }

1 0

Józef Kucia : vkd3d: Validate RTV format for inactive render targets in pipeline state desc.
by Alexandre Julliard 17 Dec '18

17 Dec '18

Module: vkd3d Branch: master Commit: 5bb045c8f914e3380bea10ba9eb82f0d3a1d2ff1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5bb045c8f914e3380bea10b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 13 10:28:39 2018 +0100 vkd3d: Validate RTV format for inactive render targets in pipeline state desc. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 9 +++++++++ tests/d3d12.c | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 9c2d3ac..b2f177c 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1945,6 +1945,15 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s memset(&input_signature, 0, sizeof(input_signature)); + for (i = desc->NumRenderTargets; i < ARRAY_SIZE(desc->RTVFormats); ++i) + { + if (desc->RTVFormats[i] != DXGI_FORMAT_UNKNOWN) + { + WARN("Format must be set to DXGI_FORMAT_UNKNOWN for inactive render targets.\n"); + return E_INVALIDARG; + } + } + if (!(root_signature = unsafe_impl_from_ID3D12RootSignature(desc->pRootSignature))) { WARN("Root signature is NULL.\n"); diff --git a/tests/d3d12.c b/tests/d3d12.c index 420d751..b96ca43 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2491,6 +2491,13 @@ static void test_create_graphics_pipeline_state(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID3D12PipelineState_Release(pipeline_state); + /* Inactive render targets formats must be set to DXGI_FORMAT_UNKNOWN. */ + init_pipeline_state_desc(&pso_desc, root_signature, DXGI_FORMAT_R8G8B8A8_UNORM, NULL, NULL, NULL); + pso_desc.RTVFormats[1] = DXGI_FORMAT_R8G8B8A8_UNORM; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(device);

1 0

Józef Kucia : tests: Use vkd3d_test_set_context() in more tests.
by Alexandre Julliard 17 Dec '18

17 Dec '18

Module: vkd3d Branch: master Commit: ce3946419262714bbeae6d7693a850040ed03de9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ce3946419262714bbeae6d7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 13 10:28:40 2018 +0100 tests: Use vkd3d_test_set_context() in more tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=ce3946419262714bbea…

1 0

Józef Kucia : tests: Detect device vendor only on Windows.
by Alexandre Julliard 17 Dec '18

17 Dec '18

Module: vkd3d Branch: master Commit: 6cd06fa8747e107d640b9b5c9f41abf42ce01235 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6cd06fa8747e107d640b9b5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 13 10:28:41 2018 +0100 tests: Detect device vendor only on Windows. For running cross-compiled tests in Wine. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12_crosstest.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index ee12c89..6357d48 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -303,6 +303,9 @@ static inline bool is_amd_device(ID3D12Device *device) HRESULT hr; LUID luid; + if (!vkd3d_test_platform_is_windows()) + return false; + luid = ID3D12Device_GetAdapterLuid(device); hr = CreateDXGIFactory1(&IID_IDXGIFactory4, (void **)&factory);

1 0