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

Nikolay Sivov : mfplat: Add EVR activator attributes to tracing.
by Alexandre Julliard June 19, 2020

June 19, 2020

Module: wine Branch: master Commit: 9d9975c3b2840bf945e7e6dde9315583d493a6a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d9975c3b2840bf945e7e6dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 19 16:36:28 2020 +0300 mfplat: Add EVR activator attributes to tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 7 +++++++ include/mfidl.idl | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index ea6a0659c5..6cd409d63b 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1646,12 +1646,18 @@ const char *debugstr_attr(const GUID *guid) X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_SYMBOLIC_LINK), X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE11), X(MF_MT_USER_DATA), + X(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID), X(MF_MT_MIN_MASTERING_LUMINANCE), + X(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE), + X(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_FLAGS), + X(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_CLSID), X(MF_EVENT_STREAM_METADATA_SYSTEMID), + X(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE), X(MF_MT_AUDIO_CHANNEL_MASK), X(MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN), X(MF_READWRITE_DISABLE_CONVERTERS), X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE_EDGE), + X(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS), X(MF_MT_MINIMUM_DISPLAY_APERTURE), X(MFSampleExtension_Token), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_CATEGORY), @@ -1806,6 +1812,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MEDIA_ENGINE_COREWINDOW), X(MF_SOURCE_READER_DISABLE_CAMERA_PLUGINS), X(MF_MT_MPEG4_TRACK_TYPE), + X(MF_ACTIVATE_VIDEO_WINDOW), X(MF_MT_PAN_SCAN_APERTURE), X(MF_TOPOLOGY_RESOLUTION_STATUS), X(MF_MT_ORIGINAL_4CC), diff --git a/include/mfidl.idl b/include/mfidl.idl index 2955d0d2f3..912e62ca35 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1027,6 +1027,16 @@ interface IMFAudioPolicy : IUnknown HRESULT GetIconPath([out] LPWSTR *path); } +enum +{ + MF_ACTIVATE_CUSTOM_MIXER_ALLOWFAIL = 0x00000001, +}; + +enum +{ + MF_ACTIVATE_CUSTOM_PRESENTER_ALLOWFAIL = 0x00000001, +}; + cpp_quote("#ifdef __cplusplus") cpp_quote("static inline HRESULT MFSetAttributeSize(IMFAttributes *attributes, REFGUID key, UINT32 width, UINT32 height)") cpp_quote("{") @@ -1152,5 +1162,11 @@ cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE, 0x6ba644ff, 0x cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_STREAM_CATEGORY, 0xa9770471, 0x92ec, 0x4df4, 0x94, 0xfe, 0x81, 0xc3, 0x6f, 0x0c, 0x3a, 0x7a);") cpp_quote("EXTERN_GUID(MF_ACTIVATE_VIDEO_WINDOW, 0x9a2dbbdd, 0xf57e, 0x4162, 0x82, 0xb9, 0x68, 0x31, 0x37, 0x76, 0x82, 0xd3);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID, 0xba491360, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE, 0xba491361, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_FLAGS, 0xba491362, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_CLSID, 0xba491364, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE, 0xba491365, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS, 0xba491366, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);")

1 0

Paul Gofman : netio.sys: Support multiple simultaneous async operations for socket.
by Alexandre Julliard June 19, 2020

June 19, 2020

Module: wine Branch: master Commit: b192142ec08a3d298333bd5a19bccde5c4b0baeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b192142ec08a3d298333bd5a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jun 19 13:13:14 2020 +0300 netio.sys: Support multiple simultaneous async operations for socket. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 162 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 106 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b192142ec08a3d298333…

1 0

Alexandre Julliard : winebuild: Make the 32-bit side of a 16-bit module always a DLL.
by Alexandre Julliard June 19, 2020

June 19, 2020

