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

[v2 PATCH 1/2] ntdll/tests: Add some tests for thread suspend/resume.
by Nikolay Sivov 16 Apr '19

16 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 57 ++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index accb5d8646..b7bf2748b5 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3135,6 +3135,61 @@ static void test_vectored_continue_handler(void) } #endif /* defined(__i386__) || defined(__x86_64__) */ +static DWORD WINAPI suspend_thread_test( void *arg ) +{ + HANDLE event = arg; + WaitForSingleObject(event, INFINITE); + return 0; +} + +static void test_suspend_thread(void) +{ + HANDLE thread, event; + NTSTATUS status; + ULONG count; + DWORD ret; + + status = NtSuspendThread(0, NULL); + ok(status == STATUS_INVALID_HANDLE, "Unexpected return value %#x.\n", status); + + status = NtResumeThread(0, NULL); + ok(status == STATUS_INVALID_HANDLE, "Unexpected return value %#x.\n", status); + + event = CreateEventW(NULL, FALSE, FALSE, NULL); + + thread = CreateThread(NULL, 0, suspend_thread_test, event, 0, NULL); + ok(thread != NULL, "Failed to create a thread.\n"); + + ret = WaitForSingleObject(thread, 0); + ok(ret == WAIT_TIMEOUT, "Unexpected status %d.\n", ret); + + status = NtResumeThread(thread, NULL); + ok(!status, "Unexpected status %#x.\n", status); + + status = NtResumeThread(thread, &count); + ok(!status, "Unexpected status %#x.\n", status); + ok(count == 0, "Unexpected suspended count %u.\n", count); + + status = NtSuspendThread(thread, NULL); + ok(!status, "Failed to suspend a thread, status %#x.\n", status); + + status = NtSuspendThread(thread, &count); + ok(!status, "Failed to suspend a thread, status %#x.\n", status); + ok(count == 1, "Unexpected suspended count %u.\n", count); + + status = NtResumeThread(thread, &count); + ok(!status, "Failed to resume a thread, status %#x.\n", status); + ok(count == 2, "Unexpected suspended count %u.\n", count); + + status = NtResumeThread(thread, NULL); + ok(!status, "Failed to resume a thread, status %#x.\n", status); + + SetEvent(event); + WaitForSingleObject(thread, INFINITE); + + CloseHandle(thread); +} + START_TEST(exception) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -3253,6 +3308,7 @@ START_TEST(exception) test_dpe_exceptions(); test_prot_fault(); test_thread_context(); + test_suspend_thread(); #elif defined(__x86_64__) pRtlAddFunctionTable = (void *)GetProcAddress( hntdll, @@ -3294,6 +3350,7 @@ START_TEST(exception) test_prot_fault(); test_dpe_exceptions(); test_wow64_context(); + test_suspend_thread(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind(); -- 2.20.1

2 3

[PATCH] include: Remove duplicate extern C from d3d11.idl
by Alistair Leslie-Hughes 16 Apr '19

16 Apr '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/d3d11.idl | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/d3d11.idl b/include/d3d11.idl index 78b4f33..384214f 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -1039,11 +1039,9 @@ typedef enum D3D11_STENCIL_OP } D3D11_STENCIL_OP; cpp_quote("#if !defined(D3D11_NO_HELPERS) && defined(__cplusplus)") -cpp_quote("}") cpp_quote("inline UINT D3D11CalcSubresource(UINT MipSlice, UINT ArraySlice, UINT MipLevels) {") cpp_quote(" return MipSlice + ArraySlice * MipLevels;") cpp_quote("}") -cpp_quote("extern \"C\"{") cpp_quote("#endif") typedef struct D3D11_SUBRESOURCE_DATA -- 1.9.1

1 0

[PATCH 1/2] winecfg: Use GetSysColorBrush().
by Zebediah Figura 16 Apr '19

16 Apr '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- programs/winecfg/about.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/about.c b/programs/winecfg/about.c index a2b402230c..879693e0ed 100644 --- a/programs/winecfg/about.c +++ b/programs/winecfg/about.c @@ -172,7 +172,7 @@ AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDC_ABT_LICENSE_TEXT: case IDC_ABT_WEB_LINK: SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW)); - return (INT_PTR)CreateSolidBrush(GetSysColor(COLOR_WINDOW)); + return (INT_PTR)GetSysColorBrush(COLOR_WINDOW); } break; } -- 2.21.0

1 1

[PATCH 3/3] include: Remove duplicate extern C from vsbackup.idl.
by Alistair Leslie-Hughes 15 Apr '19

15 Apr '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/vsbackup.idl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/vsbackup.idl b/include/vsbackup.idl index d2d8795..8cc7aa3 100644 --- a/include/vsbackup.idl +++ b/include/vsbackup.idl @@ -25,13 +25,7 @@ interface IVssEnumObject; interface IVssExamineWriterMetadata; interface IVssWriterComponentsExt; -cpp_quote("#ifdef _cplusplus") -cpp_quote("extern \"C\" {") -cpp_quote("#endif") cpp_quote("HRESULT WINAPI CreateVssBackupComponentsInternal(IVssBackupComponents **backup);") -cpp_quote("#ifdef _cplusplus") -cpp_quote("}") -cpp_quote("#endif") cpp_quote("static inline HRESULT CreateVssBackupComponents(IVssBackupComponents **backup)") cpp_quote(" { return CreateVssBackupComponentsInternal(backup); }") -- 1.9.1

1 0

[PATCH 2/3] include: Remove duplicate extern C from mimeole.idl.
by Alistair Leslie-Hughes 15 Apr '19

15 Apr '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/mimeole.idl | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index 29bead2..7289cb8 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -1447,10 +1447,6 @@ cpp_quote("#endif") } } -cpp_quote("#ifdef __cplusplus") -cpp_quote(" extern \"C\" {") -cpp_quote("#endif") - cpp_quote("") cpp_quote("HRESULT WINAPI MimeOleSetCompatMode(DWORD);") cpp_quote("HRESULT WINAPI MimeOleContentTypeFromUrl(LPCSTR,LPCSTR,LPSTR*);") @@ -1538,6 +1534,4 @@ cpp_quote("HRESULT WINAPI MimeEditDocumentFromStream(IStream*,REFIID,void**);") cpp_quote("HRESULT WINAPI MimeOleGetPropertySchema(IMimePropertySchema**);") cpp_quote("HRESULT WINAPI MimeGetAddressFormatW(REFIID,void*,DWORD,ADDRESSFORMAT,WCHAR**);") -cpp_quote("#ifdef __cplusplus") -cpp_quote("}") -cpp_quote("#endif") + -- 1.9.1

