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

[PATCH] mfplat: Implement GetVideoFormat().
by Nikolay Sivov June 23, 2020

June 23, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 66722a84b6f..843c09c5e09 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -38,6 +38,7 @@ struct media_type struct attributes attributes; IMFMediaType IMFMediaType_iface; IMFVideoMediaType IMFVideoMediaType_iface; + MFVIDEOFORMAT *video_format; }; struct stream_desc @@ -648,6 +649,7 @@ static ULONG WINAPI video_mediatype_Release(IMFVideoMediaType *iface) if (!refcount) { clear_attributes_object(&media_type->attributes); + CoTaskMemFree(media_type->video_format); heap_free(media_type); } @@ -971,9 +973,17 @@ static HRESULT WINAPI video_mediatype_FreeRepresentation(IMFVideoMediaType *ifac static const MFVIDEOFORMAT * WINAPI video_mediatype_GetVideoFormat(IMFVideoMediaType *iface) { - FIXME("%p.\n", iface); + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + unsigned int size; + HRESULT hr; + + TRACE("%p.\n", iface); + + CoTaskMemFree(media_type->video_format); + if (FAILED(hr = MFCreateMFVideoFormatFromMFMediaType((IMFMediaType *)iface, &media_type->video_format, &size))) + WARN("Failed to create format description, hr %#x.\n", hr); - return NULL; + return media_type->video_format; } static HRESULT WINAPI video_mediatype_GetVideoRepresentation(IMFVideoMediaType *iface, GUID representation, -- 2.27.0

1 0

[PATCH 2/2] user32: Fix the popuped window hided abnormal.
by Haidong Yu June 23, 2020

June 23, 2020

2 1

[PATCH] ntdll: Also call fsync() for FD_TYPE_CHAR in NtFlushBuffersFile().
by Paul Gofman June 23, 2020

June 23, 2020

Fixes a regression introduced by 3078f10d43d834b0498358fe0accb565191b7020. Files of FD_TYPE_CHAR were also flushed by fsync() on server before referenced commit. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index d235e67bd38..6a85231dfed 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5728,7 +5728,7 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE handle, IO_STATUS_BLOCK *io ) if (ret == STATUS_ACCESS_DENIED) ret = server_get_unix_fd( handle, FILE_APPEND_DATA, &fd, &needs_close, &type, NULL ); - if (!ret && (type == FD_TYPE_FILE || type == FD_TYPE_DIR)) + if (!ret && (type == FD_TYPE_FILE || type == FD_TYPE_DIR || type == FD_TYPE_CHAR)) { if (fsync(fd)) ret = errno_to_status( errno ); io->u.Status = ret; -- 2.26.2

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Allow vkd3d_shader_compile() to handle multiple target types.
by Henri Verbeet June 23, 2020

June 23, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 13 +++++++++++-- libs/vkd3d-shader/vkd3d_shader_main.c | 15 ++++++++++++--- libs/vkd3d/state.c | 1 + programs/vkd3d-compiler/main.c | 1 + tests/vkd3d_shader_api.c | 2 ++ 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 5c9e42e..7b3494e 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -234,6 +234,14 @@ enum vkd3d_shader_source_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SOURCE_TYPE), }; +enum vkd3d_shader_target_type +{ + VKD3D_SHADER_TARGET_NONE, + VKD3D_SHADER_TARGET_SPIRV_BINARY, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TARGET_TYPE), +}; + struct vkd3d_shader_compile_info { enum vkd3d_shader_structure_type type; @@ -242,6 +250,7 @@ struct vkd3d_shader_compile_info struct vkd3d_shader_code source; enum vkd3d_shader_source_type source_type; + enum vkd3d_shader_target_type target_type; const struct vkd3d_shader_compile_option *options; unsigned int option_count; @@ -663,7 +672,7 @@ struct vkd3d_shader_signature #ifndef VKD3D_SHADER_NO_PROTOTYPES -int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv); +int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, @@ -693,7 +702,7 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature * Function pointer typedefs for vkd3d-shader functions. */ typedef int (*PFN_vkd3d_shader_compile)(const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *spirv); + struct vkd3d_shader_code *out); 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/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5e47122..3255094 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -120,10 +120,19 @@ static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_ return VKD3D_ERROR_INVALID_ARGUMENT; } + switch (compile_info->target_type) + { + case VKD3D_SHADER_TARGET_SPIRV_BINARY: + break; + default: + WARN("Invalid shader target type %#x.\n", compile_info->target_type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + return VKD3D_OK; } -int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) +int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out) { struct vkd3d_shader_instruction instruction; struct vkd3d_dxbc_compiler *spirv_compiler; @@ -131,7 +140,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, s struct vkd3d_shader_parser parser; int ret; - TRACE("compile_info %p, spirv %p.\n", compile_info, spirv); + TRACE("compile_info %p, out %p.\n", compile_info, out); if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) return ret; @@ -174,7 +183,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, s } if (ret >= 0) - ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, spirv); + ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, out); vkd3d_dxbc_compiler_destroy(spirv_compiler); vkd3d_shader_parser_destroy(&parser); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 2a1107f..55953ac 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1351,6 +1351,7 @@ static HRESULT create_shader_stage(struct d3d12_device *device, compile_info.source.code = code->pShaderBytecode; compile_info.source.size = code->BytecodeLength; compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + compile_info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; compile_info.options = NULL; compile_info.option_count = 0; diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 9013f21..48ca42a 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -193,6 +193,7 @@ int main(int argc, char **argv) info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; info.options = options.compile_options; info.option_count = options.compile_option_count; diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 5b47703..6aef004 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -60,6 +60,7 @@ static void test_invalid_shaders(void) info.source.code = ps_break_code; info.source.size = sizeof(ps_break_code); info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; info.options = &option; info.option_count = 1; @@ -136,6 +137,7 @@ static void test_vkd3d_shader_pfns(void) compile_info.next = NULL; compile_info.source = vs; compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + compile_info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; compile_info.options = NULL; compile_info.option_count = 0; -- 2.11.0

2 1

[PATCH vkd3d 5/5] include: Correct the "vkd3d_shader_binding_flag" type name in some comments.
by Henri Verbeet June 23, 2020

June 23, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1cfc0fa..358e90d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -148,7 +148,7 @@ struct vkd3d_shader_resource_binding unsigned int register_space; unsigned int register_index; enum vkd3d_shader_visibility shader_visibility; - unsigned int flags; /* vkd3d_shader_binding_flags */ + unsigned int flags; /* vkd3d_shader_binding_flag */ struct vkd3d_shader_descriptor_binding binding; }; @@ -160,7 +160,7 @@ struct vkd3d_shader_combined_resource_sampler unsigned int resource_index; unsigned int sampler_index; enum vkd3d_shader_visibility shader_visibility; - unsigned int flags; /* vkd3d_shader_binding_flags */ + unsigned int flags; /* vkd3d_shader_binding_flag */ struct vkd3d_shader_descriptor_binding binding; }; -- 2.11.0

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Allow the name of the SPIR-V entry point to be specified.
by Henri Verbeet June 23, 2020

