October 2021 - Wine-Commits

Huw Davies : wineps: Avoid using typeof().
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

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 Oct. 18, 2021

Oct. 18, 2021

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: Fix the type of the "output" parameter of IWMReaderAllocatorEx::AllocateForOutputEx().
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

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 Oct. 18, 2021

Oct. 18, 2021

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

Zebediah Figura : include: Add IWMIStreamProps.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

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 Oct. 18, 2021

Oct. 18, 2021

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

Alexandre Julliard : wininet: Use the bundled zlib.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 7f726ddd89bea1d35b07b0704f2d2ae2b315bf92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f726ddd89bea1d35b07b070… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 11:08:15 2021 +0200 wininet: Use the bundled zlib. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/Makefile.in | 4 +- dlls/wininet/http.c | 8 +- dlls/wininet/inflate.c | 1916 ---------------------------------------------- dlls/wininet/zlib.h | 162 ---- 4 files changed, 5 insertions(+), 2085 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f726ddd89bea1d35b07…

1 0

Zebediah Figura : include: Add IWMReaderCallbackAdvanced.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

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

Conor McCarthy : vkd3d: Enable EXT_shader_stencil_export if available.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

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 : tests: Add tests for output merger logic ops.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: vkd3d Branch: master Commit: 90d564f798ea95c95e681b4b53b4d0a5e92fed66 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=90d564f798ea95c95e681b4… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 18 18:28:09 2021 +0200 tests: Add tests for output merger logic ops. 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_d3d12.idl | 21 ++++++-- tests/d3d12.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 154 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 2d9aa1b..2d0800b 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1445,11 +1445,22 @@ typedef enum D3D12_BLEND_OP typedef enum D3D12_LOGIC_OP { - D3D12_LOGIC_OP_CLEAR = 0, - D3D12_LOGIC_OP_SET = 1, - D3D12_LOGIC_OP_COPY = 2, - D3D12_LOGIC_OP_COPY_INVERTED = 3, - D3D12_LOGIC_OP_NOOP = 4, + D3D12_LOGIC_OP_CLEAR = 0x0, + D3D12_LOGIC_OP_SET = 0x1, + D3D12_LOGIC_OP_COPY = 0x2, + D3D12_LOGIC_OP_COPY_INVERTED = 0x3, + D3D12_LOGIC_OP_NOOP = 0x4, + D3D12_LOGIC_OP_INVERT = 0x5, + D3D12_LOGIC_OP_AND = 0x6, + D3D12_LOGIC_OP_NAND = 0x7, + D3D12_LOGIC_OP_OR = 0x8, + D3D12_LOGIC_OP_NOR = 0x9, + D3D12_LOGIC_OP_XOR = 0xa, + D3D12_LOGIC_OP_EQUIV = 0xb, + D3D12_LOGIC_OP_AND_REVERSE = 0xc, + D3D12_LOGIC_OP_AND_INVERTED = 0xd, + D3D12_LOGIC_OP_OR_REVERSE = 0xe, + D3D12_LOGIC_OP_OR_INVERTED = 0xf, } D3D12_LOGIC_OP; typedef enum D3D12_COLOR_WRITE_ENABLE diff --git a/tests/d3d12.c b/tests/d3d12.c index 460445b..d538d40 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -599,6 +599,21 @@ static D3D12_RESOURCE_BINDING_TIER get_resource_binding_tier(ID3D12Device *devic return options.ResourceBindingTier; } +static bool is_output_merger_logic_op_supported(ID3D12Device *device) +{ + D3D12_FEATURE_DATA_D3D12_OPTIONS options; + HRESULT hr; + + if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device, + D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)))) + { + trace("Failed to check feature support, hr %#x.\n", hr); + return false; + } + + return options.OutputMergerLogicOp; +} + #define create_cb_root_signature(a, b, c, e) create_cb_root_signature_(__LINE__, a, b, c, e) static ID3D12RootSignature *create_cb_root_signature_(unsigned int line, ID3D12Device *device, unsigned int reg_idx, D3D12_SHADER_VISIBILITY shader_visibility, @@ -31033,6 +31048,128 @@ static void test_dual_source_blending(void) destroy_test_context(&context); } +static void test_output_merger_logic_op(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + ID3D12PipelineState *logic_pso; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + unsigned int i, do_test; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + uint4 c0; + + void main(const in float4 position : SV_Position, out uint4 target : SV_Target0) + { + target = c0; + } +#endif + 0x43425844, 0xb1d5d133, 0xbd9958bf, 0xe4a12856, 0x0197481b, 0x00000001, 0x000000e0, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050, + 0x00000011, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const uint32_t clear_values[] = {0xffffffff, 0x00000000, 0xffffffff, 0x00000000}; + static const uint32_t test_values[] = {0xffffffff, 0xffffffff, 0x00000000, 0x00000000}; + static const struct + { + D3D12_LOGIC_OP logic_op; + unsigned int expected_colour; + } + tests[] = + { + {D3D12_LOGIC_OP_CLEAR, 0x00000000}, + {D3D12_LOGIC_OP_SET, 0xffffffff}, + {D3D12_LOGIC_OP_COPY, 0x0000ffff}, + {D3D12_LOGIC_OP_COPY_INVERTED, 0xffff0000}, + {D3D12_LOGIC_OP_NOOP, 0x00ff00ff}, + {D3D12_LOGIC_OP_INVERT, 0xff00ff00}, + {D3D12_LOGIC_OP_AND, 0x000000ff}, + {D3D12_LOGIC_OP_NAND, 0xffffff00}, + {D3D12_LOGIC_OP_OR, 0x00ffffff}, + {D3D12_LOGIC_OP_NOR, 0xff000000}, + {D3D12_LOGIC_OP_XOR, 0x00ffff00}, + {D3D12_LOGIC_OP_EQUIV, 0xff0000ff}, + {D3D12_LOGIC_OP_AND_REVERSE, 0x0000ff00}, + {D3D12_LOGIC_OP_AND_INVERTED, 0x00ff0000}, + {D3D12_LOGIC_OP_OR_REVERSE, 0xff00ffff}, + {D3D12_LOGIC_OP_OR_INVERTED, 0xffff00ff}, + }; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + desc.ps = &ps; + desc.rt_format = DXGI_FORMAT_R8G8B8A8_UINT; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + if (!is_output_merger_logic_op_supported(context.device)) + { + skip("The device does not support output merger logic ops.\n"); + destroy_test_context(&context); + return; + } + + context.root_signature = create_32bit_constants_root_signature(context.device, + 0, ARRAY_SIZE(clear_values), D3D12_SHADER_VISIBILITY_PIXEL); + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, NULL, &ps, NULL); + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + pso_desc.BlendState.RenderTarget[0].LogicOpEnable = true; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + pso_desc.BlendState.RenderTarget[0].LogicOp = tests[i].logic_op; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, + &pso_desc, &IID_ID3D12PipelineState, (void **)&logic_pso); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (do_test = 0; do_test < 2; ++do_test) + { + vkd3d_test_set_context(do_test ? "Test %u" : "Clear %u", i); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, do_test ? logic_pso : context.pipeline_state); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, + 0, 4, do_test ? test_values : clear_values, 0); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + todo_if(do_test && tests[i].logic_op != D3D12_LOGIC_OP_COPY) + check_sub_resource_uint(context.render_target, 0, queue, command_list, + do_test ? tests[i].expected_colour : 0x00ff00ff, 1); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + ID3D12PipelineState_Release(logic_pso); + } + vkd3d_test_set_context(NULL); + + destroy_test_context(&context); +} + static void test_multisample_rendering(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -35414,6 +35551,7 @@ START_TEST(d3d12) run_test(test_command_list_initial_pipeline_state); run_test(test_blend_factor); run_test(test_dual_source_blending); + run_test(test_output_merger_logic_op); run_test(test_multisample_rendering); run_test(test_sample_mask); run_test(test_coverage);

1 0