Module: wine Branch: master Commit: cee48cc78989cc2621bb98b466f80a35cfa43a12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cee48cc78989cc2621bb98b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 12:57:23 2020 +0200 winebuild: Make the 32-bit side of a 16-bit module always a DLL. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/parser.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 0f2b9c1e10..0207b8ac3c 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -826,11 +826,7 @@ void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ) ORDDEF *odp; spec32->file_name = xstrdup( spec16->file_name ); - if (spec16->characteristics & IMAGE_FILE_DLL) - { - spec32->characteristics = IMAGE_FILE_DLL; - spec32->init_func = xstrdup( "DllMain" ); - } + spec32->characteristics = IMAGE_FILE_DLL; /* add an export for the NE module */

1 0

Alexandre Julliard : ntdll: Actually return an NT path in wine_unix_to_nt_file_name() for relative paths.
by Alexandre Julliard June 19, 2020

June 19, 2020

Module: wine Branch: master Commit: a2c890c1e104140f83209c8d1e8ee298b346e38d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2c890c1e104140f83209c8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 18:34:19 2020 +0200 ntdll: Actually return an NT path in wine_unix_to_nt_file_name() for relative paths. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 5f4eb11316..9a7ba447aa 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -986,24 +986,15 @@ NTSTATUS CDECL wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRIN if (path[0] != '/') /* relative path name */ { WCHAR *tmp; + NTSTATUS status; - path++; - lenA--; if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, (lenA + 1) * sizeof(WCHAR) ))) return STATUS_NO_MEMORY; lenW = ntdll_umbstowcs( path, lenA, tmp, lenA ); tmp[lenW] = 0; - lenW = RtlGetFullPathName_U( tmp, 0, NULL, NULL ); - if (!lenW || !(nt->Buffer = RtlAllocateHeap( GetProcessHeap(), 0, lenW ))) - { - RtlFreeHeap( GetProcessHeap(), 0, tmp ); - return STATUS_NO_MEMORY; - } - lenW = RtlGetFullPathName_U( tmp, lenW, nt->Buffer, NULL ); - nt->Length = lenW; - nt->MaximumLength = lenW + sizeof(WCHAR); + status = RtlDosPathNameToNtPathName_U_WithStatus( tmp, nt, NULL, NULL ); RtlFreeHeap( GetProcessHeap(), 0, tmp ); - return STATUS_SUCCESS; + return status; } return unix_funcs->unix_to_nt_file_name( name, nt ); }

1 0

Zebediah Figura : winegstreamer: Clear the "colorimetry" and "chroma-site" fields in amt_to_gst_caps_video().
by Alexandre Julliard June 19, 2020

June 19, 2020

Module: wine Branch: master Commit: d085e5ba72883928bc193ee41955064d6069261d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d085e5ba72883928bc193ee4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 18 21:50:41 2020 -0500 winegstreamer: Clear the "colorimetry" and "chroma-site" fields in amt_to_gst_caps_video(). These fields don't prevent us from connecting, but they may force videoconvert to do an expensive conversion where not necessary. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b9c91245f8..75ddb3082e 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -416,8 +416,8 @@ static GstCaps *amt_to_gst_caps_video(const AM_MEDIA_TYPE *mt) /* Clear some fields that shouldn't prevent us from connecting. */ for (i = 0; i < gst_caps_get_size(caps); ++i) { - gst_structure_remove_field(gst_caps_get_structure(caps, i), "framerate"); - gst_structure_remove_field(gst_caps_get_structure(caps, i), "pixel-aspect-ratio"); + gst_structure_remove_fields(gst_caps_get_structure(caps, i), + "framerate", "pixel-aspect-ratio", "colorimetry", "chroma-site", NULL); } } return caps;

1 0

Henri Verbeet : vkd3d-shader: Pass compile options as an array instead of as flags.
by Alexandre Julliard June 19, 2020

June 19, 2020

Module: vkd3d Branch: master Commit: b07c30444099ffb428d8acf54eed5f5a9fe1c5d4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b07c30444099ffb428d8acf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 19 16:31:35 2020 +0430 vkd3d-shader: Pass compile options as an array instead of as flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 20 ++++++++++----- libs/vkd3d-shader/spirv.c | 24 ++++++++++++++---- libs/vkd3d-shader/vkd3d_shader_main.c | 8 +++--- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +-- libs/vkd3d/state.c | 4 ++- programs/vkd3d-compiler/main.c | 43 ++++++++++++++++++++++++++++---- tests/vkd3d_shader_api.c | 13 ++++++++-- 7 files changed, 89 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=b07c30444099ffb428d…

