June 2020 - Wine-devel - list.winehq.org

[PATCH vkd3d 2/5] vkd3d-shader: Rename the vkd3d_shader_domain_shader_compile_arguments structure.
by Henri Verbeet 18 Jun '20

18 Jun '20

To vkd3d_shader_spirv_domain_shader_target_info. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/spirv.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 2b07906..1f58ebd 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -32,9 +32,9 @@ enum vkd3d_shader_structure_type /* 1.2 */ VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO, VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, + VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_DOMAIN_SHADER_TARGET_INFO, VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO, VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO, - VKD3D_SHADER_STRUCTURE_TYPE_DOMAIN_SHADER_COMPILE_ARGUMENTS, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; @@ -269,7 +269,7 @@ enum vkd3d_tessellator_partitioning }; /* Extends vkd3d_shader_spirv_target_info. */ -struct vkd3d_shader_domain_shader_compile_arguments +struct vkd3d_shader_spirv_domain_shader_target_info { enum vkd3d_shader_structure_type type; const void *next; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 31dcc4f..9bcb59d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -8671,7 +8671,7 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_code *spirv) { const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; - const struct vkd3d_shader_domain_shader_compile_arguments *ds_args; + const struct vkd3d_shader_spirv_domain_shader_target_info *ds_info; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_phase *phase; @@ -8685,14 +8685,14 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, if (compiler->shader_type == VKD3D_SHADER_TYPE_DOMAIN) { - if (info && (ds_args = vkd3d_find_struct(info->next, DOMAIN_SHADER_COMPILE_ARGUMENTS))) + if (info && (ds_info = vkd3d_find_struct(info->next, SPIRV_DOMAIN_SHADER_TARGET_INFO))) { - vkd3d_dxbc_compiler_emit_tessellator_output_primitive(compiler, ds_args->output_primitive); - vkd3d_dxbc_compiler_emit_tessellator_partitioning(compiler, ds_args->partitioning); + vkd3d_dxbc_compiler_emit_tessellator_output_primitive(compiler, ds_info->output_primitive); + vkd3d_dxbc_compiler_emit_tessellator_partitioning(compiler, ds_info->partitioning); } else if (vkd3d_dxbc_compiler_is_opengl_target(compiler)) { - ERR("vkd3d_shader_domain_shader_compile_arguments are required for " + ERR("vkd3d_shader_spirv_domain_shader_target_info is required for " "OpenGL tessellation evaluation shader.\n"); } } -- 2.11.0

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Rename the vkd3d_shader_compile_arguments structure to vkd3d_shader_spirv_target_info.
by Henri Verbeet 18 Jun '20

18 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 10 +++---- libs/vkd3d-shader/spirv.c | 48 ++++++++++++++++---------------- libs/vkd3d-shader/vkd3d_shader_main.c | 22 +++++++-------- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- libs/vkd3d/state.c | 38 ++++++++++++------------- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 67d4562..2b07906 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -31,8 +31,8 @@ enum vkd3d_shader_structure_type { /* 1.2 */ VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO, - VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS, VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, + VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO, VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO, VKD3D_SHADER_STRUCTURE_TYPE_DOMAIN_SHADER_COMPILE_ARGUMENTS, @@ -234,7 +234,7 @@ enum vkd3d_shader_target_extension VKD3D_SHADER_TARGET_EXTENSION_SPV_EXT_DEMOTE_TO_HELPER_INVOCATION, }; -struct vkd3d_shader_compile_arguments +struct vkd3d_shader_spirv_target_info { enum vkd3d_shader_structure_type type; const void *next; @@ -268,7 +268,7 @@ enum vkd3d_tessellator_partitioning VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN = 4, }; -/* Extends vkd3d_shader_compile_arguments. */ +/* Extends vkd3d_shader_spirv_target_info. */ struct vkd3d_shader_domain_shader_compile_arguments { enum vkd3d_shader_structure_type type; @@ -635,7 +635,7 @@ struct vkd3d_shader_signature int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_code *spirv, unsigned int compiler_options, const struct vkd3d_shader_interface_info *shader_interface_info, - const struct vkd3d_shader_compile_arguments *compile_args); + const struct vkd3d_shader_spirv_target_info *target_info); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, @@ -667,7 +667,7 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature typedef int (*PFN_vkd3d_shader_compile_dxbc)(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_code *spirv, unsigned int compiler_options, const struct vkd3d_shader_interface_info *shader_interface_info, - const struct vkd3d_shader_compile_arguments *compile_args); + const struct vkd3d_shader_spirv_target_info *target_info); typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code); typedef int (*PFN_vkd3d_shader_parse_root_signature)(const struct vkd3d_shader_code *dxbc, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5a37b8f..31dcc4f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2078,7 +2078,7 @@ struct vkd3d_dxbc_compiler struct vkd3d_shader_interface_info shader_interface; struct vkd3d_push_constant_buffer_binding *push_constants; - const struct vkd3d_shader_compile_arguments *compile_args; + const struct vkd3d_shader_spirv_target_info *spirv_target_info; bool after_declarations_section; const struct vkd3d_shader_signature *input_signature; @@ -2122,7 +2122,7 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, uint32_t compiler_options, const struct vkd3d_shader_interface_info *shader_interface, - const struct vkd3d_shader_compile_arguments *compile_args, + const struct vkd3d_shader_spirv_target_info *target_info, const struct vkd3d_shader_scan_info *scan_info) { const struct vkd3d_shader_signature *patch_constant_signature = &shader_desc->patch_constant_signature; @@ -2171,7 +2171,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader compiler->push_constants[i].pc = shader_interface->push_constant_buffers[i]; } } - compiler->compile_args = compile_args; + compiler->spirv_target_info = target_info; compiler->scan_info = scan_info; @@ -2182,8 +2182,9 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader static enum vkd3d_shader_target vkd3d_dxbc_compiler_get_target(const struct vkd3d_dxbc_compiler *compiler) { - const struct vkd3d_shader_compile_arguments *args = compiler->compile_args; - return args ? args->target : VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; + const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; + + return info ? info->target : VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; } static bool vkd3d_dxbc_compiler_is_opengl_target(const struct vkd3d_dxbc_compiler *compiler) @@ -2194,12 +2195,12 @@ static bool vkd3d_dxbc_compiler_is_opengl_target(const struct vkd3d_dxbc_compile static bool vkd3d_dxbc_compiler_is_target_extension_supported(const struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_target_extension extension) { - const struct vkd3d_shader_compile_arguments *args = compiler->compile_args; + const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; unsigned int i; - for (i = 0; args && i < args->target_extension_count; ++i) + for (i = 0; info && i < info->target_extension_count; ++i) { - if (args->target_extensions[i] == extension) + if (info->target_extensions[i] == extension) return true; } @@ -2594,13 +2595,13 @@ static uint32_t vkd3d_dxbc_compiler_emit_array_variable(struct vkd3d_dxbc_compil static const struct vkd3d_shader_parameter *vkd3d_dxbc_compiler_get_shader_parameter( struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_parameter_name name) { - const struct vkd3d_shader_compile_arguments *compile_args = compiler->compile_args; + const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; unsigned int i; - for (i = 0; compile_args && i < compile_args->parameter_count; ++i) + for (i = 0; info && i < info->parameter_count; ++i) { - if (compile_args->parameters[i].name == name) - return &compile_args->parameters[i]; + if (info->parameters[i].name == name) + return &info->parameters[i]; } return NULL; @@ -2635,12 +2636,12 @@ static uint32_t vkd3d_dxbc_compiler_alloc_spec_constant_id(struct vkd3d_dxbc_com { if (!compiler->current_spec_constant_id) { - const struct vkd3d_shader_compile_arguments *compile_args = compiler->compile_args; + const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; unsigned int i, id = 0; - for (i = 0; compiler->compile_args && i < compile_args->parameter_count; ++i) + for (i = 0; info && i < info->parameter_count; ++i) { - const struct vkd3d_shader_parameter *current = &compile_args->parameters[i]; + const struct vkd3d_shader_parameter *current = &info->parameters[i]; if (current->type == VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT) id = max(current->u.specialization_constant.id + 1, id); @@ -4206,21 +4207,20 @@ static unsigned int vkd3d_dxbc_compiler_get_output_variable_index( static unsigned int get_shader_output_swizzle(const struct vkd3d_dxbc_compiler *compiler, unsigned int register_idx) { - const struct vkd3d_shader_compile_arguments *compile_args; + const struct vkd3d_shader_spirv_target_info *info; - if (!(compile_args = compiler->compile_args)) + if (!(info = compiler->spirv_target_info)) return VKD3D_NO_SWIZZLE; - if (register_idx >= compile_args->output_swizzle_count) + if (register_idx >= info->output_swizzle_count) return VKD3D_NO_SWIZZLE; - return compile_args->output_swizzles[register_idx]; + return info->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; + const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; - return compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL - && compile_args && compile_args->dual_source_blending; + return compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL && info && info->dual_source_blending; } static void calculate_clip_or_cull_distance_mask(const struct vkd3d_shader_signature_element *e, @@ -8670,7 +8670,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_code *spirv) { - const struct vkd3d_shader_compile_arguments *compile_args = compiler->compile_args; + const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; const struct vkd3d_shader_domain_shader_compile_arguments *ds_args; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_phase *phase; @@ -8685,7 +8685,7 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, if (compiler->shader_type == VKD3D_SHADER_TYPE_DOMAIN) { - if (compile_args && (ds_args = vkd3d_find_struct(compile_args->next, DOMAIN_SHADER_COMPILE_ARGUMENTS))) + if (info && (ds_args = vkd3d_find_struct(info->next, DOMAIN_SHADER_COMPILE_ARGUMENTS))) { vkd3d_dxbc_compiler_emit_tessellator_output_primitive(compiler, ds_args->output_primitive); vkd3d_dxbc_compiler_emit_tessellator_partitioning(compiler, ds_args->partitioning); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index aa486cc..38cb2ee 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -103,24 +103,24 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) free_shader_desc(&parser->shader_desc); } -static int vkd3d_shader_validate_compile_args(const struct vkd3d_shader_compile_arguments *compile_args) +static int vkd3d_shader_validate_spirv_target_info(const struct vkd3d_shader_spirv_target_info *info) { - if (!compile_args) + if (!info) return VKD3D_OK; - if (compile_args->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS) + if (info->type != VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO) { - WARN("Invalid structure type %#x.\n", compile_args->type); + WARN("Invalid structure type %#x.\n", info->type); return VKD3D_ERROR_INVALID_ARGUMENT; } - switch (compile_args->target) + switch (info->target) { case VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5: case VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0: break; default: - WARN("Invalid shader target %#x.\n", compile_args->target); + WARN("Invalid shader target %#x.\n", info->target); return VKD3D_ERROR_INVALID_ARGUMENT; } @@ -130,7 +130,7 @@ static int vkd3d_shader_validate_compile_args(const struct vkd3d_shader_compile_ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_code *spirv, unsigned int compiler_options, const struct vkd3d_shader_interface_info *shader_interface_info, - const struct vkd3d_shader_compile_arguments *compile_args) + const struct vkd3d_shader_spirv_target_info *info) { struct vkd3d_shader_instruction instruction; struct vkd3d_dxbc_compiler *spirv_compiler; @@ -138,8 +138,8 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_parser parser; int ret; - TRACE("dxbc {%p, %zu}, spirv %p, compiler_options %#x, shader_interface_info %p, compile_args %p.\n", - dxbc->code, dxbc->size, spirv, compiler_options, shader_interface_info, compile_args); + TRACE("dxbc {%p, %zu}, spirv %p, compiler_options %#x, shader_interface_info %p, info %p.\n", + dxbc->code, dxbc->size, spirv, compiler_options, shader_interface_info, info); if (shader_interface_info && shader_interface_info->type != VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO) { @@ -147,7 +147,7 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, return VKD3D_ERROR_INVALID_ARGUMENT; } - if ((ret = vkd3d_shader_validate_compile_args(compile_args)) < 0) + if ((ret = vkd3d_shader_validate_spirv_target_info(info)) < 0) return ret; scan_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO; @@ -164,7 +164,7 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, vkd3d_shader_trace(parser.data); if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version, - &parser.shader_desc, compiler_options, shader_interface_info, compile_args, &scan_info))) + &parser.shader_desc, compiler_options, shader_interface_info, info, &scan_info))) { ERR("Failed to create DXBC compiler.\n"); vkd3d_shader_parser_destroy(&parser); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 97371f9..a98eda6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -822,7 +822,7 @@ struct vkd3d_dxbc_compiler; struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, uint32_t compiler_options, const struct vkd3d_shader_interface_info *shader_interface_info, - const struct vkd3d_shader_compile_arguments *compile_args, + const struct vkd3d_shader_spirv_target_info *target_info, const struct vkd3d_shader_scan_info *scan_info) DECLSPEC_HIDDEN; int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 11db8b5..3f158d0 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1327,7 +1327,7 @@ struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12Pipeline static HRESULT create_shader_stage(struct d3d12_device *device, struct VkPipelineShaderStageCreateInfo *stage_desc, enum VkShaderStageFlagBits stage, const D3D12_SHADER_BYTECODE *code, const struct vkd3d_shader_interface_info *shader_interface, - const struct vkd3d_shader_compile_arguments *compile_args) + const struct vkd3d_shader_spirv_target_info *target_info) { struct vkd3d_shader_code dxbc = {code->pShaderBytecode, code->BytecodeLength}; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -1347,7 +1347,7 @@ static HRESULT create_shader_stage(struct d3d12_device *device, shader_desc.pNext = NULL; shader_desc.flags = 0; - if ((ret = vkd3d_shader_compile_dxbc(&dxbc, &spirv, 0, shader_interface, compile_args)) < 0) + if ((ret = vkd3d_shader_compile_dxbc(&dxbc, &spirv, 0, shader_interface, target_info)) < 0) { WARN("Failed to compile shader, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); @@ -1990,12 +1990,12 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s const D3D12_STREAM_OUTPUT_DESC *so_desc = &desc->StreamOutput; VkVertexInputBindingDivisorDescriptionEXT *binding_divisor; const struct vkd3d_vulkan_info *vk_info = &device->vk_info; - const struct vkd3d_shader_compile_arguments *compile_args; uint32_t instance_divisors[D3D12_VS_INPUT_REGISTER_COUNT]; + const struct vkd3d_shader_spirv_target_info *target_info; uint32_t aligned_offsets[D3D12_VS_INPUT_REGISTER_COUNT]; - struct vkd3d_shader_compile_arguments ps_compile_args; struct vkd3d_shader_parameter ps_shader_parameters[1]; struct vkd3d_shader_transform_feedback_info xfb_info; + struct vkd3d_shader_spirv_target_info ps_target_info; struct vkd3d_shader_interface_info shader_interface; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_signature input_signature; @@ -2164,24 +2164,24 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ps_shader_parameters[0].data_type = VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32; ps_shader_parameters[0].u.immediate_constant.u.u32 = sample_count; - 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.target_extension_count = vk_info->shader_extension_count; - ps_compile_args.target_extensions = vk_info->shader_extensions; - ps_compile_args.parameter_count = ARRAY_SIZE(ps_shader_parameters); - ps_compile_args.parameters = ps_shader_parameters; - 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; + ps_target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; + ps_target_info.next = NULL; + ps_target_info.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; + ps_target_info.target_extensions = vk_info->shader_extensions; + ps_target_info.target_extension_count = vk_info->shader_extension_count; + ps_target_info.parameters = ps_shader_parameters; + ps_target_info.parameter_count = ARRAY_SIZE(ps_shader_parameters); + ps_target_info.dual_source_blending = is_dual_source_blending(&desc->BlendState.RenderTarget[0]); + ps_target_info.output_swizzles = ps_output_swizzle; + ps_target_info.output_swizzle_count = rt_count; - if (ps_compile_args.dual_source_blending && rt_count > 1) + if (ps_target_info.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) + if (ps_target_info.dual_source_blending && desc->BlendState.IndependentBlendEnable) { for (i = 1; i < ARRAY_SIZE(desc->BlendState.RenderTarget); ++i) { @@ -2259,7 +2259,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (shader_info.uav_counter_mask) FIXME("UAV counters not implemented for graphics pipelines.\n"); - compile_args = NULL; + target_info = NULL; switch (shader_stages[i].stage) { case VK_SHADER_STAGE_VERTEX_BIT: @@ -2284,7 +2284,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s break; case VK_SHADER_STAGE_FRAGMENT_BIT: - compile_args = &ps_compile_args; + target_info = &ps_target_info; break; default: @@ -2295,7 +2295,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.next = shader_stages[i].stage == xfb_stage ? &xfb_info : NULL; if (FAILED(hr = create_shader_stage(device, &graphics->stages[graphics->stage_count], - shader_stages[i].stage, b, &shader_interface, compile_args))) + shader_stages[i].stage, b, &shader_interface, target_info))) goto fail; ++graphics->stage_count; -- 2.11.0

1 0

[PATCH] winex11.drv: Handle X error from vkGetRandROutputDisplayEXT().
by Paul Gofman 18 Jun '20

18 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49407 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index f61a5b190e9..2d1f9d36eb6 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -756,9 +756,10 @@ static void get_vulkan_device_uuid( GUID *uuid, const XRRProviderInfo *provider_ { for (output_idx = 0; output_idx < provider_info->noutputs; ++output_idx) { + X11DRV_expect_error( gdi_display, XRandRErrorHandler, NULL ); vr = pvkGetRandROutputDisplayEXT( vk_physical_devices[device_idx], gdi_display, provider_info->outputs[output_idx], &vk_display ); - if (vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) + if (X11DRV_check_error() || vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) continue; memset( &id, 0, sizeof(id) ); -- 2.26.2

2 1

[PATCH] krnl386.exe16: Simply clean a comment from master/slave
by André Hentschel 18 Jun '20

18 Jun '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/krnl386.exe16/int31.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/int31.c b/dlls/krnl386.exe16/int31.c index d5cf02896ab..01c3102d985 100644 --- a/dlls/krnl386.exe16/int31.c +++ b/dlls/krnl386.exe16/int31.c @@ -446,7 +446,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT *context ) SET_AX( context, 0x005a ); /* DPMI version 0.90 */ SET_BX( context, 0x0005 ); /* Flags: 32-bit, virtual memory */ SET_CL( context, si.wProcessorLevel ); - SET_DX( context, 0x0870 ); /* Master/slave interrupt controller base */ + SET_DX( context, 0x0870 ); /* Interrupt controller base */ } break; -- 2.17.1

1 0

[PATCH] ieframe: Implement IPersistStorage::GetClassID().
by Dmitry Timoshkov 18 Jun '20

18 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/persist.c | 10 ++++++++-- dlls/ieframe/tests/webbrowser.c | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/persist.c b/dlls/ieframe/persist.c index bef5ef7344..a0a7c94fbe 100644 --- a/dlls/ieframe/persist.c +++ b/dlls/ieframe/persist.c @@ -56,8 +56,14 @@ static ULONG WINAPI PersistStorage_Release(IPersistStorage *iface) static HRESULT WINAPI PersistStorage_GetClassID(IPersistStorage *iface, CLSID *pClassID) { WebBrowser *This = impl_from_IPersistStorage(iface); - FIXME("(%p)->(%p)\n", This, pClassID); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pClassID); + + if (!pClassID) + return E_INVALIDARG; + + *pClassID = This->version == 1 ? CLSID_WebBrowser_V1: CLSID_WebBrowser; + return S_OK; } static HRESULT WINAPI PersistStorage_IsDirty(IPersistStorage *iface) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 898d0e6805..95d5fc4988 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2220,6 +2220,25 @@ static void test_EnumVerbs(IWebBrowser2 *wb) IEnumOLEVERB_Release(enum_verbs); } +static void test_Persist(IWebBrowser2 *wb, int version) +{ + IPersist *persist; + GUID guid; + HRESULT hr; + + hr = IWebBrowser2_QueryInterface(wb, &IID_IPersist, (void **)&persist); + ok(hr == S_OK, "QueryInterface(IID_IPersist failed: %08x\n", hr); + + hr = IPersist_GetClassID(persist, &guid); + ok(hr == S_OK, "GetClassID failed: %08x\n", hr); + if (version == 1) + ok(IsEqualGUID(&guid, &CLSID_WebBrowser_V1), "got wrong CLSID: %s\n", wine_dbgstr_guid(&guid)); + else + ok(IsEqualGUID(&guid, &CLSID_WebBrowser), "got wrong CLSID: %s\n", wine_dbgstr_guid(&guid)); + + IPersist_Release(persist); +} + static void test_ie_funcs(IWebBrowser2 *wb) { IDispatch *disp; @@ -3741,6 +3760,7 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_olecmd(webbrowser, FALSE); test_Navigate2(webbrowser, L"about:blank"); test_QueryStatusWB(webbrowser, TRUE); + test_Persist(webbrowser, 2); if(do_download) { IHTMLDocument2 *doc, *doc2; @@ -3849,6 +3869,7 @@ static void test_WebBrowserV1(void) test_ready_state(READYSTATE_UNINITIALIZED, BUSY_FAIL); test_ClassInfo(wb); test_EnumVerbs(wb); + test_Persist(wb, 1); ref = IWebBrowser2_Release(wb); ok(ref == 0, "ref=%d, expected 0\n", ref); -- 2.26.2

2 1

[PATCH V2 1/2] kernel32/tests: Add tests for getting main thread id by toolhelp.
by Yu Changping 18 Jun '20

18 Jun '20

2 1

[PATCH V2 2/2] kernel32: Modify the mechanism that obtain the thread order of the toolhelp module , so that the thread order obtained is consistent with windows.
by Yu Changping 18 Jun '20

18 Jun '20

2 1

[PATCH 2/2] kernel32: Adjust toolhelp thread return order.
by Yu Changping 18 Jun '20

18 Jun '20

1 0

[PATCH 1/3] evr: Implement stream managment methods for default mixer.
by Nikolay Sivov 18 Jun '20

18 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 178 +++++++++++++++++++++++++++++++++++++++---- dlls/evr/tests/evr.c | 114 +++++++++++++++++++++++++++ 2 files changed, 276 insertions(+), 16 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 3101d17ffdb..54ea156b35f 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -21,17 +21,30 @@ #include "wine/debug.h" #include "evr.h" #include "d3d9.h" +#include "mferror.h" #include "evr_classes.h" WINE_DEFAULT_DEBUG_CHANNEL(evr); +#define MAX_MIXER_INPUT_STREAMS 16 + +struct input_stream +{ + unsigned int id; +}; + struct video_mixer { IMFTransform IMFTransform_iface; IMFVideoDeviceID IMFVideoDeviceID_iface; IMFTopologyServiceLookupClient IMFTopologyServiceLookupClient_iface; LONG refcount; + + struct input_stream inputs[MAX_MIXER_INPUT_STREAMS]; + unsigned int input_ids[MAX_MIXER_INPUT_STREAMS]; + unsigned int input_count; + CRITICAL_SECTION cs; }; static struct video_mixer *impl_from_IMFTransform(IMFTransform *iface) @@ -49,6 +62,21 @@ static struct video_mixer *impl_from_IMFTopologyServiceLookupClient(IMFTopologyS return CONTAINING_RECORD(iface, struct video_mixer, IMFTopologyServiceLookupClient_iface); } +static int video_mixer_compare_input_id(const void *a, const void *b) +{ + const unsigned int *key = a; + const struct input_stream *input = b; + + if (*key > input->id) return 1; + if (*key < input->id) return -1; + return 0; +} + +static struct input_stream * video_mixer_get_input(const struct video_mixer *mixer, unsigned int id) +{ + return bsearch(&id, mixer->inputs, mixer->input_count, sizeof(*mixer->inputs), video_mixer_compare_input_id); +} + static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, REFIID riid, void **obj) { struct video_mixer *mixer = impl_from_IMFTransform(iface); @@ -97,7 +125,10 @@ static ULONG WINAPI video_mixer_transform_Release(IMFTransform *iface) TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) + { + DeleteCriticalSection(&mixer->cs); free(mixer); + } return refcount; } @@ -105,38 +136,81 @@ static ULONG WINAPI video_mixer_transform_Release(IMFTransform *iface) static HRESULT WINAPI video_mixer_transform_GetStreamLimits(IMFTransform *iface, DWORD *input_minimum, DWORD *input_maximum, DWORD *output_minimum, DWORD *output_maximum) { - FIXME("%p, %p, %p, %p, %p.\n", iface, input_minimum, input_maximum, output_minimum, output_maximum); + TRACE("%p, %p, %p, %p, %p.\n", iface, input_minimum, input_maximum, output_minimum, output_maximum); - return E_NOTIMPL; + *input_minimum = 1; + *input_maximum = 16; + *output_minimum = 1; + *output_maximum = 1; + + return S_OK; } static HRESULT WINAPI video_mixer_transform_GetStreamCount(IMFTransform *iface, DWORD *inputs, DWORD *outputs) { - FIXME("%p, %p, %p.\n", iface, inputs, outputs); + struct video_mixer *mixer = impl_from_IMFTransform(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, inputs, outputs); + + EnterCriticalSection(&mixer->cs); + if (inputs) *inputs = mixer->input_count; + if (outputs) *outputs = 1; + LeaveCriticalSection(&mixer->cs); + + return S_OK; } static HRESULT WINAPI video_mixer_transform_GetStreamIDs(IMFTransform *iface, DWORD input_size, DWORD *inputs, DWORD output_size, DWORD *outputs) { - FIXME("%p, %u, %p, %u, %p.\n", iface, input_size, inputs, output_size, outputs); + struct video_mixer *mixer = impl_from_IMFTransform(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %u, %p, %u, %p.\n", iface, input_size, inputs, output_size, outputs); + + EnterCriticalSection(&mixer->cs); + if (mixer->input_count > input_size || !output_size) + hr = MF_E_BUFFERTOOSMALL; + else if (inputs) + memcpy(inputs, mixer->input_ids, mixer->input_count * sizeof(*inputs)); + if (outputs) *outputs = 0; + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_transform_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info) { - FIXME("%p, %u, %p.\n", iface, id, info); + struct video_mixer *mixer = impl_from_IMFTransform(iface); + struct input_stream *input; + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", iface, id, info); + + EnterCriticalSection(&mixer->cs); + if (!(input = video_mixer_get_input(mixer, id))) + hr = MF_E_INVALIDSTREAMNUMBER; + else + { + memset(info, 0, sizeof(*info)); + if (id) + info->dwFlags |= MFT_INPUT_STREAM_REMOVABLE | MFT_INPUT_STREAM_OPTIONAL; + } + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_transform_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info) { - FIXME("%p, %u, %p.\n", iface, id, info); + TRACE("%p, %u, %p.\n", iface, id, info); - return E_NOTIMPL; + if (id) + return MF_E_INVALIDSTREAMNUMBER; + + memset(info, 0, sizeof(*info)); + + return S_OK; } static HRESULT WINAPI video_mixer_transform_GetAttributes(IMFTransform *iface, IMFAttributes **attributes) @@ -157,23 +231,93 @@ static HRESULT WINAPI video_mixer_transform_GetInputStreamAttributes(IMFTransfor static HRESULT WINAPI video_mixer_transform_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes) { - FIXME("%p, %u, %p.\n", iface, id, attributes); + TRACE("%p, %u, %p.\n", iface, id, attributes); return E_NOTIMPL; } static HRESULT WINAPI video_mixer_transform_DeleteInputStream(IMFTransform *iface, DWORD id) { - FIXME("%p, %u.\n", iface, id); + struct video_mixer *mixer = impl_from_IMFTransform(iface); + struct input_stream *input; + HRESULT hr = S_OK; + unsigned int idx; - return E_NOTIMPL; + TRACE("%p, %u.\n", iface, id); + + EnterCriticalSection(&mixer->cs); + + /* Can't delete reference stream. */ + if (!id || !(input = video_mixer_get_input(mixer, id))) + hr = MF_E_INVALIDSTREAMNUMBER; + else + { + mixer->input_count--; + idx = input - mixer->inputs; + if (idx < mixer->input_count) + { + memmove(&mixer->inputs[idx], &mixer->inputs[idx + 1], (mixer->input_count - idx) * sizeof(*mixer->inputs)); + memmove(&mixer->input_ids[idx], &mixer->input_ids[idx + 1], (mixer->input_count - idx) * + sizeof(*mixer->input_ids)); + } + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } -static HRESULT WINAPI video_mixer_transform_AddInputStreams(IMFTransform *iface, DWORD streams, DWORD *ids) +static int video_mixer_add_input_sort_compare(const void *a, const void *b) { - FIXME("%p, %u, %p.\n", iface, streams, ids); + const struct input_stream *left = a, *right = b; + return left->id != right->id ? (left->id < right->id ? -1 : 1) : 0; +}; - return E_NOTIMPL; +static HRESULT WINAPI video_mixer_transform_AddInputStreams(IMFTransform *iface, DWORD count, DWORD *ids) +{ + struct video_mixer *mixer = impl_from_IMFTransform(iface); + struct input_stream inputs[MAX_MIXER_INPUT_STREAMS] = { 0 }; + unsigned int i, len; + HRESULT hr = S_OK; + + TRACE("%p, %u, %p.\n", iface, count, ids); + + if (!ids) + return E_POINTER; + + EnterCriticalSection(&mixer->cs); + if (count > ARRAY_SIZE(mixer->inputs) - mixer->input_count) + hr = E_INVALIDARG; + else + { + /* Test for collisions. */ + memcpy(inputs, mixer->inputs, mixer->input_count * sizeof(*inputs)); + for (i = 0; i < count; ++i) + inputs[i + mixer->input_count].id = ids[i]; + + len = mixer->input_count + count; + + qsort(inputs, len, sizeof(*inputs), video_mixer_add_input_sort_compare); + + for (i = 1; i < len; ++i) + { + if (inputs[i - 1].id == inputs[i].id) + { + hr = E_INVALIDARG; + break; + } + } + + if (SUCCEEDED(hr)) + { + memcpy(&mixer->input_ids[mixer->input_count], ids, count * sizeof(*ids)); + memcpy(mixer->inputs, inputs, len * sizeof(*inputs)); + mixer->input_count += count; + } + } + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_transform_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index, @@ -407,6 +551,8 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFVideoDeviceID_iface.lpVtbl = &video_mixer_device_id_vtbl; object->IMFTopologyServiceLookupClient_iface.lpVtbl = &video_mixer_service_client_vtbl; object->refcount = 1; + object->input_count = 1; + InitializeCriticalSection(&object->cs); *out = &object->IMFTransform_iface; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 56fb1680b07..db20fa76643 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -25,6 +25,7 @@ #include "evr.h" #include "initguid.h" #include "dxva2api.h" +#include "mferror.h" static const WCHAR sink_id[] = {'E','V','R',' ','I','n','p','u','t','0',0}; @@ -340,8 +341,16 @@ static void test_pin_info(void) static void test_default_mixer(void) { + DWORD input_min, input_max, output_min, output_max; + MFT_OUTPUT_STREAM_INFO output_info; + MFT_INPUT_STREAM_INFO input_info; + DWORD input_count, output_count; IMFVideoDeviceID *deviceid; + DWORD input_id, output_id; + IMFAttributes *attributes, *attributes2; IMFTransform *transform; + unsigned int i; + DWORD ids[16]; IUnknown *unk; HRESULT hr; IID iid; @@ -365,6 +374,111 @@ static void test_default_mixer(void) IMFVideoDeviceID_Release(deviceid); + /* Stream configuration. */ + input_count = output_count = 0; + hr = IMFTransform_GetStreamCount(transform, &input_count, &output_count); + ok(hr == S_OK, "Failed to get stream count, hr %#x.\n", hr); + ok(input_count == 1 && output_count == 1, "Unexpected stream count %u/%u.\n", input_count, output_count); + + hr = IMFTransform_GetStreamLimits(transform, &input_min, &input_max, &output_min, &output_max); + ok(hr == S_OK, "Failed to get stream limits, hr %#x.\n", hr); + ok(input_min == 1 && input_max == 16 && output_min == 1 && output_max == 1, "Unexpected stream limits %u/%u, %u/%u.\n", + input_min, input_max, output_min, output_max); + + hr = IMFTransform_GetInputStreamInfo(transform, 1, &input_info); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetOutputStreamInfo(transform, 1, &output_info); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + + memset(&input_info, 0xcc, sizeof(input_info)); + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + ok(hr == S_OK, "Failed to get input info, hr %#x.\n", hr); + + memset(&output_info, 0xcc, sizeof(output_info)); + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + ok(hr == S_OK, "Failed to get input info, hr %#x.\n", hr); + ok(!(output_info.dwFlags & (MFT_OUTPUT_STREAM_PROVIDES_SAMPLES | MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES)), + "Unexpected output flags %#x.\n", output_info.dwFlags); + + hr = IMFTransform_GetStreamIDs(transform, 1, &input_id, 1, &output_id); + ok(hr == S_OK, "Failed to get input info, hr %#x.\n", hr); + ok(input_id == 0 && output_id == 0, "Unexpected stream ids.\n"); + + hr = IMFTransform_GetInputStreamAttributes(transform, 1, &attributes); +todo_wine + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetOutputStreamAttributes(transform, 1, &attributes); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetOutputStreamAttributes(transform, 0, &attributes); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_AddInputStreams(transform, 16, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_AddInputStreams(transform, 16, ids); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + memset(ids, 0, sizeof(ids)); + hr = IMFTransform_AddInputStreams(transform, 15, ids); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(ids); ++i) + ids[i] = i + 1; + + hr = IMFTransform_AddInputStreams(transform, 15, ids); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + input_count = output_count = 0; + hr = IMFTransform_GetStreamCount(transform, &input_count, &output_count); + ok(hr == S_OK, "Failed to get stream count, hr %#x.\n", hr); + ok(input_count == 16 && output_count == 1, "Unexpected stream count %u/%u.\n", input_count, output_count); + + memset(&input_info, 0, sizeof(input_info)); + hr = IMFTransform_GetInputStreamInfo(transform, 1, &input_info); + ok(hr == S_OK, "Failed to get input info, hr %#x.\n", hr); + ok((input_info.dwFlags & (MFT_INPUT_STREAM_REMOVABLE | MFT_INPUT_STREAM_OPTIONAL)) == + (MFT_INPUT_STREAM_REMOVABLE | MFT_INPUT_STREAM_OPTIONAL), "Unexpected flags %#x.\n", input_info.dwFlags); + + attributes = NULL; + hr = IMFTransform_GetInputStreamAttributes(transform, 0, &attributes); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!attributes, "Unexpected attributes.\n"); +} + attributes2 = NULL; + hr = IMFTransform_GetInputStreamAttributes(transform, 0, &attributes2); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(attributes == attributes2, "Unexpected instance.\n"); + + if (attributes2) + IMFAttributes_Release(attributes2); + if (attributes) + IMFAttributes_Release(attributes); + + attributes = NULL; + hr = IMFTransform_GetInputStreamAttributes(transform, 1, &attributes); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!attributes, "Unexpected attributes.\n"); +} + if (attributes) + IMFAttributes_Release(attributes); + + hr = IMFTransform_DeleteInputStream(transform, 0); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_DeleteInputStream(transform, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + input_count = output_count = 0; + hr = IMFTransform_GetStreamCount(transform, &input_count, &output_count); + ok(hr == S_OK, "Failed to get stream count, hr %#x.\n", hr); + ok(input_count == 15 && output_count == 1, "Unexpected stream count %u/%u.\n", input_count, output_count); + IMFTransform_Release(transform); hr = MFCreateVideoMixer(NULL, &IID_IMFTransform, &IID_IMFTransform, (void **)&transform); -- 2.27.0

1 2

[PATCH V2 1/2] kernel32/tests: Add tests for getting main thread id by toolhelp.
by Yu Changping 18 Jun '20

18 Jun '20

2 1