June 23, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 2 ++ libs/vkd3d-shader/spirv.c | 19 +++++++++++++------ libs/vkd3d/state.c | 1 + 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d49fecd..1cfc0fa 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -279,6 +279,8 @@ struct vkd3d_shader_spirv_target_info enum vkd3d_shader_structure_type type; const void *next; + const char *entry_point; /* "main" if NULL. */ + enum vkd3d_shader_spirv_environment environment; const enum vkd3d_shader_spirv_extension *extensions; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7636316..49994a3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1666,7 +1666,7 @@ static uint32_t vkd3d_spirv_get_type_id(struct vkd3d_spirv_builder *builder, } } -static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder) +static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder, const char *entry_point) { vkd3d_spirv_stream_init(&builder->debug_stream); vkd3d_spirv_stream_init(&builder->annotation_stream); @@ -1682,7 +1682,7 @@ static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder) rb_init(&builder->declarations, vkd3d_spirv_declaration_compare); builder->main_function_id = vkd3d_spirv_alloc_id(builder); - vkd3d_spirv_build_op_name(builder, builder->main_function_id, "main"); + vkd3d_spirv_build_op_name(builder, builder->main_function_id, entry_point); } static void vkd3d_spirv_builder_begin_main_function(struct vkd3d_spirv_builder *builder) @@ -1714,7 +1714,7 @@ static void vkd3d_spirv_builder_free(struct vkd3d_spirv_builder *builder) } static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, - struct vkd3d_shader_code *spirv) + struct vkd3d_shader_code *spirv, const char *entry_point) { uint64_t capability_mask = builder->capability_mask; struct vkd3d_spirv_stream stream; @@ -1754,7 +1754,7 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, /* entry point declarations */ vkd3d_spirv_build_op_memory_model(&stream, SpvAddressingModelLogical, SpvMemoryModelGLSL450); vkd3d_spirv_build_op_entry_point(&stream, builder->execution_model, builder->main_function_id, - "main", builder->iface, builder->iface_element_count); + entry_point, builder->iface, builder->iface_element_count); /* execution mode declarations */ if (builder->invocation_count) @@ -2122,6 +2122,13 @@ static bool is_control_point_phase(const struct vkd3d_shader_phase *phase) static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_compiler *compiler); +static const char *vkd3d_dxbc_compiler_get_entry_point_name(const struct vkd3d_dxbc_compiler *compiler) +{ + const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; + + return info && info->entry_point ? info->entry_point : "main"; +} + struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_scan_info *scan_info) @@ -2162,7 +2169,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader return NULL; } - vkd3d_spirv_builder_init(&compiler->spirv_builder); + vkd3d_spirv_builder_init(&compiler->spirv_builder, vkd3d_dxbc_compiler_get_entry_point_name(compiler)); for (i = 0; i < compile_info->option_count; ++i) { @@ -8740,7 +8747,7 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, if (compiler->strip_debug) vkd3d_spirv_stream_clear(&builder->debug_stream); - if (!vkd3d_spirv_compile_module(builder, spirv)) + if (!vkd3d_spirv_compile_module(builder, spirv, vkd3d_dxbc_compiler_get_entry_point_name(compiler))) return VKD3D_ERROR; if (TRACE_ON()) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 55953ac..db342df 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2174,6 +2174,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ps_target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; ps_target_info.next = NULL; + ps_target_info.entry_point = "main"; ps_target_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; ps_target_info.extensions = vk_info->shader_extensions; ps_target_info.extension_count = vk_info->shader_extension_count; -- 2.11.0

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Rename the vkd3d_tessellator_partitioning enumeration.
by Henri Verbeet June 23, 2020

June 23, 2020

To vkd3d_shader_tessellator_partitioning. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 14 ++++++++------ libs/vkd3d-shader/spirv.c | 10 +++++----- libs/vkd3d-shader/trace.c | 10 +++++----- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 66793dc..d49fecd 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -302,12 +302,14 @@ enum vkd3d_shader_tessellator_output_primitive VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TESSELLATOR_OUTPUT_PRIMITIVE), }; -enum vkd3d_tessellator_partitioning +enum vkd3d_shader_tessellator_partitioning { - VKD3D_TESSELLATOR_PARTITIONING_INTEGER = 1, - VKD3D_TESSELLATOR_PARTITIONING_POW2 = 2, - VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD = 3, - VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN = 4, + VKD3D_SHADER_TESSELLATOR_PARTITIONING_INTEGER = 0x1, + VKD3D_SHADER_TESSELLATOR_PARTITIONING_POW2 = 0x2, + VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD = 0x3, + VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN = 0x4, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TESSELLATOR_PARTITIONING), }; /* Extends vkd3d_shader_spirv_target_info. */ @@ -317,7 +319,7 @@ struct vkd3d_shader_spirv_domain_shader_target_info const void *next; enum vkd3d_shader_tessellator_output_primitive output_primitive; - enum vkd3d_tessellator_partitioning partitioning; + enum vkd3d_shader_tessellator_partitioning partitioning; }; /* root signature 1.0 */ diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7c8ddab..7636316 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5652,7 +5652,7 @@ static void vkd3d_dxbc_compiler_emit_tessellator_output_primitive(struct vkd3d_d } static void vkd3d_dxbc_compiler_emit_tessellator_partitioning(struct vkd3d_dxbc_compiler *compiler, - enum vkd3d_tessellator_partitioning partitioning) + enum vkd3d_shader_tessellator_partitioning partitioning) { SpvExecutionMode mode; @@ -5661,14 +5661,14 @@ static void vkd3d_dxbc_compiler_emit_tessellator_partitioning(struct vkd3d_dxbc_ switch (partitioning) { - case VKD3D_TESSELLATOR_PARTITIONING_INTEGER: - case VKD3D_TESSELLATOR_PARTITIONING_POW2: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_INTEGER: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_POW2: mode = SpvExecutionModeSpacingEqual; break; - case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: mode = SpvExecutionModeSpacingFractionalOdd; break; - case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: mode = SpvExecutionModeSpacingFractionalEven; break; default: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index ee9b45c..1b59e4c 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -524,20 +524,20 @@ static void shader_dump_tessellator_output_primitive(struct vkd3d_string_buffer } static void shader_dump_tessellator_partitioning(struct vkd3d_string_buffer *buffer, - enum vkd3d_tessellator_partitioning partitioning) + enum vkd3d_shader_tessellator_partitioning partitioning) { switch (partitioning) { - case VKD3D_TESSELLATOR_PARTITIONING_INTEGER: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_INTEGER: shader_addline(buffer, "integer"); break; - case VKD3D_TESSELLATOR_PARTITIONING_POW2: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_POW2: shader_addline(buffer, "pow2"); break; - case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: shader_addline(buffer, "fractional_odd"); break; - case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: shader_addline(buffer, "fractional_even"); break; default: diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index c8734ef..dfbbdfd 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -774,7 +774,7 @@ struct vkd3d_shader_instruction struct vkd3d_shader_thread_group_size thread_group_size; enum vkd3d_tessellator_domain tessellator_domain; enum vkd3d_shader_tessellator_output_primitive tessellator_output_primitive; - enum vkd3d_tessellator_partitioning tessellator_partitioning; + enum vkd3d_shader_tessellator_partitioning tessellator_partitioning; float max_tessellation_factor; struct vkd3d_shader_index_range index_range; struct vkd3d_shader_indexable_temp indexable_temp; -- 2.11.0

1 0

[PATCH vkd3d 2/5] vkd3d-shader: Rename the vkd3d_tessellator_output_primitive enumeration.
by Henri Verbeet June 23, 2020

June 23, 2020

To vkd3d_shader_tessellator_output_primitive, consistent with vkd3d-shader naming conventions. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 14 ++++++++------ libs/vkd3d-shader/spirv.c | 10 +++++----- libs/vkd3d-shader/trace.c | 10 +++++----- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 7b3494e..66793dc 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -292,12 +292,14 @@ struct vkd3d_shader_spirv_target_info unsigned int output_swizzle_count; }; -enum vkd3d_tessellator_output_primitive +enum vkd3d_shader_tessellator_output_primitive { - VKD3D_TESSELLATOR_OUTPUT_POINT = 1, - VKD3D_TESSELLATOR_OUTPUT_LINE = 2, - VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CW = 3, - VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW = 4, + VKD3D_SHADER_TESSELLATOR_OUTPUT_POINT = 0x1, + VKD3D_SHADER_TESSELLATOR_OUTPUT_LINE = 0x2, + VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CW = 0x3, + VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CCW = 0x4, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TESSELLATOR_OUTPUT_PRIMITIVE), }; enum vkd3d_tessellator_partitioning @@ -314,7 +316,7 @@ struct vkd3d_shader_spirv_domain_shader_target_info enum vkd3d_shader_structure_type type; const void *next; - enum vkd3d_tessellator_output_primitive output_primitive; + enum vkd3d_shader_tessellator_output_primitive output_primitive; enum vkd3d_tessellator_partitioning partitioning; }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9b655e4..7c8ddab 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5623,7 +5623,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(struct vkd3d_dxbc_co } static void vkd3d_dxbc_compiler_emit_tessellator_output_primitive(struct vkd3d_dxbc_compiler *compiler, - enum vkd3d_tessellator_output_primitive primitive) + enum vkd3d_shader_tessellator_output_primitive primitive) { SpvExecutionMode mode; @@ -5632,15 +5632,15 @@ static void vkd3d_dxbc_compiler_emit_tessellator_output_primitive(struct vkd3d_d switch (primitive) { - case VKD3D_TESSELLATOR_OUTPUT_POINT: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_POINT: mode = SpvExecutionModePointMode; break; - case VKD3D_TESSELLATOR_OUTPUT_LINE: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_LINE: return; - case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CW: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CW: mode = SpvExecutionModeVertexOrderCw; break; - case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CCW: mode = SpvExecutionModeVertexOrderCcw; break; default: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 279ede0..ee9b45c 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -501,20 +501,20 @@ static void shader_dump_tessellator_domain(struct vkd3d_string_buffer *buffer, } static void shader_dump_tessellator_output_primitive(struct vkd3d_string_buffer *buffer, - enum vkd3d_tessellator_output_primitive output_primitive) + enum vkd3d_shader_tessellator_output_primitive output_primitive) { switch (output_primitive) { - case VKD3D_TESSELLATOR_OUTPUT_POINT: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_POINT: shader_addline(buffer, "point"); break; - case VKD3D_TESSELLATOR_OUTPUT_LINE: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_LINE: shader_addline(buffer, "line"); break; - case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CW: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CW: shader_addline(buffer, "triangle_cw"); break; - case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CCW: shader_addline(buffer, "triangle_ccw"); break; default: diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index ecfd665..c8734ef 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -773,7 +773,7 @@ struct vkd3d_shader_instruction struct vkd3d_shader_tgsm_structured tgsm_structured; struct vkd3d_shader_thread_group_size thread_group_size; enum vkd3d_tessellator_domain tessellator_domain; - enum vkd3d_tessellator_output_primitive tessellator_output_primitive; + enum vkd3d_shader_tessellator_output_primitive tessellator_output_primitive; enum vkd3d_tessellator_partitioning tessellator_partitioning; float max_tessellation_factor; struct vkd3d_shader_index_range index_range; -- 2.11.0

1 0

[PATCH 3/3] directmanipulation: Implement IDirectManipulationContent stub interface.
by Vijay Kiran Kamuju June 23, 2020

June 23, 2020

Based on patch by Gijs Vermeulen. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 3/3] msxml3: Use site's base URI when loading an XML file.
by Dmitry Timoshkov June 23, 2020

June 23, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/domdoc.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 2a66fc9898..7aba8e4e5a 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2158,16 +2158,38 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len) return E_FAIL; } -static HRESULT domdoc_load_moniker(domdoc *This, IMoniker *mon) +static HRESULT domdoc_load_file(domdoc *This, LPWSTR filename, IUri **uri) { + IMoniker *mon, *base_mon = NULL; bsc_t *bsc; HRESULT hr; - hr = bind_url(mon, domdoc_onDataAvailable, This, &bsc); - if(FAILED(hr)) - return hr; + if (This->base_uri) + { + hr = CreateURLMonikerEx2(NULL, This->base_uri, &base_mon, 0); + if (hr != S_OK) return hr; + } - return detach_bsc(bsc); + if (base_mon) /* look for file starting from base URL */ + hr = CreateUri(filename, Uri_CREATE_ALLOW_RELATIVE | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, uri); + else /* look for file in the PATH */ + hr = create_uri(filename, uri); + if (hr == S_OK) + { + hr = CreateURLMonikerEx2(base_mon, *uri, &mon, 0); + if (hr == S_OK) + { + hr = bind_url(mon, domdoc_onDataAvailable, This, &bsc); + if (hr == S_OK) + hr = detach_bsc(bsc); + IMoniker_Release(mon); + } + } + + if (base_mon) + IMoniker_Release(base_mon); + + return hr; } static HRESULT WINAPI domdoc_load( @@ -2296,7 +2318,6 @@ static HRESULT WINAPI domdoc_load( if ( filename ) { IUri *uri = NULL; - IMoniker *mon; if (This->properties->uri) { @@ -2304,15 +2325,7 @@ static HRESULT WINAPI domdoc_load( This->properties->uri = NULL; } - hr = create_uri(filename, &uri); - if (SUCCEEDED(hr)) - hr = CreateURLMonikerEx2(NULL, uri, &mon, 0); - if ( SUCCEEDED(hr) ) - { - hr = domdoc_load_moniker( This, mon ); - IMoniker_Release(mon); - } - + hr = domdoc_load_file(This, filename, &uri); if (SUCCEEDED(hr)) { get_doc(This)->name = (char *)xmlchar_from_wcharn(filename, -1, TRUE); -- 2.26.2

1 0