1 0

Henri Verbeet : vkd3d-shader: Pass the interface info as part of the vkd3d_shader_compile_info structure chain.
by Alexandre Julliard June 19, 2020

June 19, 2020

Module: vkd3d Branch: master Commit: c4e6657c11c52b5b16a830d02a26347f80b16770 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c4e6657c11c52b5b16a830d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 19 16:31:33 2020 +0430 vkd3d-shader: Pass the interface info as part of the vkd3d_shader_compile_info structure chain. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 3 +-- libs/vkd3d-shader/spirv.c | 5 +++-- libs/vkd3d-shader/vkd3d_shader_main.c | 13 +++---------- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- libs/vkd3d/state.c | 4 ++-- programs/vkd3d-compiler/main.c | 2 +- tests/vkd3d_shader_api.c | 4 ++-- 7 files changed, 13 insertions(+), 20 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index ec449bb..5dd5d93 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -179,6 +179,7 @@ struct vkd3d_shader_push_constant_buffer unsigned int size; /* in bytes */ }; +/* Extends vkd3d_shader_compile_info. */ struct vkd3d_shader_interface_info { enum vkd3d_shader_structure_type type; @@ -644,7 +645,6 @@ struct vkd3d_shader_signature int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv, unsigned int compiler_options, - const struct vkd3d_shader_interface_info *shader_interface_info, const struct vkd3d_shader_spirv_target_info *target_info); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); @@ -676,7 +676,6 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature */ typedef int (*PFN_vkd3d_shader_compile_dxbc)(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv, unsigned int compiler_options, - const struct vkd3d_shader_interface_info *shader_interface_info, const struct vkd3d_shader_spirv_target_info *target_info); typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code); diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 3f6d526..76ec221 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2124,12 +2124,13 @@ 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_info *compile_info, 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; const struct vkd3d_shader_signature *output_signature = &shader_desc->output_signature; + const struct vkd3d_shader_interface_info *shader_interface; struct vkd3d_dxbc_compiler *compiler; unsigned int max_element_count; unsigned int i; @@ -2157,7 +2158,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader compiler->output_signature = &shader_desc->output_signature; compiler->patch_constant_signature = &shader_desc->patch_constant_signature; - if (shader_interface) + if ((shader_interface = vkd3d_find_struct(compile_info->next, INTERFACE_INFO))) { compiler->xfb_info = vkd3d_find_struct(shader_interface->next, TRANSFORM_FEEDBACK_INFO); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 3d8829e..f11b3fc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -129,7 +129,6 @@ static int vkd3d_shader_validate_spirv_target_info(const struct vkd3d_shader_spi int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv, unsigned int compiler_options, - const struct vkd3d_shader_interface_info *shader_interface_info, const struct vkd3d_shader_spirv_target_info *info) { struct vkd3d_shader_instruction instruction; @@ -138,8 +137,8 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_in struct vkd3d_shader_parser parser; int ret; - TRACE("compile_info %p, spirv %p, compiler_options %#x, shader_interface_info %p, info %p.\n", - compile_info, spirv, compiler_options, shader_interface_info, info); + TRACE("compile_info %p, spirv %p, compiler_options %#x, info %p.\n", + compile_info, spirv, compiler_options, info); if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) { @@ -147,12 +146,6 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_in return VKD3D_ERROR_INVALID_ARGUMENT; } - if (shader_interface_info && shader_interface_info->type != VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO) - { - WARN("Invalid structure type %#x.\n", shader_interface_info->type); - return VKD3D_ERROR_INVALID_ARGUMENT; - } - if ((ret = vkd3d_shader_validate_spirv_target_info(info)) < 0) return ret; @@ -170,7 +163,7 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_in vkd3d_shader_trace(parser.data); if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version, - &parser.shader_desc, compiler_options, shader_interface_info, info, &scan_info))) + &parser.shader_desc, compiler_options, compile_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 a98eda6..8dd76fa 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -821,7 +821,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_info *compile_info, 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, diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index fe44097..1f60941 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1348,11 +1348,11 @@ static HRESULT create_shader_stage(struct d3d12_device *device, shader_desc.flags = 0; compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; - compile_info.next = NULL; + compile_info.next = shader_interface; compile_info.source.code = code->pShaderBytecode; compile_info.source.size = code->BytecodeLength; - if ((ret = vkd3d_shader_compile_dxbc(&compile_info, &spirv, 0, shader_interface, target_info)) < 0) + if ((ret = vkd3d_shader_compile_dxbc(&compile_info, &spirv, 0, target_info)) < 0) { WARN("Failed to compile shader, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 7e73ab0..0cab836 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -168,7 +168,7 @@ int main(int argc, char **argv) return 1; } - ret = vkd3d_shader_compile_dxbc(&info, &spirv, options.compiler_options, NULL, NULL); + ret = vkd3d_shader_compile_dxbc(&info, &spirv, options.compiler_options, NULL); vkd3d_shader_free_shader_code(&info.source); if (ret < 0) { diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 8c9732c..4d5e7c1 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -55,7 +55,7 @@ static void test_invalid_shaders(void) info.source.code = ps_break_code; info.source.size = sizeof(ps_break_code); - rc = vkd3d_shader_compile_dxbc(&info, &spirv, VKD3D_SHADER_STRIP_DEBUG, NULL, NULL); + rc = vkd3d_shader_compile_dxbc(&info, &spirv, VKD3D_SHADER_STRIP_DEBUG, NULL); ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); } @@ -128,7 +128,7 @@ static void test_vkd3d_shader_pfns(void) compile_info.next = NULL; compile_info.source = vs; - rc = pfn_vkd3d_shader_compile_dxbc(&compile_info, &spirv, 0, NULL, NULL); + rc = pfn_vkd3d_shader_compile_dxbc(&compile_info, &spirv, 0, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); pfn_vkd3d_shader_free_shader_code(&spirv);

1 0

Henri Verbeet : vkd3d-shader: Introduce struct vkd3d_shader_compile_info.
by Alexandre Julliard June 19, 2020

June 19, 2020

Module: vkd3d Branch: master Commit: 8ff9610fedb4c360a52f1231fc20abe8982bb16b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8ff9610fedb4c360a52f123… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 19 16:31:32 2020 +0430 vkd3d-shader: Introduce struct vkd3d_shader_compile_info. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 13 +++++++++++-- libs/vkd3d-shader/vkd3d_shader_main.c | 18 ++++++++++++------ libs/vkd3d/state.c | 9 +++++++-- programs/vkd3d-compiler/main.c | 12 ++++++++---- tests/vkd3d_shader_api.c | 16 +++++++++++++--- 5 files changed, 51 insertions(+), 17 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index e57b913..ec449bb 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -30,6 +30,7 @@ extern "C" { enum vkd3d_shader_structure_type { /* 1.2 */ + VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO, VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO, VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_DOMAIN_SHADER_TARGET_INFO, @@ -218,6 +219,14 @@ struct vkd3d_shader_transform_feedback_info unsigned int buffer_stride_count; }; +struct vkd3d_shader_compile_info +{ + enum vkd3d_shader_structure_type type; + const void *next; + + struct vkd3d_shader_code source; +}; + enum vkd3d_shader_spirv_environment { VKD3D_SHADER_SPIRV_ENVIRONMENT_NONE, @@ -633,7 +642,7 @@ struct vkd3d_shader_signature #ifndef VKD3D_SHADER_NO_PROTOTYPES -int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, +int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv, unsigned int compiler_options, const struct vkd3d_shader_interface_info *shader_interface_info, const struct vkd3d_shader_spirv_target_info *target_info); @@ -665,7 +674,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_dxbc)(const struct vkd3d_shader_code *dxbc, +typedef int (*PFN_vkd3d_shader_compile_dxbc)(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv, unsigned int compiler_options, const struct vkd3d_shader_interface_info *shader_interface_info, const struct vkd3d_shader_spirv_target_info *target_info); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index a56682e..3d8829e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -127,7 +127,7 @@ static int vkd3d_shader_validate_spirv_target_info(const struct vkd3d_shader_spi return VKD3D_OK; } -int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, +int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv, unsigned int compiler_options, const struct vkd3d_shader_interface_info *shader_interface_info, const struct vkd3d_shader_spirv_target_info *info) @@ -138,8 +138,14 @@ 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, info %p.\n", - dxbc->code, dxbc->size, spirv, compiler_options, shader_interface_info, info); + TRACE("compile_info %p, spirv %p, compiler_options %#x, shader_interface_info %p, info %p.\n", + compile_info, spirv, compiler_options, shader_interface_info, info); + + if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) + { + WARN("Invalid compile_info structure type %#x.\n", compile_info->type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } if (shader_interface_info && shader_interface_info->type != VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO) { @@ -152,13 +158,13 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, scan_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO; scan_info.next = NULL; - if ((ret = vkd3d_shader_scan_dxbc(dxbc, &scan_info)) < 0) + if ((ret = vkd3d_shader_scan_dxbc(&compile_info->source, &scan_info)) < 0) return ret; - if ((ret = vkd3d_shader_parser_init(&parser, dxbc)) < 0) + if ((ret = vkd3d_shader_parser_init(&parser, &compile_info->source)) < 0) return ret; - vkd3d_shader_dump_shader(parser.shader_version.type, dxbc); + vkd3d_shader_dump_shader(parser.shader_version.type, &compile_info->source); if (TRACE_ON()) vkd3d_shader_trace(parser.data); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 7b14198..fe44097 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1329,8 +1329,8 @@ static HRESULT create_shader_stage(struct d3d12_device *device, const D3D12_SHADER_BYTECODE *code, const struct vkd3d_shader_interface_info *shader_interface, 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; + struct vkd3d_shader_compile_info compile_info; struct VkShaderModuleCreateInfo shader_desc; struct vkd3d_shader_code spirv = {0}; VkResult vr; @@ -1347,7 +1347,12 @@ 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, target_info)) < 0) + compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; + compile_info.next = NULL; + compile_info.source.code = code->pShaderBytecode; + compile_info.source.size = code->BytecodeLength; + + if ((ret = vkd3d_shader_compile_dxbc(&compile_info, &spirv, 0, shader_interface, target_info)) < 0) { WARN("Failed to compile shader, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index dd94374..7e73ab0 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -148,7 +148,8 @@ static bool parse_command_line(int argc, char **argv, struct options *options) int main(int argc, char **argv) { - struct vkd3d_shader_code dxbc, spirv; + struct vkd3d_shader_compile_info info; + struct vkd3d_shader_code spirv; struct options options; int ret; @@ -158,14 +159,17 @@ int main(int argc, char **argv) return 1; } - if (!read_shader(&dxbc, options.filename)) + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; + info.next = NULL; + + if (!read_shader(&info.source, options.filename)) { fprintf(stderr, "Failed to read DXBC shader.\n"); return 1; } - ret = vkd3d_shader_compile_dxbc(&dxbc, &spirv, options.compiler_options, NULL, NULL); - vkd3d_shader_free_shader_code(&dxbc); + ret = vkd3d_shader_compile_dxbc(&info, &spirv, options.compiler_options, NULL, NULL); + vkd3d_shader_free_shader_code(&info.source); if (ret < 0) { fprintf(stderr, "Failed to compile DXBC shader, ret %d.\n", ret); diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index f9bec7e..8c9732c 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -23,6 +23,7 @@ static void test_invalid_shaders(void) { + struct vkd3d_shader_compile_info info; struct vkd3d_shader_code spirv; int rc; @@ -48,9 +49,13 @@ static void test_invalid_shaders(void) 0x3f800000, 0x3f800000, 0x3f800000, 0x01000002, 0x01000015, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const struct vkd3d_shader_code ps_break = {ps_break_code, sizeof(ps_break_code)}; - rc = vkd3d_shader_compile_dxbc(&ps_break, &spirv, VKD3D_SHADER_STRIP_DEBUG, NULL, NULL); + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; + info.next = NULL; + info.source.code = ps_break_code; + info.source.size = sizeof(ps_break_code); + + rc = vkd3d_shader_compile_dxbc(&info, &spirv, VKD3D_SHADER_STRIP_DEBUG, NULL, NULL); ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); } @@ -68,6 +73,7 @@ static void test_vkd3d_shader_pfns(void) struct vkd3d_versioned_root_signature_desc root_signature_desc; struct vkd3d_shader_signature_element *element; + struct vkd3d_shader_compile_info compile_info; struct vkd3d_shader_scan_info scan_info; struct vkd3d_shader_signature signature; struct vkd3d_shader_code dxbc, spirv; @@ -118,7 +124,11 @@ static void test_vkd3d_shader_pfns(void) ok(element, "Could not find shader signature element.\n"); pfn_vkd3d_shader_free_shader_signature(&signature); - rc = pfn_vkd3d_shader_compile_dxbc(&vs, &spirv, 0, NULL, NULL); + compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; + compile_info.next = NULL; + compile_info.source = vs; + + rc = pfn_vkd3d_shader_compile_dxbc(&compile_info, &spirv, 0, NULL, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); pfn_vkd3d_shader_free_shader_code(&spirv);

1 0

Henri Verbeet : vkd3d-shader: Pass the target info as part of the vkd3d_shader_compile_info structure chain.
by Alexandre Julliard June 19, 2020

June 19, 2020

Module: vkd3d Branch: master Commit: 9312979b5641fb5ff665d0f8529642504f71af7a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9312979b5641fb5ff665d0f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 19 16:31:34 2020 +0430 vkd3d-shader: Pass the target info as part of the vkd3d_shader_compile_info structure chain. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 7 +++---- libs/vkd3d-shader/spirv.c | 19 +++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_main.c | 36 ++++---------------------------- libs/vkd3d-shader/vkd3d_shader_private.h | 1 - libs/vkd3d/state.c | 18 +++++++++------- programs/vkd3d-compiler/main.c | 2 +- tests/vkd3d_shader_api.c | 4 ++-- 7 files changed, 38 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=9312979b5641fb5ff66…

1 0

Henri Verbeet : vkd3d-shader: Allow vkd3d_shader_compile_dxbc() to handle multiple source types.
by Alexandre Julliard June 19, 2020

June 19, 2020

Module: vkd3d Branch: master Commit: d6ec017077e90cc16cf277857ca9134b5a0d7895 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d6ec017077e90cc16cf2778… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 19 16:31:36 2020 +0430 vkd3d-shader: Allow vkd3d_shader_compile_dxbc() to handle multiple source types. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 14 ++++++++++++-- libs/vkd3d-shader/vkd3d_shader.map | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 29 +++++++++++++++++++++++------ libs/vkd3d/state.c | 3 ++- programs/vkd3d-compiler/main.c | 3 ++- tests/vkd3d_shader_api.c | 10 ++++++---- 6 files changed, 46 insertions(+), 15 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 367f8a2..5c9e42e 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -226,6 +226,14 @@ struct vkd3d_shader_transform_feedback_info unsigned int buffer_stride_count; }; +enum vkd3d_shader_source_type +{ + VKD3D_SHADER_SOURCE_NONE, + VKD3D_SHADER_SOURCE_DXBC_TPF, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SOURCE_TYPE), +}; + struct vkd3d_shader_compile_info { enum vkd3d_shader_structure_type type; @@ -233,6 +241,8 @@ struct vkd3d_shader_compile_info struct vkd3d_shader_code source; + enum vkd3d_shader_source_type source_type; + const struct vkd3d_shader_compile_option *options; unsigned int option_count; }; @@ -653,7 +663,7 @@ struct vkd3d_shader_signature #ifndef VKD3D_SHADER_NO_PROTOTYPES -int vkd3d_shader_compile_dxbc(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 *spirv); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, @@ -682,7 +692,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_dxbc)(const struct vkd3d_shader_compile_info *compile_info, +typedef int (*PFN_vkd3d_shader_compile)(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv); typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code); diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 74c38e1..a8c73b6 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -1,7 +1,7 @@ VKD3D_1_0 { global: - vkd3d_shader_compile_dxbc; + vkd3d_shader_compile; vkd3d_shader_convert_root_signature; vkd3d_shader_find_signature_element; vkd3d_shader_free_root_signature; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 7179436..5e47122 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -103,7 +103,27 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) free_shader_desc(&parser->shader_desc); } -int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) +static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info) +{ + if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) + { + WARN("Invalid structure type %#x.\n", compile_info->type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + switch (compile_info->source_type) + { + case VKD3D_SHADER_SOURCE_DXBC_TPF: + break; + default: + WARN("Invalid shader source type %#x.\n", compile_info->source_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) { struct vkd3d_shader_instruction instruction; struct vkd3d_dxbc_compiler *spirv_compiler; @@ -113,11 +133,8 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_in TRACE("compile_info %p, spirv %p.\n", compile_info, spirv); - if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) - { - WARN("Invalid compile_info structure type %#x.\n", compile_info->type); - return VKD3D_ERROR_INVALID_ARGUMENT; - } + if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) + return ret; scan_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO; scan_info.next = NULL; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 8bc2595..2a1107f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1350,10 +1350,11 @@ static HRESULT create_shader_stage(struct d3d12_device *device, compile_info.next = shader_interface; compile_info.source.code = code->pShaderBytecode; compile_info.source.size = code->BytecodeLength; + compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; compile_info.options = NULL; compile_info.option_count = 0; - if ((ret = vkd3d_shader_compile_dxbc(&compile_info, &spirv)) < 0) + if ((ret = vkd3d_shader_compile(&compile_info, &spirv)) < 0) { WARN("Failed to compile shader, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index d33dafd..9013f21 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -192,6 +192,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.options = options.compile_options; info.option_count = options.compile_option_count; @@ -201,7 +202,7 @@ int main(int argc, char **argv) return 1; } - ret = vkd3d_shader_compile_dxbc(&info, &spirv); + ret = vkd3d_shader_compile(&info, &spirv); vkd3d_shader_free_shader_code(&info.source); if (ret < 0) { diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 00c6f95..5b47703 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -59,10 +59,11 @@ static void test_invalid_shaders(void) info.next = NULL; info.source.code = ps_break_code; info.source.size = sizeof(ps_break_code); + info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; info.options = &option; info.option_count = 1; - rc = vkd3d_shader_compile_dxbc(&info, &spirv); + rc = vkd3d_shader_compile(&info, &spirv); ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); } @@ -75,8 +76,8 @@ static void test_vkd3d_shader_pfns(void) PFN_vkd3d_shader_parse_root_signature pfn_vkd3d_shader_parse_root_signature; PFN_vkd3d_shader_free_root_signature pfn_vkd3d_shader_free_root_signature; PFN_vkd3d_shader_free_shader_code pfn_vkd3d_shader_free_shader_code; - PFN_vkd3d_shader_compile_dxbc pfn_vkd3d_shader_compile_dxbc; PFN_vkd3d_shader_scan_dxbc pfn_vkd3d_shader_scan_dxbc; + PFN_vkd3d_shader_compile pfn_vkd3d_shader_compile; struct vkd3d_versioned_root_signature_desc root_signature_desc; struct vkd3d_shader_signature_element *element; @@ -115,8 +116,8 @@ static void test_vkd3d_shader_pfns(void) pfn_vkd3d_shader_parse_root_signature = vkd3d_shader_parse_root_signature; pfn_vkd3d_shader_free_root_signature = vkd3d_shader_free_root_signature; pfn_vkd3d_shader_free_shader_code = vkd3d_shader_free_shader_code; - pfn_vkd3d_shader_compile_dxbc = vkd3d_shader_compile_dxbc; pfn_vkd3d_shader_scan_dxbc = vkd3d_shader_scan_dxbc; + pfn_vkd3d_shader_compile = vkd3d_shader_compile; rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, &dxbc); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); @@ -134,10 +135,11 @@ static void test_vkd3d_shader_pfns(void) compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; compile_info.next = NULL; compile_info.source = vs; + compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; compile_info.options = NULL; compile_info.option_count = 0; - rc = pfn_vkd3d_shader_compile_dxbc(&compile_info, &spirv); + rc = pfn_vkd3d_shader_compile(&compile_info, &spirv); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); pfn_vkd3d_shader_free_shader_code(&spirv);

1 0