wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Huw Davies : wineps: Avoid using typeof().
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 586ae944b54b9e34b4fd2a624b814a48a0af34c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=586ae944b54b9e34b4fd2a62… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 18 08:39:40 2021 +0100 wineps: Avoid using typeof(). Based on a patch by Alex Henrie. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/download.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index dc77cf11703..3e720bf195b 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -65,7 +65,7 @@ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str { USHORT count, i; BYTE *strings; - struct + struct name_record { USHORT platform_id; USHORT encoding_id; @@ -78,7 +78,7 @@ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str GetFontData(dev->hdc, MS_MAKE_TAG('n','a','m','e'), 0, name, size); count = GET_BE_WORD(name + 2); strings = name + GET_BE_WORD(name + 4); - name_record = (typeof(name_record))(name + 6); + name_record = (struct name_record *)(name + 6); for(i = 0; i < count; i++, name_record++) { name_record->platform_id = GET_BE_WORD(&name_record->platform_id); @@ -687,7 +687,6 @@ void get_glyph_name(HDC hdc, WORD index, char *name) DWORD minMemType1; DWORD maxMemType1; } *post_header; - BYTE *post = NULL; DWORD size; /* set a fallback name that is just 'g<index>' */ @@ -697,13 +696,11 @@ void get_glyph_name(HDC hdc, WORD index, char *name) size = GetFontData(hdc, MS_MAKE_TAG('p','o','s','t'), 0, NULL, 0); if(size < sizeof(*post_header) || size == GDI_ERROR) return; - post = HeapAlloc(GetProcessHeap(), 0, size); - if(!post) - return; - size = GetFontData(hdc, MS_MAKE_TAG('p','o','s','t'), 0, post, size); + post_header = HeapAlloc(GetProcessHeap(), 0, size); + if(!post_header) return; + size = GetFontData(hdc, MS_MAKE_TAG('p','o','s','t'), 0, post_header, size); if(size < sizeof(*post_header) || size == GDI_ERROR) goto cleanup; - post_header = (typeof(post_header))(post); /* note: only interested in the format for obtaining glyph names */ post_header->format = GET_BE_DWORD(&post_header->format); @@ -717,7 +714,7 @@ void get_glyph_name(HDC hdc, WORD index, char *name) } else if(post_header->format == MAKELONG(0, 2)) { - BYTE *post2header = post + sizeof(*post_header); + void *post2header = post_header + 1; int glyphNameIndex; size -= sizeof(*post_header); @@ -739,7 +736,7 @@ void get_glyph_name(HDC hdc, WORD index, char *name) HIWORD(post_header->format), LOWORD(post_header->format)); cleanup: - HeapFree(GetProcessHeap(), 0, post); + HeapFree(GetProcessHeap(), 0, post_header); } /****************************************************************************

1 0

Zebediah Figura : include: Add INSSBuffer3.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: f454932b4a0dcf85e9bd190ea66844ec3a99e8aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=f454932b4a0dcf85e9bd190e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 15 17:28:10 2021 -0500 include: Add INSSBuffer3. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsbuffer.idl | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/include/wmsbuffer.idl b/include/wmsbuffer.idl index 6ec9dfc7c3b..a9d76898982 100644 --- a/include/wmsbuffer.idl +++ b/include/wmsbuffer.idl @@ -41,3 +41,25 @@ interface INSSBuffer : IUnknown [out] BYTE **ppdwBuffer, [out] DWORD *pdwLength); } + +[ + object, + local, + uuid(4f528693-1035-43fe-b428-757561ad3a68), +] +interface INSSBuffer2 : INSSBuffer +{ + HRESULT GetSampleProperties(DWORD size, BYTE *props); + HRESULT SetSampleProperties(DWORD size, BYTE *props); +} + +[ + object, + local, + uuid(c87ceaaf-75be-4bc4-84eb-ac2798507672), +] +interface INSSBuffer3 : INSSBuffer2 +{ + HRESULT SetProperty(GUID id, void *value, DWORD size); + HRESULT GetProperty(GUID id, void *value, DWORD *size); +}

1 0

Zebediah Figura : include: Add IWMCredentialCallback.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 3eb33e94a2b719cede5d27a7c6860e4c73660bc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eb33e94a2b719cede5d27a7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 15 17:28:09 2021 -0500 include: Add IWMCredentialCallback. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 0adde5e2dd9..f276d642a03 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1913,6 +1913,17 @@ interface IWMIStreamProps : IUnknown HRESULT GetProperty(const WCHAR *name, WMT_ATTR_DATATYPE *type, BYTE *value, DWORD *size); } +[ + object, + local, + uuid(342e0eb7-e651-450c-975b-2ace2c90c48e), +] +interface IWMCredentialCallback : IUnknown +{ + HRESULT AcquireCredentials(WCHAR *realm, WCHAR *site, WCHAR *username, DWORD username_size, + WCHAR *password, DWORD password_size, HRESULT hr, DWORD *flags); +} + cpp_quote("HRESULT WINAPI WMCheckURLExtension(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);")

1 0

Zebediah Figura : include: Add IWMReaderCallbackAdvanced.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: a4e1e7f9008c189642b766b4ab4789215f7feccd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4e1e7f9008c189642b766b4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 15 17:28:08 2021 -0500 include: Add IWMReaderCallbackAdvanced. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 78505ce3e5a..0adde5e2dd9 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -260,6 +260,21 @@ interface IWMReaderCallback : IWMStatusCallback [in] void *pvContext); } +[ + object, + local, + uuid(96406beb-2b2b-11d3-b36b-00c04f6108ff), +] +interface IWMReaderCallbackAdvanced : IUnknown +{ + HRESULT OnStreamSample(WORD stream_number, QWORD pts, QWORD duration, DWORD flags, INSSBuffer *sample, void *context); + HRESULT OnTime(QWORD time, void *context); + HRESULT OnStreamSelection(WORD count, WORD *stream_numbers, WMT_STREAM_SELECTION *selections, void *context); + HRESULT OnOutputPropsChanged(DWORD output_number, WM_MEDIA_TYPE *mt, void *context); + HRESULT AllocateForStream(WORD stream_number, DWORD size, INSSBuffer **sample, void *context); + HRESULT AllocateForOutput(DWORD output_number, DWORD size, INSSBuffer **sample, void *context); +} + [ object, uuid(96406Bdd-2b2b-11d3-b36b-00c04f6108ff),

1 0

Zebediah Figura : include: Add IWMIStreamProps.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: ac6ba5f395094631053907a8fb0d6446e3013690 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac6ba5f395094631053907a8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 15 17:28:07 2021 -0500 include: Add IWMIStreamProps. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 945a8faaca4..78505ce3e5a 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1888,6 +1888,16 @@ interface IWMLicenseRestore : IUnknown HRESULT CancelLicenseRestore(); } +[ + object, + local, + uuid(6816dad3-2b4b-4c8e-8149-874c3483a753), +] +interface IWMIStreamProps : IUnknown +{ + HRESULT GetProperty(const WCHAR *name, WMT_ATTR_DATATYPE *type, BYTE *value, DWORD *size); +} + cpp_quote("HRESULT WINAPI WMCheckURLExtension(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);")

1 0

Zebediah Figura : include: Add IWMGetSecureChannel.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: bb6444682d3cfe096c123ad4264e1682cdf21f19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb6444682d3cfe096c123ad4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 15 17:28:06 2021 -0500 include: Add IWMGetSecureChannel. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wmsecure.idl | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 94010695214..a9a478e5433 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -832,6 +832,7 @@ SOURCES = \ wmsbuffer.idl \ wmsdk.h \ wmsdkidl.idl \ + wmsecure.idl \ wnaspi32.h \ wownt16.h \ wownt32.h \ diff --git a/include/wmsecure.idl b/include/wmsecure.idl new file mode 100644 index 00000000000..f8d731a05ba --- /dev/null +++ b/include/wmsecure.idl @@ -0,0 +1,62 @@ +/* + * Copyright 2021 Zebediah Figura 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 "oaidl.idl"; +import "ocidl.idl"; + +[ + object, + local, + uuid(d9b67d36-a9ad-4eb4-baef-db284ef5504c), +] +interface IWMAuthorizer : IUnknown +{ + HRESULT GetCertCount(DWORD *count); + HRESULT GetCert(DWORD index, BYTE **data); + HRESULT GetSharedData(DWORD index, const BYTE *data, BYTE *cert, BYTE **ret_data); +} + +[ + object, + local, + uuid(2720598a-d0f2-4189-bd10-91c46ef0936f), +] +interface IWMSecureChannel : IWMAuthorizer +{ + HRESULT WMSC_AddCertificate(IWMAuthorizer *cert); + HRESULT WMSC_AddSignature(BYTE *signature, DWORD size); + HRESULT WMSC_Connect(IWMSecureChannel *peer); + HRESULT WMSC_IsConnected(BOOL *connected); + HRESULT WMSC_Disconnect(); + HRESULT WMSC_GetValidCertificate(BYTE **cert, DWORD *signature); + HRESULT WMSC_Encrypt(BYTE *data, DWORD size); + HRESULT WMSC_Decrypt(BYTE *data, DWORD size); + HRESULT WMSC_Lock(); + HRESULT WMSC_Unlock(); + HRESULT WMSC_SetSharedData(DWORD index, BYTE *data); +} + +[ + object, + local, + uuid(94bc0598-c3d2-11d3-bedf-00c04f612986), +] +interface IWMGetSecureChannel : IUnknown +{ + HRESULT GetPeerSecureChannelInterface(IWMSecureChannel **channel); +}

1 0

Zebediah Figura : include: Fix the type of the "output" parameter of IWMReaderAllocatorEx::AllocateForOutputEx().
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: c96cb78acc50feb39df9281b66bba5d36ea44fc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c96cb78acc50feb39df9281b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 15 17:28:05 2021 -0500 include: Fix the type of the "output" parameter of IWMReaderAllocatorEx::AllocateForOutputEx(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 716abe056db..945a8faaca4 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1082,7 +1082,7 @@ interface IWMReaderAllocatorEx : IUnknown [in] void *pvContext); HRESULT AllocateForOutputEx( - [in] WORD wOutputNum, + [in] DWORD output, [in] DWORD cbBuffer, [out] INSSBuffer **ppBuffer, [in] DWORD dwFlags,

1 0

Zebediah Figura : kernel32/tests: Add a couple of tests for error handling when reading past EOF.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 80b35103dfce2f5466e3a6208a5e2c4db40e7809 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80b35103dfce2f5466e3a620… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 15 17:26:46 2021 -0500 kernel32/tests: Add a couple of tests for error handling when reading past EOF. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index ea0a32f258d..b4c7adacf7e 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5927,6 +5927,7 @@ static void test_move_file(void) static void test_eof(void) { char temp_path[MAX_PATH], filename[MAX_PATH], buffer[20]; + OVERLAPPED overlapped = {0}; LARGE_INTEGER file_size; HANDLE file, mapping; unsigned int i; @@ -5961,9 +5962,25 @@ static void test_eof(void) ok(ret, "failed to get size, error %u\n", GetLastError()); ok(!file_size.QuadPart, "got size %I64d\n", file_size.QuadPart); + SetLastError(0xdeadbeef); ret = ReadFile(file, buffer, sizeof(buffer), &size, NULL); ok(ret, "failed to read, error %u\n", GetLastError()); ok(!size, "got size %u\n", size); + ok(GetLastError() == 0xdeadbeef, "got error %u\n", GetLastError()); + + SetFilePointer(file, 2, NULL, SEEK_SET); + + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + overlapped.Offset = 2; + ret = ReadFile(file, buffer, sizeof(buffer), &size, &overlapped); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_HANDLE_EOF, "got error %u\n", GetLastError()); + ok(!size, "got size %u\n", size); + todo_wine ok((NTSTATUS)overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + ok(!overlapped.InternalHigh, "got size %Iu\n", overlapped.InternalHigh); + + SetFilePointer(file, 2, NULL, SEEK_SET); ret = SetEndOfFile(file); ok(ret, "failed to set EOF, error %u\n", GetLastError());

1 0

Conor McCarthy : vkd3d: Enable EXT_shader_stencil_export if available.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: vkd3d Branch: master Commit: 53a7ba4a3ac7c306677917aaab2878a3a70f456a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=53a7ba4a3ac7c306677917a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 18 18:28:13 2021 +0200 vkd3d: Enable EXT_shader_stencil_export if available. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 8 +++++++- libs/vkd3d/vkd3d_private.h | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 320a759..96ff7ae 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -134,6 +134,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = VK_EXTENSION(EXT_DEPTH_CLIP_ENABLE, EXT_depth_clip_enable), VK_EXTENSION(EXT_DESCRIPTOR_INDEXING, EXT_descriptor_indexing), VK_EXTENSION(EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION, EXT_shader_demote_to_helper_invocation), + VK_EXTENSION(EXT_SHADER_STENCIL_EXPORT, EXT_shader_stencil_export), VK_EXTENSION(EXT_TEXEL_BUFFER_ALIGNMENT, EXT_texel_buffer_alignment), VK_EXTENSION(EXT_TRANSFORM_FEEDBACK, EXT_transform_feedback), VK_EXTENSION(EXT_VERTEX_ATTRIBUTE_DIVISOR, EXT_vertex_attribute_divisor), @@ -1329,7 +1330,6 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, else device->feature_options.ResourceBindingTier = D3D12_RESOURCE_BINDING_TIER_3; - device->feature_options.PSSpecifiedStencilRefSupported = FALSE; device->feature_options.TypedUAVLoadAdditionalFormats = features->shaderStorageImageExtendedFormats; /* GL_INTEL_fragment_shader_ordering, no Vulkan equivalent. */ device->feature_options.ROVsSupported = FALSE; @@ -1441,6 +1441,8 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vkd3d_free(vk_extensions); + device->feature_options.PSSpecifiedStencilRefSupported = vulkan_info->EXT_shader_stencil_export; + vkd3d_init_feature_level(vulkan_info, features, &device->feature_options); if (vulkan_info->max_feature_level < create_info->minimum_feature_level) { @@ -1461,6 +1463,10 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->shader_extensions[vulkan_info->shader_extension_count++] = VKD3D_SHADER_SPIRV_EXTENSION_EXT_DESCRIPTOR_INDEXING; + if (vulkan_info->EXT_shader_stencil_export) + vulkan_info->shader_extensions[vulkan_info->shader_extension_count++] + = VKD3D_SHADER_SPIRV_EXTENSION_EXT_STENCIL_EXPORT; + /* Disable unused Vulkan features. */ features->shaderTessellationAndGeometryPointSize = VK_FALSE; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 50d3a33..23af9e3 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -51,7 +51,7 @@ #define VKD3D_MAX_COMPATIBLE_FORMAT_COUNT 6u #define VKD3D_MAX_QUEUE_FAMILY_COUNT 3u -#define VKD3D_MAX_SHADER_EXTENSIONS 2u +#define VKD3D_MAX_SHADER_EXTENSIONS 3u #define VKD3D_MAX_SHADER_STAGES 5u #define VKD3D_MAX_VK_SYNC_OBJECTS 4u #define VKD3D_MAX_DESCRIPTOR_SETS 64u @@ -108,6 +108,7 @@ struct vkd3d_vulkan_info bool EXT_depth_clip_enable; bool EXT_descriptor_indexing; bool EXT_shader_demote_to_helper_invocation; + bool EXT_shader_stencil_export; bool EXT_texel_buffer_alignment; bool EXT_transform_feedback; bool EXT_vertex_attribute_divisor;

1 0

Conor McCarthy : vkd3d-shader/spirv: Implement support for stencil export.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: vkd3d Branch: master Commit: 4a2fbe54c057de804b1493c09474166602138540 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4a2fbe54c057de804b1493c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 18 18:28:12 2021 +0200 vkd3d-shader/spirv: Implement support for stencil export. Based on a vkd3d-proton patch by Philip Rebohle. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 1 + libs/vkd3d-shader/dxbc.c | 3 +++ libs/vkd3d-shader/sm4.h | 1 + libs/vkd3d-shader/spirv.c | 20 ++++++++++++++++++++ libs/vkd3d-shader/trace.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 6 files changed, 31 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 3ba84a5..4a51b3f 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -651,6 +651,7 @@ enum vkd3d_shader_spirv_extension VKD3D_SHADER_SPIRV_EXTENSION_NONE, VKD3D_SHADER_SPIRV_EXTENSION_EXT_DEMOTE_TO_HELPER_INVOCATION, VKD3D_SHADER_SPIRV_EXTENSION_EXT_DESCRIPTOR_INDEXING, + VKD3D_SHADER_SPIRV_EXTENSION_EXT_STENCIL_EXPORT, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SPIRV_EXTENSION), }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 44e842d..b83e265 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -885,6 +885,8 @@ static const enum vkd3d_shader_register_type register_type_table[] = /* VKD3D_SM5_RT_GS_INSTANCE_ID */ VKD3DSPR_GSINSTID, /* VKD3D_SM5_RT_DEPTHOUT_GREATER_EQUAL */ VKD3DSPR_DEPTHOUTGE, /* VKD3D_SM5_RT_DEPTHOUT_LESS_EQUAL */ VKD3DSPR_DEPTHOUTLE, + /* VKD3D_SM5_RT_CYCLE_COUNTER */ ~0u, + /* VKD3D_SM5_RT_OUTPUT_STENCIL_REF */ VKD3DSPR_OUTSTENCILREF, }; static const enum vkd3d_shader_register_precision register_precision_table[] = @@ -1252,6 +1254,7 @@ static bool shader_sm4_is_scalar_register(const struct vkd3d_shader_register *re case VKD3DSPR_OUTPOINTID: case VKD3DSPR_PRIMID: case VKD3DSPR_SAMPLEMASK: + case VKD3DSPR_OUTSTENCILREF: return true; default: return false; diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index 3ac41cb..ddcb9a8 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -397,6 +397,7 @@ enum vkd3d_sm4_register_type VKD3D_SM5_RT_GS_INSTANCE_ID = 0x25, VKD3D_SM5_RT_DEPTHOUT_GREATER_EQUAL = 0x26, VKD3D_SM5_RT_DEPTHOUT_LESS_EQUAL = 0x27, + VKD3D_SM5_RT_OUTPUT_STENCIL_REF = 0x29, }; enum vkd3d_sm4_extended_operand_type diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6cf438d..9f6eb88 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1841,6 +1841,8 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageImageArrayDynamicIndexing) || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityShaderNonUniformEXT)) vkd3d_spirv_build_op_extension(&stream, "SPV_EXT_descriptor_indexing"); + if (vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStencilExportEXT)) + vkd3d_spirv_build_op_extension(&stream, "SPV_EXT_shader_stencil_export"); if (builder->ext_instr_set_glsl_450) vkd3d_spirv_build_op_ext_inst_import(&stream, builder->ext_instr_set_glsl_450, "GLSL.std.450"); @@ -2903,6 +2905,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_PRIMID: /* SPIRV-Tools disassembler generates names for SPIR-V built-ins. */ return false; + case VKD3DSPR_OUTSTENCILREF: + snprintf(buffer, buffer_size, "oStencilRef"); + break; default: FIXME("Unhandled register %#x.\n", reg->type); snprintf(buffer, buffer_size, "unrecognized_%#x", reg->type); @@ -4111,6 +4116,8 @@ vkd3d_register_builtins[] = {VKD3DSPR_DEPTHOUT, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInFragDepth}}, {VKD3DSPR_DEPTHOUTGE, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInFragDepth}}, {VKD3DSPR_DEPTHOUTLE, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInFragDepth}}, + + {VKD3DSPR_OUTSTENCILREF, {VKD3D_SHADER_COMPONENT_UINT, 1, SpvBuiltInFragStencilRefEXT}}, }; static void vkd3d_dxbc_compiler_emit_register_execution_mode(struct vkd3d_dxbc_compiler *compiler, @@ -4124,6 +4131,18 @@ static void vkd3d_dxbc_compiler_emit_register_execution_mode(struct vkd3d_dxbc_c case VKD3DSPR_DEPTHOUTLE: vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeDepthLess, NULL, 0); break; + case VKD3DSPR_OUTSTENCILREF: + if (!vkd3d_dxbc_compiler_is_target_extension_supported(compiler, + VKD3D_SHADER_SPIRV_EXTENSION_EXT_STENCIL_EXPORT)) + { + FIXME("The target environment does not support stencil export.\n"); + vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_STENCIL_EXPORT_UNSUPPORTED, + "Cannot export stencil reference value for register id %u. " + "The target environment does not support stencil export.", reg->idx[0].offset); + } + vkd3d_spirv_enable_capability(&compiler->spirv_builder, SpvCapabilityStencilExportEXT); + vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeStencilRefReplacingEXT, NULL, 0); + break; default: return; } @@ -4885,6 +4904,7 @@ static void vkd3d_dxbc_compiler_emit_output_register(struct vkd3d_dxbc_compiler reg_symbol.info.reg.dcl_mask = write_mask; reg_symbol.info.reg.is_aggregate = builtin->spirv_array_size; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); + vkd3d_dxbc_compiler_emit_register_execution_mode(compiler, reg); vkd3d_dxbc_compiler_emit_register_debug_name(builder, output_id, reg); } diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index edba0b4..1250503 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1027,6 +1027,10 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const shader_addline(buffer, "vGSInstanceID"); break; + case VKD3DSPR_OUTSTENCILREF: + shader_addline(buffer, "oStencilRef"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index cacba30..62073cf 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -76,6 +76,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE = 2001, VKD3D_SHADER_ERROR_SPV_INVALID_DESCRIPTOR_BINDING = 2002, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_IDX_UNSUPPORTED = 2003, + VKD3D_SHADER_ERROR_SPV_STENCIL_EXPORT_UNSUPPORTED = 2004, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY = 3000, VKD3D_SHADER_ERROR_RS_INVALID_VERSION = 3001, @@ -444,6 +445,7 @@ enum vkd3d_shader_register_type VKD3DSPR_DEPTHOUTGE, VKD3DSPR_DEPTHOUTLE, VKD3DSPR_RASTERIZER, + VKD3DSPR_OUTSTENCILREF, VKD3DSPR_INVALID = ~0u, };

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021