1 0

[PATCH 1/3] include: Remove duplicate extern C from d3dx10core.idl.
by Alistair Leslie-Hughes 15 Apr '19

15 Apr '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/d3dx10core.idl | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index afd77e9..5be6281 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -65,9 +65,6 @@ interface ID3DX10ThreadPump : IUnknown HRESULT GetQueueStatus([in] UINT *queue, [in] UINT *processqueue, [in] UINT *devicequeue); } -cpp_quote("#ifdef __cplusplus") -cpp_quote("extern \"C\" {") -cpp_quote("#endif") cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);") cpp_quote("HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,") cpp_quote(" HMODULE swrast, unsigned int flags, ID3D10Device **device);") @@ -75,6 +72,4 @@ cpp_quote("HRESULT WINAPI D3DX10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, cpp_quote(" HMODULE swrast, unsigned int flags, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain,") cpp_quote(" ID3D10Device **device);") cpp_quote("HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1);") -cpp_quote("#ifdef __cplusplus") -cpp_quote("}") -cpp_quote("#endif") + -- 1.9.1

1 0

[PATCH] include: Add IMFPMediaPlayer definition.
by Nikolay Sivov 15 Apr '19

15 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/Makefile.in | 1 + include/evr.idl | 11 +++ include/mfplay.idl | 202 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 214 insertions(+) create mode 100644 include/mfplay.idl diff --git a/include/Makefile.in b/include/Makefile.in index 74198af7a9..09c84d8254 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -370,6 +370,7 @@ SOURCES = \ mferror.h \ mfidl.idl \ mfobjects.idl \ + mfplay.idl \ mfreadwrite.idl \ mftransform.idl \ midles.h \ diff --git a/include/evr.idl b/include/evr.idl index 22f745e12e..3768b41b16 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -25,6 +25,17 @@ import "mftransform.idl"; import "mediaobj.idl"; import "strmif.idl"; +cpp_quote("#ifndef _MFVideoNormalizedRect_") +cpp_quote("#define _MFVideoNormalizedRect_") +typedef struct MFVideoNormalizedRect +{ + float left; + float top; + float right; + float bottom; +} MFVideoNormalizedRect; +cpp_quote("#endif") + typedef enum _MFVP_MESSAGE_TYPE { MFVP_MESSAGE_FLUSH, MFVP_MESSAGE_INVALIDATEMEDIATYPE, diff --git a/include/mfplay.idl b/include/mfplay.idl new file mode 100644 index 0000000000..415a6f5241 --- /dev/null +++ b/include/mfplay.idl @@ -0,0 +1,202 @@ +/* + * Copyright 2019 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "propsys.idl"; +import "evr.idl"; + +typedef [v1_enum] enum _MFP_CREATION_OPTIONS +{ + MFP_OPTION_NONE = 0, + MFP_OPTION_FREE_THREADED_CALLBACK = 0x1, + MFP_OPTION_NO_MMCSS = 0x2, + MFP_OPTION_NO_REMOTE_DESKTOP_OPTIMIZATION = 0x4, +} MFP_CREATION_OPTIONS; + +typedef [v1_enum] enum MFP_MEDIAPLAYER_STATE +{ + MFP_MEDIAPLAYER_STATE_EMPTY = 0, + MFP_MEDIAPLAYER_STATE_STOPPED, + MFP_MEDIAPLAYER_STATE_PLAYING, + MFP_MEDIAPLAYER_STATE_PAUSED, + MFP_MEDIAPLAYER_STATE_SHUTDOWN, +} MFP_MEDIAPLAYER_STATE; + +typedef enum MFP_EVENT_TYPE +{ + MFP_EVENT_TYPE_PLAY = 0, + MFP_EVENT_TYPE_PAUSE, + MFP_EVENT_TYPE_STOP, + MFP_EVENT_TYPE_POSITION_SET, + MFP_EVENT_TYPE_RATE_SET, + MFP_EVENT_TYPE_MEDIAITEM_CREATED, + MFP_EVENT_TYPE_MEDIAITEM_SET, + MFP_EVENT_TYPE_FRAME_STEP, + MFP_EVENT_TYPE_MEDIAITEM_CLEARED, + MFP_EVENT_TYPE_MF, + MFP_EVENT_TYPE_ERROR, + MFP_EVENT_TYPE_PLAYBACK_ENDED, + MFP_EVENT_TYPE_ACQUIRE_USER_CREDENTIAL, +} MFP_EVENT_TYPE; + +interface IMFPMediaPlayer; +interface IMFPMediaItem; + +typedef struct MFP_EVENT_HEADER +{ + MFP_EVENT_TYPE eEventType; + HRESULT hrEvent; + IMFPMediaPlayer *pMediaPlayer; + MFP_MEDIAPLAYER_STATE eState; + IPropertyStore *pPropertyStore; +} MFP_EVENT_HEADER; + +[ + object, + uuid(766c8ffb-5fdb-4fea-a28d-b912996f51bd), + local, +] +interface IMFPMediaPlayerCallback : IUnknown +{ + void OnMediaPlayerEvent([in] MFP_EVENT_HEADER *event_header); +} + +[ + object, + uuid(a714590a-58af-430a-85bf-44f5ec838d85), + local, +] +interface IMFPMediaPlayer : IUnknown +{ + HRESULT Play(); + + HRESULT Pause(); + + HRESULT Stop(); + + HRESULT FrameStep(); + + HRESULT SetPosition( + [in] REFGUID position_type, + [in] const PROPVARIANT *position); + + HRESULT GetPosition( + [in] REFGUID position_type, + [out] PROPVARIANT *position); + + HRESULT GetDuration( + [in] REFGUID position_type, + [out] PROPVARIANT *duration); + + HRESULT SetRate( + [in] float rate); + + HRESULT GetRate( + [out] float *rate); + + HRESULT GetSupportedRates( + [in] BOOL forward, + [out] float *slowest_rate, + [out] float *fastest_rate); + + HRESULT GetState( + [out] MFP_MEDIAPLAYER_STATE *state); + + HRESULT CreateMediaItemFromURL( + [in] const WCHAR *url, + [in] BOOL sync, + [in] DWORD_PTR user_data, + [out] IMFPMediaItem **item); + + HRESULT CreateMediaItemFromObject( + [in] IUnknown *object, + [in] BOOL sync, + [in] DWORD_PTR user_data, + [out] IMFPMediaItem **item); + + HRESULT SetMediaItem( + [in] IMFPMediaItem *item); + + HRESULT ClearMediaItem(); + + HRESULT GetMediaItem( + [out] IMFPMediaItem **item); + + HRESULT GetVolume( + [out] float *volume); + + HRESULT SetVolume( + [in] float volume); + + HRESULT GetBalance( + [out] float *balance); + + HRESULT SetBalance( + [in] float balance); + + HRESULT GetMute( + [out] BOOL *mute); + + HRESULT SetMute( + [in] BOOL mute); + + HRESULT GetNativeVideoSize( + [out] SIZE *video, + [out] SIZE *arvideo); + + HRESULT GetIdealVideoSize( + [out] SIZE *min_size, + [out] SIZE *max_size); + + HRESULT SetVideoSourceRect( + [in] MFVideoNormalizedRect const *rect); + + HRESULT GetVideoSourceRect( + [out] MFVideoNormalizedRect *rect); + + HRESULT SetAspectRatioMode( + [in] DWORD mode); + + HRESULT GetAspectRatioMode( + [out] DWORD *mode); + + HRESULT GetVideoWindow( + [out] HWND *hwnd); + + HRESULT UpdateVideo(); + + HRESULT SetBorderColor( + [in] COLORREF color); + + HRESULT GetBorderColor( + [out] COLORREF *color); + + HRESULT InsertEffect( + [in] IUnknown *effect, + [in] BOOL optional); + + HRESULT RemoveEffect( + [in] IUnknown *effect); + + HRESULT RemoveAllEffects(); + + HRESULT Shutdown(); +} + +cpp_quote("HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, ") +cpp_quote(" IMFPMediaPlayerCallback *callback, HWND hwnd, IMFPMediaPlayer **player);") -- 2.20.1

3 4

[PATCH vkd3d 2/5] vkd3d-shader: Implement parsing of root signature 1.1.
by Józef Kucia 15 Apr '19

15 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 82 +++++++ libs/vkd3d-shader/dxbc.c | 319 +++++++++++++++++++++----- libs/vkd3d-shader/vkd3d_shader.map | 2 + libs/vkd3d-shader/vkd3d_shader_main.c | 35 +++ 4 files changed, 382 insertions(+), 56 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 15a0b22d64dc..506d519ea630 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -216,6 +216,7 @@ struct vkd3d_shader_domain_shader_compile_arguments enum vkd3d_tessellator_output_primitive partitioning; }; +/* root signature 1.0 */ enum vkd3d_filter { VKD3D_FILTER_MIN_MAG_MIP_POINT = 0x0, @@ -393,13 +394,86 @@ struct vkd3d_root_signature_desc enum vkd3d_root_signature_flags flags; }; +/* root signature 1.1 */ +enum vkd3d_root_descriptor_flags +{ + VKD3D_ROOT_DESCRIPTOR_FLAG_NONE = 0x0, + VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE = 0x2, + VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, + VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, +}; + +enum vkd3d_descriptor_range_flags +{ + VKD3D_DESCRIPTOR_RANGE_FLAG_NONE = 0x0, + VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE = 0x1, + VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE = 0x2, + VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, + VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC = 0x8, +}; + +struct vkd3d_descriptor_range1 +{ + enum vkd3d_descriptor_range_type range_type; + unsigned int descriptor_count; + unsigned int base_shader_register; + unsigned int register_space; + enum vkd3d_descriptor_range_flags flags; + unsigned int descriptor_table_offset; +}; + +struct vkd3d_root_descriptor_table1 +{ + unsigned int descriptor_range_count; + const struct vkd3d_descriptor_range1 *descriptor_ranges; +}; + +struct vkd3d_root_descriptor1 +{ + unsigned int shader_register; + unsigned int register_space; + enum vkd3d_root_descriptor_flags flags; +}; + +struct vkd3d_root_parameter1 +{ + enum vkd3d_root_parameter_type parameter_type; + union + { + struct vkd3d_root_descriptor_table1 descriptor_table; + struct vkd3d_root_constants constants; + struct vkd3d_root_descriptor1 descriptor; + } u; + enum vkd3d_shader_visibility shader_visibility; +}; + +struct vkd3d_root_signature_desc1 +{ + unsigned int parameter_count; + const struct vkd3d_root_parameter1 *parameters; + unsigned int static_sampler_count; + const struct vkd3d_static_sampler_desc *static_samplers; + enum vkd3d_root_signature_flags flags; +}; + enum vkd3d_root_signature_version { VKD3D_ROOT_SIGNATURE_VERSION_1_0 = 0x1, + VKD3D_ROOT_SIGNATURE_VERSION_1_1 = 0x2, VKD3D_FORCE_32_BIT_ENUM(VKD3D_ROOT_SIGNATURE_VERSION), }; +struct vkd3d_versioned_root_signature_desc +{ + enum vkd3d_root_signature_version version; + union + { + struct vkd3d_root_signature_desc v_1_0; + struct vkd3d_root_signature_desc1 v_1_1; + } u; +}; + /* FIXME: Add support for 64 UAV bind slots. */ #define VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS 8 @@ -496,6 +570,10 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_root_signature_desc *root_signature); void vkd3d_shader_free_root_signature(struct vkd3d_root_signature_desc *root_signature); +int vkd3d_shader_parse_versioned_root_signature(const struct vkd3d_shader_code *dxbc, + struct vkd3d_versioned_root_signature_desc *root_signature); +void vkd3d_shader_free_versioned_root_signature(struct vkd3d_versioned_root_signature_desc *root_signature); + /* FIXME: Add support for returning error messages (ID3DBlob). */ int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc *root_signature, enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); @@ -525,6 +603,10 @@ typedef int (*PFN_vkd3d_shader_parse_root_signature)(const struct vkd3d_shader_c struct vkd3d_root_signature_desc *root_signature); typedef void (*PFN_vkd3d_shader_free_root_signature)(struct vkd3d_root_signature_desc *root_signature); +typedef int (*PFN_vkd3d_shader_parse_versioned_root_signature)(const struct vkd3d_shader_code *dxbc, + struct vkd3d_versioned_root_signature_desc *root_signature); +typedef void (*PFN_vkd3d_shader_free_versioned_root_signature)(struct vkd3d_versioned_root_signature_desc *root_signature); + typedef int (*PFN_vkd3d_shader_serialize_root_signature)(const struct vkd3d_root_signature_desc *root_signature, enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 996a7e544c1e..06812d0152b8 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1799,6 +1799,11 @@ static void read_float(const char **ptr, float *f) read_dword(ptr, (DWORD *)f); } +static void skip_dword(const char **ptr, unsigned int count) +{ + *ptr += count * sizeof(DWORD); +} + static void skip_dword_unknown(const char **ptr, unsigned int count) { unsigned int i; @@ -2087,18 +2092,28 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, return ret; } -static int shader_parse_descriptor_ranges(const char *data, DWORD data_size, - DWORD offset, DWORD count, struct vkd3d_descriptor_range *ranges) +/* root signatures */ +struct root_signature_parser_context { + const char *data; + unsigned int data_size; + + enum vkd3d_root_signature_version version; +}; + +static int shader_parse_descriptor_ranges(struct root_signature_parser_context *context, + unsigned int offset, unsigned int count, struct vkd3d_descriptor_range *ranges) +{ + unsigned int element_size = context->version >= VKD3D_ROOT_SIGNATURE_VERSION_1_1 ? 6: 5; const char *ptr; unsigned int i; - if (!require_space(offset, 5 * count, sizeof(DWORD), data_size)) + if (!require_space(offset, element_size * count, sizeof(DWORD), context->data_size)) { - WARN("Invalid data size %#x (offset %u, count %u).\n", data_size, offset, count); + WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); return VKD3D_ERROR_INVALID_ARGUMENT; } - ptr = &data[offset]; + ptr = &context->data[offset]; for (i = 0; i < count; ++i) { @@ -2106,6 +2121,8 @@ static int shader_parse_descriptor_ranges(const char *data, DWORD data_size, read_dword(&ptr, &ranges[i].descriptor_count); read_dword(&ptr, &ranges[i].base_shader_register); read_dword(&ptr, &ranges[i].register_space); + if (context->version >= VKD3D_ROOT_SIGNATURE_VERSION_1_1) + skip_dword(&ptr, 1); read_dword(&ptr, &ranges[i].descriptor_table_offset); TRACE("Type %#x, descriptor count %u, base shader register %u, " @@ -2118,19 +2135,52 @@ static int shader_parse_descriptor_ranges(const char *data, DWORD data_size, return VKD3D_OK; } -static int shader_parse_descriptor_table(const char *data, DWORD data_size, - DWORD offset, struct vkd3d_root_descriptor_table *table) +static int shader_parse_descriptor_ranges1(struct root_signature_parser_context *context, + unsigned int offset, unsigned int count, struct vkd3d_descriptor_range1 *ranges) +{ + const char *ptr; + unsigned int i; + + assert(context->version == VKD3D_ROOT_SIGNATURE_VERSION_1_1); + if (!require_space(offset, 6 * count, sizeof(uint32_t), context->data_size)) + { + WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + ptr = &context->data[offset]; + + for (i = 0; i < count; ++i) + { + read_dword(&ptr, &ranges[i].range_type); + read_dword(&ptr, &ranges[i].descriptor_count); + read_dword(&ptr, &ranges[i].base_shader_register); + read_dword(&ptr, &ranges[i].register_space); + read_dword(&ptr, &ranges[i].flags); + read_dword(&ptr, &ranges[i].descriptor_table_offset); + + TRACE("Type %#x, descriptor count %u, base shader register %u, " + "register space %u, flags %#x, offset %u.\n", + ranges[i].range_type, ranges[i].descriptor_count, + ranges[i].base_shader_register, ranges[i].register_space, + ranges[i].flags, ranges[i].descriptor_table_offset); + } + + return VKD3D_OK; +} + +static int shader_parse_descriptor_table(struct root_signature_parser_context *context, + unsigned int offset, struct vkd3d_root_descriptor_table *table) { struct vkd3d_descriptor_range *ranges; + unsigned int count; const char *ptr; - DWORD count; - if (!require_space(offset, 2, sizeof(DWORD), data_size)) + if (!require_space(offset, 2, sizeof(DWORD), context->data_size)) { - WARN("Invalid data size %#x (offset %u).\n", data_size, offset); + WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); return VKD3D_ERROR_INVALID_ARGUMENT; } - ptr = &data[offset]; + ptr = &context->data[offset]; read_dword(&ptr, &count); read_dword(&ptr, &offset); @@ -2142,20 +2192,47 @@ static int shader_parse_descriptor_table(const char *data, DWORD data_size, if (!(ranges = vkd3d_calloc(count, sizeof(*ranges)))) return VKD3D_ERROR_OUT_OF_MEMORY; table->descriptor_ranges = ranges; - return shader_parse_descriptor_ranges(data, data_size, offset, count, ranges); + return shader_parse_descriptor_ranges(context, offset, count, ranges); } -static int shader_parse_root_constants(const char *data, DWORD data_size, - DWORD offset, struct vkd3d_root_constants *constants) +static int shader_parse_descriptor_table1(struct root_signature_parser_context *context, + unsigned int offset, struct vkd3d_root_descriptor_table1 *table) { + struct vkd3d_descriptor_range1 *ranges; + unsigned int count; const char *ptr; - if (!require_space(offset, 3, sizeof(DWORD), data_size)) + if (!require_space(offset, 2, sizeof(DWORD), context->data_size)) { - WARN("Invalid data size %#x (offset %u).\n", data_size, offset); + WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); return VKD3D_ERROR_INVALID_ARGUMENT; } - ptr = &data[offset]; + ptr = &context->data[offset]; + + read_dword(&ptr, &count); + read_dword(&ptr, &offset); + + TRACE("Descriptor range count %u.\n", count); + + table->descriptor_range_count = count; + + if (!(ranges = vkd3d_calloc(count, sizeof(*ranges)))) + return VKD3D_ERROR_OUT_OF_MEMORY; + table->descriptor_ranges = ranges; + return shader_parse_descriptor_ranges1(context, offset, count, ranges); +} + +static int shader_parse_root_constants(struct root_signature_parser_context *context, + unsigned int offset, struct vkd3d_root_constants *constants) +{ + const char *ptr; + + if (!require_space(offset, 3, sizeof(DWORD), context->data_size)) + { + WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + ptr = &context->data[offset]; read_dword(&ptr, &constants->shader_register); read_dword(&ptr, &constants->register_space); @@ -2167,20 +2244,23 @@ static int shader_parse_root_constants(const char *data, DWORD data_size, return VKD3D_OK; } -static int shader_parse_root_descriptor(const char *data, DWORD data_size, - DWORD offset, struct vkd3d_root_descriptor *descriptor) +static int shader_parse_root_descriptor(struct root_signature_parser_context *context, + unsigned int offset, struct vkd3d_root_descriptor *descriptor) { + unsigned int element_size = context->version >= VKD3D_ROOT_SIGNATURE_VERSION_1_1 ? 3: 2; const char *ptr; - if (!require_space(offset, 2, sizeof(DWORD), data_size)) + if (!require_space(offset, element_size, sizeof(DWORD), context->data_size)) { - WARN("Invalid data size %#x (offset %u).\n", data_size, offset); + WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); return VKD3D_ERROR_INVALID_ARGUMENT; } - ptr = &data[offset]; + ptr = &context->data[offset]; read_dword(&ptr, &descriptor->shader_register); read_dword(&ptr, &descriptor->register_space); + if (context->version >= VKD3D_ROOT_SIGNATURE_VERSION_1_1) + skip_dword(&ptr, 1); TRACE("Shader register %u, register space %u.\n", descriptor->shader_register, descriptor->register_space); @@ -2188,19 +2268,90 @@ static int shader_parse_root_descriptor(const char *data, DWORD data_size, return VKD3D_OK; } -static int shader_parse_root_parameters(const char *data, DWORD data_size, - DWORD offset, DWORD count, struct vkd3d_root_parameter *parameters) +static int shader_parse_root_descriptor1(struct root_signature_parser_context *context, + unsigned int offset, struct vkd3d_root_descriptor1 *descriptor) +{ + const char *ptr; + + assert(context->version == VKD3D_ROOT_SIGNATURE_VERSION_1_1); + if (!require_space(offset, 3, sizeof(DWORD), context->data_size)) + { + WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + ptr = &context->data[offset]; + + read_dword(&ptr, &descriptor->shader_register); + read_dword(&ptr, &descriptor->register_space); + read_dword(&ptr, &descriptor->flags); + + TRACE("Shader register %u, register space %u, flags %#x.\n", + descriptor->shader_register, descriptor->register_space, descriptor->flags); + + return VKD3D_OK; +} + +static int shader_parse_root_parameters(struct root_signature_parser_context *context, + unsigned int offset, unsigned int count, struct vkd3d_root_parameter *parameters) +{ + const char *ptr; + unsigned int i; + int ret; + + if (!require_space(offset, 3 * count, sizeof(DWORD), context->data_size)) + { + WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + ptr = &context->data[offset]; + + for (i = 0; i < count; ++i) + { + read_dword(&ptr, &parameters[i].parameter_type); + read_dword(&ptr, &parameters[i].shader_visibility); + read_dword(&ptr, &offset); + + TRACE("Type %#x, shader visibility %#x.\n", + parameters[i].parameter_type, parameters[i].shader_visibility); + + switch (parameters[i].parameter_type) + { + case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + ret = shader_parse_descriptor_table(context, offset, &parameters[i].u.descriptor_table); + break; + case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: + ret = shader_parse_root_constants(context, offset, &parameters[i].u.constants); + break; + case VKD3D_ROOT_PARAMETER_TYPE_CBV: + case VKD3D_ROOT_PARAMETER_TYPE_SRV: + case VKD3D_ROOT_PARAMETER_TYPE_UAV: + ret = shader_parse_root_descriptor(context, offset, &parameters[i].u.descriptor); + break; + default: + FIXME("Unrecognized type %#x.\n", parameters[i].parameter_type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + if (ret < 0) + return ret; + } + + return VKD3D_OK; +} + +static int shader_parse_root_parameters1(struct root_signature_parser_context *context, + DWORD offset, DWORD count, struct vkd3d_root_parameter1 *parameters) { const char *ptr; unsigned int i; int ret; - if (!require_space(offset, 3 * count, sizeof(DWORD), data_size)) + if (!require_space(offset, 3 * count, sizeof(DWORD), context->data_size)) { - WARN("Invalid data size %#x (offset %u, count %u).\n", data_size, offset, count); + WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); return VKD3D_ERROR_INVALID_ARGUMENT; } - ptr = &data[offset]; + ptr = &context->data[offset]; for (i = 0; i < count; ++i) { @@ -2214,15 +2365,15 @@ static int shader_parse_root_parameters(const char *data, DWORD data_size, switch (parameters[i].parameter_type) { case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: - ret = shader_parse_descriptor_table(data, data_size, offset, &parameters[i].u.descriptor_table); + ret = shader_parse_descriptor_table1(context, offset, &parameters[i].u.descriptor_table); break; case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: - ret = shader_parse_root_constants(data, data_size, offset, &parameters[i].u.constants); + ret = shader_parse_root_constants(context, offset, &parameters[i].u.constants); break; case VKD3D_ROOT_PARAMETER_TYPE_CBV: case VKD3D_ROOT_PARAMETER_TYPE_SRV: case VKD3D_ROOT_PARAMETER_TYPE_UAV: - ret = shader_parse_root_descriptor(data, data_size, offset, &parameters[i].u.descriptor); + ret = shader_parse_root_descriptor1(context, offset, &parameters[i].u.descriptor); break; default: FIXME("Unrecognized type %#x.\n", parameters[i].parameter_type); @@ -2236,18 +2387,18 @@ static int shader_parse_root_parameters(const char *data, DWORD data_size, return VKD3D_OK; } -static int shader_parse_static_samplers(const char *data, DWORD data_size, - DWORD offset, DWORD count, struct vkd3d_static_sampler_desc *sampler_descs) +static int shader_parse_static_samplers(struct root_signature_parser_context *context, + unsigned int offset, unsigned int count, struct vkd3d_static_sampler_desc *sampler_descs) { const char *ptr; unsigned int i; - if (!require_space(offset, 13 * count, sizeof(DWORD), data_size)) + if (!require_space(offset, 13 * count, sizeof(DWORD), context->data_size)) { - WARN("Invalid data size %#x (offset %u, count %u).\n", data_size, offset, count); + WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); return VKD3D_ERROR_INVALID_ARGUMENT; } - ptr = &data[offset]; + ptr = &context->data[offset]; for (i = 0; i < count; ++i) { @@ -2269,60 +2420,94 @@ static int shader_parse_static_samplers(const char *data, DWORD data_size, return VKD3D_OK; } -static int shader_parse_root_signature(const char *data, DWORD data_size, - struct vkd3d_root_signature_desc *desc) +static int shader_parse_root_signature(const char *data, unsigned int data_size, + struct vkd3d_versioned_root_signature_desc *desc) { + struct vkd3d_root_signature_desc *v_1_0 = &desc->u.v_1_0; + struct root_signature_parser_context context; + unsigned int count, offset, version; const char *ptr = data; - DWORD count, offset; int ret; + context.data = data; + context.data_size = data_size; + if (!require_space(0, 6, sizeof(DWORD), data_size)) { WARN("Invalid data size %#x.\n", data_size); return VKD3D_ERROR_INVALID_ARGUMENT; } - skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000001. */ + read_dword(&ptr, &version); + TRACE("Version %#x.\n", version); + if (version != VKD3D_ROOT_SIGNATURE_VERSION_1_0 && version != VKD3D_ROOT_SIGNATURE_VERSION_1_1) + { + FIXME("Unknown version %#x.\n", version); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + context.version = version; + if (!desc->version) + desc->version = version; read_dword(&ptr, &count); read_dword(&ptr, &offset); TRACE("Parameter count %u, offset %u.\n", count, offset); - desc->parameter_count = count; - if (desc->parameter_count) + if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) { - struct vkd3d_root_parameter *parameters; - if (!(parameters = vkd3d_calloc(desc->parameter_count, sizeof(*parameters)))) - return VKD3D_ERROR_OUT_OF_MEMORY; - desc->parameters = parameters; - if ((ret = shader_parse_root_parameters(data, data_size, offset, count, parameters)) < 0) - return ret; + v_1_0->parameter_count = count; + if (v_1_0->parameter_count) + { + struct vkd3d_root_parameter *parameters; + if (!(parameters = vkd3d_calloc(v_1_0->parameter_count, sizeof(*parameters)))) + return VKD3D_ERROR_OUT_OF_MEMORY; + v_1_0->parameters = parameters; + if ((ret = shader_parse_root_parameters(&context, offset, count, parameters)) < 0) + return ret; + } + } + else + { + struct vkd3d_root_signature_desc1 *v_1_1 = &desc->u.v_1_1; + + assert(version == VKD3D_ROOT_SIGNATURE_VERSION_1_1); + + v_1_1->parameter_count = count; + if (v_1_1->parameter_count) + { + struct vkd3d_root_parameter1 *parameters; + if (!(parameters = vkd3d_calloc(v_1_1->parameter_count, sizeof(*parameters)))) + return VKD3D_ERROR_OUT_OF_MEMORY; + v_1_1->parameters = parameters; + if ((ret = shader_parse_root_parameters1(&context, offset, count, parameters)) < 0) + return ret; + } } read_dword(&ptr, &count); read_dword(&ptr, &offset); TRACE("Static sampler count %u, offset %u.\n", count, offset); - desc->static_sampler_count = count; - if (desc->static_sampler_count) + v_1_0->static_sampler_count = count; + if (v_1_0->static_sampler_count) { struct vkd3d_static_sampler_desc *samplers; - if (!(samplers = vkd3d_calloc(desc->static_sampler_count, sizeof(*samplers)))) + if (!(samplers = vkd3d_calloc(v_1_0->static_sampler_count, sizeof(*samplers)))) return VKD3D_ERROR_OUT_OF_MEMORY; - desc->static_samplers = samplers; - if ((ret = shader_parse_static_samplers(data, data_size, offset, count, samplers)) < 0) + v_1_0->static_samplers = samplers; + if ((ret = shader_parse_static_samplers(&context, offset, count, samplers)) < 0) return ret; } - read_dword(&ptr, &desc->flags); - TRACE("Flags %#x.\n", desc->flags); + read_dword(&ptr, &v_1_0->flags); + TRACE("Flags %#x.\n", v_1_0->flags); return VKD3D_OK; } static int rts0_handler(const char *data, DWORD data_size, DWORD tag, void *context) { - struct vkd3d_root_signature_desc *desc = context; + struct vkd3d_versioned_root_signature_desc *desc = context; if (tag != TAG_RTS0) return VKD3D_OK; @@ -2332,6 +2517,28 @@ static int rts0_handler(const char *data, DWORD data_size, DWORD tag, void *cont int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_root_signature_desc *root_signature) +{ + struct vkd3d_versioned_root_signature_desc desc = {.version = VKD3D_ROOT_SIGNATURE_VERSION_1_0}; + int ret; + + TRACE("dxbc {%p, %zu}, root_signature %p.\n", dxbc->code, dxbc->size, root_signature); + + memset(root_signature, 0, sizeof(*root_signature)); + if ((ret = parse_dxbc(dxbc->code, dxbc->size, rts0_handler, &desc)) < 0) + { + vkd3d_shader_free_versioned_root_signature(&desc); + return ret; + } + + assert(desc.version == VKD3D_ROOT_SIGNATURE_VERSION_1_0); + + *root_signature = desc.u.v_1_0; + + return VKD3D_OK; +} + +int vkd3d_shader_parse_versioned_root_signature(const struct vkd3d_shader_code *dxbc, + struct vkd3d_versioned_root_signature_desc *root_signature) { int ret; @@ -2340,7 +2547,7 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, memset(root_signature, 0, sizeof(*root_signature)); if ((ret = parse_dxbc(dxbc->code, dxbc->size, rts0_handler, root_signature)) < 0) { - vkd3d_shader_free_root_signature(root_signature); + vkd3d_shader_free_versioned_root_signature(root_signature); return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 92e4d06b0095..52ca4edcc50a 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -6,8 +6,10 @@ global: vkd3d_shader_free_root_signature; vkd3d_shader_free_shader_code; vkd3d_shader_free_shader_signature; + vkd3d_shader_free_versioned_root_signature; vkd3d_shader_parse_input_signature; vkd3d_shader_parse_root_signature; + vkd3d_shader_parse_versioned_root_signature; vkd3d_shader_scan_dxbc; vkd3d_shader_serialize_root_signature; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 55cb56c2e191..d56794105829 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -344,6 +344,41 @@ void vkd3d_shader_free_root_signature(struct vkd3d_root_signature_desc *root_sig memset(root_signature, 0, sizeof(*root_signature)); } +void vkd3d_shader_free_versioned_root_signature(struct vkd3d_versioned_root_signature_desc *desc) +{ + struct vkd3d_root_signature_desc1 *root_signature; + unsigned int i; + + if (!desc->version) + return; + + if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) + { + vkd3d_shader_free_root_signature(&desc->u.v_1_0); + return; + } + + if (desc->version != VKD3D_ROOT_SIGNATURE_VERSION_1_1) + { + FIXME("Unknown version %#x.\n", desc->version); + return; + } + + root_signature = &desc->u.v_1_1; + + for (i = 0; i < root_signature->parameter_count; ++i) + { + const struct vkd3d_root_parameter1 *parameter = &root_signature->parameters[i]; + + if (parameter->parameter_type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + vkd3d_free((void *)parameter->u.descriptor_table.descriptor_ranges); + } + vkd3d_free((void *)root_signature->parameters); + vkd3d_free((void *)root_signature->static_samplers); + + memset(root_signature, 0, sizeof(*root_signature)); +} + int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_signature *signature) { -- 2.21.0

2 3

[PATCH vkd3d 4/5] vkd3d-shader: Implement conversion between root signature 1.0 and 1.1.
by Józef Kucia 15 Apr '19

15 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 6 + libs/vkd3d-shader/dxbc.c | 262 +++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader.map | 1 + 3 files changed, 269 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 506d519ea630..7bf3bd5e4514 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -578,6 +578,9 @@ void vkd3d_shader_free_versioned_root_signature(struct vkd3d_versioned_root_sign int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc *root_signature, enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); +int vkd3d_shader_convert_root_signature(struct vkd3d_versioned_root_signature_desc *dst, + enum vkd3d_root_signature_version version, const struct vkd3d_versioned_root_signature_desc *src); + int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_scan_info *scan_info); @@ -610,6 +613,9 @@ typedef void (*PFN_vkd3d_shader_free_versioned_root_signature)(struct vkd3d_vers typedef int (*PFN_vkd3d_shader_serialize_root_signature)(const struct vkd3d_root_signature_desc *root_signature, enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); +typedef int (*PFN_vkd3d_shader_convert_root_signature)(struct vkd3d_versioned_root_signature_desc *dst, + enum vkd3d_root_signature_version version, const struct vkd3d_versioned_root_signature_desc *src); + typedef int (*PFN_vkd3d_shader_scan_dxbc)(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_scan_info *scan_info); diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 06812d0152b8..f232f5cd0b7e 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2093,6 +2093,11 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, } /* root signatures */ +#define VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE + +#define VKD3D_ROOT_SIGNATURE_1_0_DESCRIPTOR_RANGE_FLAGS \ + (VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE) + struct root_signature_parser_context { const char *data; @@ -2848,3 +2853,260 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc return VKD3D_OK; } + +static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, + const struct vkd3d_root_parameter1 *src, unsigned int count) +{ + const struct vkd3d_descriptor_range1 *ranges1; + struct vkd3d_descriptor_range *ranges; + unsigned int i, j; + int ret; + + for (i = 0; i < count; ++i) + { + const struct vkd3d_root_parameter1 *p1 = &src[i]; + struct vkd3d_root_parameter *p = &dst[i]; + + p->parameter_type = p1->parameter_type; + switch (p->parameter_type) + { + case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + ranges = NULL; + if ((p->u.descriptor_table.descriptor_range_count = p1->u.descriptor_table.descriptor_range_count)) + { + if (!(ranges = vkd3d_calloc(p->u.descriptor_table.descriptor_range_count, sizeof(*ranges)))) + { + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; + } + } + p->u.descriptor_table.descriptor_ranges = ranges; + ranges1 = p1->u.descriptor_table.descriptor_ranges; + for (j = 0; j < p1->u.descriptor_table.descriptor_range_count; ++j) + { + ranges[j].range_type = ranges1[j].range_type; + ranges[j].descriptor_count = ranges1[j].descriptor_count; + ranges[j].base_shader_register = ranges1[j].base_shader_register; + ranges[j].register_space = ranges1[j].register_space; + ranges[j].descriptor_table_offset = ranges1[j].descriptor_table_offset; + } + break; + case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: + p->u.constants = p1->u.constants; + break; + case VKD3D_ROOT_PARAMETER_TYPE_CBV: + case VKD3D_ROOT_PARAMETER_TYPE_SRV: + case VKD3D_ROOT_PARAMETER_TYPE_UAV: + p->u.descriptor.shader_register = p1->u.descriptor.shader_register; + p->u.descriptor.register_space = p1->u.descriptor.register_space; + break; + default: + WARN("Invalid root parameter type %#x.\n", p->parameter_type); + ret = VKD3D_ERROR_INVALID_ARGUMENT; + goto fail; + + } + p->shader_visibility = p1->shader_visibility; + } + + return VKD3D_OK; + +fail: + for (j = 0; j < i; ++j) + { + const struct vkd3d_root_parameter *p = &dst[j]; + if (p->parameter_type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + vkd3d_free((void *)p->u.descriptor_table.descriptor_ranges); + } + return ret; +} + +static int convert_root_signature_to_v1_0(struct vkd3d_versioned_root_signature_desc *dst, + const struct vkd3d_versioned_root_signature_desc *src) +{ + const struct vkd3d_root_signature_desc1 *src_desc = &src->u.v_1_1; + struct vkd3d_root_signature_desc *dst_desc = &dst->u.v_1_0; + struct vkd3d_static_sampler_desc *samplers = NULL; + struct vkd3d_root_parameter *parameters = NULL; + int ret; + + if ((dst_desc->parameter_count = src_desc->parameter_count)) + { + if (!(parameters = vkd3d_calloc(dst_desc->parameter_count, sizeof(*parameters)))) + { + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; + } + if ((ret = convert_root_parameters_to_v_1_0(parameters, src_desc->parameters, src_desc->parameter_count)) < 0) + goto fail; + } + dst_desc->parameters = parameters; + if ((dst_desc->static_sampler_count = src_desc->static_sampler_count)) + { + if (!(samplers = vkd3d_calloc(dst_desc->static_sampler_count, sizeof(*samplers)))) + { + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; + } + memcpy(samplers, src_desc->static_samplers, src_desc->static_sampler_count * sizeof(*samplers)); + } + dst_desc->static_samplers = samplers; + dst_desc->flags = src_desc->flags; + + return VKD3D_OK; + +fail: + vkd3d_free(parameters); + vkd3d_free(samplers); + return ret; +} + +static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, + const struct vkd3d_root_parameter *src, unsigned int count) +{ + const struct vkd3d_descriptor_range *ranges; + struct vkd3d_descriptor_range1 *ranges1; + unsigned int i, j; + int ret; + + for (i = 0; i < count; ++i) + { + const struct vkd3d_root_parameter *p = &src[i]; + struct vkd3d_root_parameter1 *p1 = &dst[i]; + + p1->parameter_type = p->parameter_type; + switch (p1->parameter_type) + { + case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + ranges1 = NULL; + if ((p1->u.descriptor_table.descriptor_range_count = p->u.descriptor_table.descriptor_range_count)) + { + if (!(ranges1 = vkd3d_calloc(p1->u.descriptor_table.descriptor_range_count, sizeof(*ranges1)))) + { + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; + } + } + p1->u.descriptor_table.descriptor_ranges = ranges1; + ranges = p->u.descriptor_table.descriptor_ranges; + for (j = 0; j < p->u.descriptor_table.descriptor_range_count; ++j) + { + ranges1[j].range_type = ranges[j].range_type; + ranges1[j].descriptor_count = ranges[j].descriptor_count; + ranges1[j].base_shader_register = ranges[j].base_shader_register; + ranges1[j].register_space = ranges[j].register_space; + ranges1[j].flags = VKD3D_ROOT_SIGNATURE_1_0_DESCRIPTOR_RANGE_FLAGS; + ranges1[j].descriptor_table_offset = ranges[j].descriptor_table_offset; + } + break; + case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: + p1->u.constants = p->u.constants; + break; + case VKD3D_ROOT_PARAMETER_TYPE_CBV: + case VKD3D_ROOT_PARAMETER_TYPE_SRV: + case VKD3D_ROOT_PARAMETER_TYPE_UAV: + p1->u.descriptor.shader_register = p->u.descriptor.shader_register; + p1->u.descriptor.register_space = p->u.descriptor.register_space; + p1->u.descriptor.flags = VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS; + break; + default: + WARN("Invalid root parameter type %#x.\n", p1->parameter_type); + ret = VKD3D_ERROR_INVALID_ARGUMENT; + goto fail; + + } + p1->shader_visibility = p->shader_visibility; + } + + return VKD3D_OK; + +fail: + for (j = 0; j < i; ++j) + { + const struct vkd3d_root_parameter1 *p = &dst[j]; + if (p->parameter_type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + vkd3d_free((void *)p->u.descriptor_table.descriptor_ranges); + } + return ret; +} + +static int convert_root_signature_to_v1_1(struct vkd3d_versioned_root_signature_desc *dst, + const struct vkd3d_versioned_root_signature_desc *src) +{ + const struct vkd3d_root_signature_desc *src_desc = &src->u.v_1_0; + struct vkd3d_root_signature_desc1 *dst_desc = &dst->u.v_1_1; + struct vkd3d_static_sampler_desc *samplers = NULL; + struct vkd3d_root_parameter1 *parameters = NULL; + int ret; + + if ((dst_desc->parameter_count = src_desc->parameter_count)) + { + if (!(parameters = vkd3d_calloc(dst_desc->parameter_count, sizeof(*parameters)))) + { + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; + } + if ((ret = convert_root_parameters_to_v_1_1(parameters, src_desc->parameters, src_desc->parameter_count)) < 0) + goto fail; + } + dst_desc->parameters = parameters; + if ((dst_desc->static_sampler_count = src_desc->static_sampler_count)) + { + if (!(samplers = vkd3d_calloc(dst_desc->static_sampler_count, sizeof(*samplers)))) + { + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; + } + memcpy(samplers, src_desc->static_samplers, src_desc->static_sampler_count * sizeof(*samplers)); + } + dst_desc->static_samplers = samplers; + dst_desc->flags = src_desc->flags; + + return VKD3D_OK; + +fail: + vkd3d_free(parameters); + vkd3d_free(samplers); + return ret; +} + +int vkd3d_shader_convert_root_signature(struct vkd3d_versioned_root_signature_desc *dst, + enum vkd3d_root_signature_version version, const struct vkd3d_versioned_root_signature_desc *src) +{ + int ret; + + TRACE("dst %p, version %#x, src %p.\n", dst, version, src); + + if (src->version == version) + { + WARN("Nothing to convert.\n"); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + if (version != VKD3D_ROOT_SIGNATURE_VERSION_1_0 && version != VKD3D_ROOT_SIGNATURE_VERSION_1_1) + { + WARN("Root signature version %#x not supported.\n", version); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + if (src->version != VKD3D_ROOT_SIGNATURE_VERSION_1_0 && src->version != VKD3D_ROOT_SIGNATURE_VERSION_1_1) + { + WARN("Root signature version %#x not supported.\n", src->version); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + memset(dst, 0, sizeof(*dst)); + dst->version = version; + + if (version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) + { + ret = convert_root_signature_to_v1_0(dst, src); + } + else + { + assert(version == VKD3D_ROOT_SIGNATURE_VERSION_1_1); + ret = convert_root_signature_to_v1_1(dst, src); + } + + return ret; +} diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 52ca4edcc50a..e1f1f1c179a2 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -2,6 +2,7 @@ VKD3D_1_0 { global: vkd3d_shader_compile_dxbc; + vkd3d_shader_convert_root_signature; vkd3d_shader_find_signature_element; vkd3d_shader_free_root_signature; vkd3d_shader_free_shader_code; -- 2.21.0

2 1

[PATCH 4/4] mshtml: Support argument type conversion for functions with dual interface return type.
by Jacek Caban 15 Apr '19

15 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/dispex.c | 10 +++++++--- dlls/mshtml/tests/elements.js | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-)

2 1