- Wine-Devel - list.winehq.org

[PATCH vkd3d 4/4] Release 1.4.
by Henri Verbeet June 22, 2022

June 22, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- ANNOUNCE | 170 +++++++++------------------- AUTHORS | 2 + Makefile.am | 6 +- configure.ac | 2 +- demos/demo_xcb.h | 2 +- include/vkd3d.h | 1 + include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-utils/vkd3d_utils_main.c | 4 +- libs/vkd3d/state.c | 4 +- programs/vkd3d-compiler/main.c | 2 +- 11 files changed, 70 insertions(+), 126 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 163e24d9..8a80ea4e 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,16 +1,17 @@ -The Wine team is proud to announce that release 1.3 of vkd3d, the Direct3D to +The Wine team is proud to announce that release 1.4 of vkd3d, the Direct3D to Vulkan translation library, is now available. This release contains improvements that are listed in the release notes below. The main highlights are: - - Initial HLSL compilation support. - - Shader model 5.1 descriptor array support. - - Support for disassembling Direct3D shaders. + - Many improvements to the HLSL compiler. + - A new descriptor heap implementation using the VK_EXT_descriptor_indexing + extension. + - A new fence implementation using the VK_KHR_timeline_semaphore extension. The source is available from the following location: - https://dl.winehq.org/vkd3d/source/vkd3d-1.3.tar.xz + https://dl.winehq.org/vkd3d/source/vkd3d-1.4.tar.xz The current source can also be pulled directly from the git repository: @@ -21,136 +22,75 @@ for the complete list. ---------------------------------------------------------------- -What's new in vkd3d 1.3 +What's new in vkd3d 1.4 ======================= *** libvkd3d -- Newly implemented Direct3D 12 features: - - Root signature support for unbounded descriptor tables. - - Unordered-access view counters in pixel shaders. These were previously - only supported in compute shaders. - - Output merger logical operations. - - Retrieving CPU/GPU timestamp calibration values. This requires support for - the VK_EXT_calibrated_timestamps extension. - - The `mirror_once' texture addressing mode. This requires support for the - VK_KHR_sampler_mirror_clamp_to_edge extension. +- A new descriptor heap implementation using the VK_EXT_descriptor_indexing + extension. In particular, the new implementation is more efficient when + large descriptor heaps are used by multiple command lists. The new + `virtual_heaps' configuration option can be used to select the original + implementation even when the VK_EXT_descriptor_indexing extension is + available. -- New interfaces: - - The vkd3d_host_time_domain_info structure extends the - vkd3d_instance_create_info structure, and can be used to specify how to - convert between timestamps and tick counts. If left unspecified, a tick - is assumed to take 100 nanoseconds. +- A new fence implementation using the VK_KHR_timeline_semaphore extension. + The new implementation addresses a number of edge cases the original + implementation was unable to, as well as being somewhat more efficient. + +- When the VK_EXT_robustness2 extension is available, it is used to implement + null views. This more accurately matches Direct3D 12 behaviour. For example, + all reads from such a null view return zeroes, while that isn't necessarily + the case for out-of-bounds reads with the original implementation. -- Various bug fixes. +- New interfaces: + - vkd3d_set_log_callback() allows writing log output via a custom callback. + This can be used to integrate vkd3d's log output with other logging + systems. *** libvkd3d-shader -- New features: - - Initial support for HLSL compilation and preprocessing. This is an ongoing - effort; although support for many features is already implemented, support - for many more isn't yet. - - Support for disassembling Direct3D byte-code shaders to Direct3D assembly. - - Support for parsing the legacy Direct3D byte-code format used by Direct3D - shader model 1, 2, and 3 shaders. In the current vkd3d-shader release, - only Direct3D assembly is supported as a target for these; we intend to - support SPIR-V as a target in a future release. - -- New features for the SPIR-V target: - - Support for various aspects of Direct3D shader model 5.1 descriptor - arrays, including unbounded descriptor arrays, UAV counter arrays, dynamic - indexing of descriptor arrays, and non-uniform indexing of descriptor - arrays. With the exception of some special cases, this requires support - for the SPV_EXT_descriptor_indexing extension in the target environment. - - Support for double precision floating-point operations. - - Support for indirect addressing of tessellation control shader inputs. - - Stencil export. I.e., writing stencil values from shaders. This requires - support for the SPV_EXT_shader_stencil_export extension in the target - environment. - - Support for the Direct3D shader model 4+ `precise' modifier. - - Support for Direct3D shader model 4+ global resource memory barriers. - -New interfaces: - - vkd3d_shader_preprocess() provides support for preprocessing shaders. - - The vkd3d_shader_preprocess_info structure extends the - vkd3d_shader_compile_info structure, and can be used to specify - preprocessing parameters like preprocessor macro definitions. - - The vkd3d_shader_hlsl_source_info structure extends the - vkd3d_shader_compile_info structure, and can be used to specify HLSL - compilation parameters like the target profile and entry point. - - The vkd3d_shader_descriptor_offset_info structure extends the - vkd3d_shader_interface_info structure, and can be used to specify offsets - into descriptor arrays referenced by shader interface bindings. This - allows mapping multiple descriptor arrays in a shader to a single binding - point in the target environment, and helps with mapping between the - Direct3D 12 and Vulkan binding models. - - The VKD3D_SHADER_COMPILE_OPTION_API_VERSION compile option can - be used to specify the version of the libvkd3d-shader API the - application is targeting. If left unspecified, - VKD3D_SHADER_API_VERSION_1_2 will be used. - -- Various shader translation fixes, for tessellation shaders in particular. - - -*** vkd3d-compiler - -- New source and target types: - - The `hlsl' source type specifies High Level Shader Language source code. - - The `d3d-asm' target type specifies Direct3D assembly shaders. - - The `d3dbc' format specifies legacy Direct3D byte-code, which is used for - Direct3D shader model 1, 2, and 3 shaders. - - The existing `dxbc-tpf' format can now also be used as a target format. - -- New command line options: - - `-E' can be used to specify the input should only be preprocessed. - - `-e'/`--entry' can be used to specify the entry point for HLSL and/or - SPIR-V shaders. - - `-p'/`--profile' can be used to specify the target profile for HLSL - shaders. - -- When no source type is explicitly specified, vkd3d-compiler will attempt to - determine the source type from the provided input. Note that this is - intended as a convenience for interactive usage only, and the heuristics - used are subject to future change. Non-interactive usage of vkd3d-compiler, - for example in build scripts, should always explicitly specify source and - target types. - -- When no target type is explicitly specified, a default will be chosen based - on the source type. Like the earlier mentioned source type detection, this - is intended for interactive usage only. - -- vkd3d-compiler will default to colour output if it can determine that the - output is a colour-capable teleprinter. - -- New environment variables: - - NO_COLOUR/NO_COLOR can be used to disable default colour output. - See the README for more detailed descriptions and how to use these. +- New features for the HLSL source type: + - Support for integer arithmetic, bitwise and shift operations. + - Support for matrix and vector subscripting. + - Support for the mul() intrinsic function. + - Support for matrix copying, casting, and entry-wise operations. + - Support for complex initialisers. + - Support for the `nointerpolation' modifier. This modifier is applied by + default to integer variables. + - Support for the SV_VertexID semantic. + - Support for matrix-typed varyings. + - Constant folding for a number of operators. + - Copy propagation across branches and loops. This allows use of non-numeric + variables anywhere in a program, as well as more optimised code for + accessing numeric variables within branches and loops. + +- The disassembler supports the shader model 5 `msad' instruction. + +- New interfaces: + - vkd3d_shader_set_log_callback() allows writing log output via a custom + callback. *** libvkd3d-utils - New interfaces: - - D3DCreateBlob() provides support for creating ID3DBlob objects. - - D3DPreprocess() provides support for preprocessing HLSL source code. - - D3DCompile() and D3DCompile2() provide support for compiling HLSL source - code. + - vkd3d_utils_set_log_callback() allows writing log output via a custom + callback. *** build -- The `gears' and `triangle' demo applications are installed as `vkd3d-gears' - and `vkd3d-triangle'. These were originally intended more as documentation - than as end-user executables, but there's some value in using them for - diagnostic purposes, much like e.g. `glxgears'. - -- The VULKAN_LIBS configure variable is used when detecting the Vulkan - library. +- The minimum required version of Vulkan-Headers and SPIRV-Headers for this + release is version 1.2.139. -- Builds for the Microsoft Windows target platform no longer require support - for POSIX threads. Windows synchronisation primitives are used instead. +- The SONAME_LIBVULKAN configure variable can be used to specify the shared + object name of the Vulkan library. Because vkd3d loads the Vulkan library + dynamically, specifying this removes the need for a Vulkan import library at + build time. -- If ncurses is available, it will be use by vkd3d-compiler to determine the - capabilities of the connected teleprinter, if any. +- The `crosstests' target no longer builds Win32/PE demos or tests when these + were not enabled at configure time. diff --git a/AUTHORS b/AUTHORS index bc2e08f6..18a8b207 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,8 +5,10 @@ Atharva Nimbalkar Biswapriyo Nath Chip Davis Conor McCarthy +David Gow Derek Lesho Francisco Casas +Francois Gouget Giovanni Mascellani Hans-Kristian Arntzen Henri Verbeet diff --git a/Makefile.am b/Makefile.am index fe8133a5..ad6a0a41 100644 --- a/Makefile.am +++ b/Makefile.am @@ -237,7 +237,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SHADER_SOURCE -I$(srcdir)/libs/vkd3d-shader @SPIRV_TOOLS_CFLAGS@ -libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1 +libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 3:0:2 libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ -lm if HAVE_LD_VERSION_SCRIPT libvkd3d_shader_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map @@ -271,7 +271,7 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_shaders.h \ libs/vkd3d/vulkan_procs.h libvkd3d_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SOURCE -libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:0:3 +libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 5:0:4 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map @@ -283,7 +283,7 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h libvkd3d_utils_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_UTILS_SOURCE -libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 3:0:2 +libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:0:3 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la libvkd3d.la @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map diff --git a/configure.ac b/configure.ac index 7796ae8d..423b3e76 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([vkd3d],[1.3]) +AC_INIT([vkd3d],[1.4]) AC_CONFIG_AUX_DIR([bin]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index bb43d8a4..e4d6145c 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -19,7 +19,7 @@ #define VK_NO_PROTOTYPES #define VK_USE_PLATFORM_XCB_KHR -#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_3 +#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_4 #include "config.h" #include <vkd3d.h> #include <vkd3d_utils.h> diff --git a/include/vkd3d.h b/include/vkd3d.h index f3c3fdc6..8aeb4c18 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -60,6 +60,7 @@ enum vkd3d_api_version VKD3D_API_VERSION_1_1, VKD3D_API_VERSION_1_2, VKD3D_API_VERSION_1_3, + VKD3D_API_VERSION_1_4, }; typedef HRESULT (*PFN_vkd3d_signal_event)(HANDLE event); diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1e5a332e..ebddbba7 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -45,6 +45,7 @@ enum vkd3d_shader_api_version VKD3D_SHADER_API_VERSION_1_1, VKD3D_SHADER_API_VERSION_1_2, VKD3D_SHADER_API_VERSION_1_3, + VKD3D_SHADER_API_VERSION_1_4, }; /** The type of a chained structure. */ diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d361b8a6..776533cb 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -206,7 +206,7 @@ static enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval(enum vkd3d_ #define VKD3D_SPIRV_VERSION 0x00010000 #define VKD3D_SPIRV_GENERATOR_ID 18 -#define VKD3D_SPIRV_GENERATOR_VERSION 3 +#define VKD3D_SPIRV_GENERATOR_VERSION 4 #define VKD3D_SPIRV_GENERATOR_MAGIC vkd3d_make_u32(VKD3D_SPIRV_GENERATOR_VERSION, VKD3D_SPIRV_GENERATOR_ID) struct vkd3d_spirv_stream diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 64418893..f5e1e0e7 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -210,7 +210,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen option = &options[0]; option->name = VKD3D_SHADER_COMPILE_OPTION_API_VERSION; - option->value = VKD3D_SHADER_API_VERSION_1_3; + option->value = VKD3D_SHADER_API_VERSION_1_4; compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; compile_info.next = &preprocess_info; @@ -315,7 +315,7 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename static const struct vkd3d_shader_compile_option options[] = { - {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_4}, }; TRACE("data %p, size %lu, filename %s, macros %p, include %p, preprocessed_blob %p, messages_blob %p.\n", diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 97e2856d..7a29ade8 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1957,7 +1957,7 @@ static HRESULT create_shader_stage(struct d3d12_device *device, static const struct vkd3d_shader_compile_option options[] = { - {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_4}, }; stage_desc->sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO; @@ -2008,7 +2008,7 @@ static int vkd3d_scan_dxbc(const D3D12_SHADER_BYTECODE *code, static const struct vkd3d_shader_compile_option options[] = { - {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_4}, }; compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 9cb90cd5..2347bee0 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -726,7 +726,7 @@ int main(int argc, char **argv) if (!options.explicit_colour && !getenv("NO_COLOUR") && !getenv("NO_COLOR") && has_colour(output)) options.formatting |= VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR; add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, options.formatting); - add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3); + add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_4); info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = &hlsl_source_info; -- 2.20.1

2 1

[PATCH vkd3d 1/4] vkd3d-compiler: Default to VKD3D_SHADER_SOURCE_HLSL when the source size is smaller than a uint32_t.
by Henri Verbeet June 22, 2022

June 22, 2022

For example, when the input is an empty file. Leaving the source type as VKD3D_SHADER_SOURCE_NONE would cause (potential) subsequent get_source_type_info() calls to return NULL, resulting in a segmentation fault. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index ab475617..9cb90cd5 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -663,11 +663,11 @@ int main(int argc, char **argv) { uint32_t token; - if (options.preprocess_only) + if (options.preprocess_only || info.source.size < sizeof(token)) { options.source_type = VKD3D_SHADER_SOURCE_HLSL; } - else if (info.source.size >= sizeof(token)) + else { memcpy(&token, info.source.code, sizeof(token)); if (token == TAG_DXBC) -- 2.20.1

2 1

[PATCH vkd3d 3/4] build: Add tests/vulkan_procs.h to the distribution.
by Henri Verbeet June 22, 2022

June 22, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 0f10a56f..fe8133a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -144,7 +144,8 @@ vkd3d_test_headers = \ tests/d3d12_crosstest.h \ tests/d3d12_test_utils.h \ tests/shader_runner.h \ - tests/utils.h + tests/utils.h \ + tests/vulkan_procs.h vkd3d_demos = \ demos/vkd3d-gears \ -- 2.20.1

1 0

[PATCH vkd3d 2/4] build: Add the d3d9 and d3d11 shader runners to the distribution.
by Henri Verbeet June 22, 2022

June 22, 2022

We don't want to add these to tests_shader_runner_SOURCES, because they're only supposed to get built for the "crosstest" target. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index bdbf8e40..0f10a56f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -404,6 +404,7 @@ cross_implibs = crosslibs/d3d12 CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=0 EXTRA_DIST += $(cross_implibs:=.cross32.def) $(cross_implibs:=.cross64.def) +EXTRA_DIST += tests/shader_runner_d3d11.c tests/shader_runner_d3d9.c shader_runner_cross_sources = \ $(srcdir)/tests/shader_runner.c \ -- 2.20.1

1 0

[PATCH v2 0/2] MR132: opengl32: Don't prioritize low bit depth formats with non-matching stencil.
by Paul Gofman (＠gofman) June 22, 2022

June 22, 2022

Fixes ClaDun X2 missing rendering parts on AMD. The GL game uses stencil and requests pixel format with depth 16, stencil 8. On Wine / AMD that ends up with 16x0 format as there is no 16x8 advertised (16x0 only) and depth takes absolute priority. On the same Windows machine I see both 16x0 and 16x8 formats, but when 16x8 is requested 24x8 is returned (and 16x0 if 16x0 is requested). That currently works under Wine / Nvidia because there is no 16 bit depth formats advertised at all and it ends up with 24x8 without this patch. -- v2: opengl32/tests: Add more tests for ChoosePixelFormat(). opengl32: Prioritize stencil check over depth check in wglChoosePixelFormat(). https://gitlab.winehq.org/wine/wine/-/merge_requests/132

3 5

[PATCH 1/5] d2d1/tests: Add tests for system property name, type, value size.
by Ziqing Hui June 22, 2022

June 22, 2022

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- PS: I'll submit v2 version of the patch set I sent yesterday after this patch set is approved. dlls/d2d1/tests/d2d1.c | 77 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 74 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f1cec1d7a0b..68d2716a118 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10310,19 +10310,21 @@ static void test_mt_factory(BOOL d3d11) ID2D1Factory_Release(factory); } -static void test_effect(BOOL d3d11) +static void test_builtin_effect(BOOL d3d11) { - unsigned int i, j, min_inputs, max_inputs, str_size, input_count; + unsigned int i, j, min_inputs, max_inputs, str_size, input_count, value_size; D2D1_BITMAP_PROPERTIES bitmap_desc; D2D1_BUFFER_PRECISION precision; ID2D1Image *image_a, *image_b; struct d2d1_test_context ctx; ID2D1DeviceContext *context; + D2D1_PROPERTY_TYPE type; ID2D1Factory1 *factory; ID2D1Bitmap *bitmap; ID2D1Effect *effect; D2D1_SIZE_U size; BYTE buffer[256]; + WCHAR name[32]; BOOL cached; CLSID clsid; HRESULT hr; @@ -10345,6 +10347,27 @@ static void test_effect(BOOL d3d11) {&CLSID_D2D1Grayscale, 3, 1, 1, 1}, }; + const struct property_test + { + UINT32 index; + const WCHAR *name; + D2D1_PROPERTY_TYPE type; + UINT32 value_size; + } + property_tests[] = + { + {D2D1_PROPERTY_CLSID, L"CLSID", D2D1_PROPERTY_TYPE_CLSID, sizeof(CLSID)}, + {D2D1_PROPERTY_DISPLAYNAME, L"DisplayName", D2D1_PROPERTY_TYPE_STRING, 0}, + {D2D1_PROPERTY_AUTHOR, L"Author", D2D1_PROPERTY_TYPE_STRING, 0}, + {D2D1_PROPERTY_CATEGORY, L"Category", D2D1_PROPERTY_TYPE_STRING, 0}, + {D2D1_PROPERTY_DESCRIPTION, L"Description", D2D1_PROPERTY_TYPE_STRING, 0}, + {D2D1_PROPERTY_INPUTS, L"Inputs", D2D1_PROPERTY_TYPE_ARRAY, sizeof(UINT32)}, + {D2D1_PROPERTY_CACHED, L"Cached", D2D1_PROPERTY_TYPE_BOOL, sizeof(UINT32)}, + {D2D1_PROPERTY_PRECISION, L"Precision", D2D1_PROPERTY_TYPE_ENUM, sizeof(UINT32)}, + {D2D1_PROPERTY_MIN_INPUTS, L"MinInputs", D2D1_PROPERTY_TYPE_UINT32, sizeof(UINT32)}, + {D2D1_PROPERTY_MAX_INPUTS, L"MaxInputs", D2D1_PROPERTY_TYPE_UINT32, sizeof(UINT32)}, + }; + if (!init_test_context(&ctx, d3d11)) return; @@ -10372,6 +10395,7 @@ static void test_effect(BOOL d3d11) hr = ID2D1DeviceContext_CreateEffect(context, test->clsid, &effect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + /* Test output image pointer */ hr = ID2D1Effect_QueryInterface(effect, &IID_ID2D1Image, (void **)&image_a); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID2D1Effect_GetOutput(effect, &image_b); @@ -10379,6 +10403,48 @@ static void test_effect(BOOL d3d11) ID2D1Image_Release(image_b); ID2D1Image_Release(image_a); + /* Test system property name, type, value size */ + for (j = 0; j < ARRAY_SIZE(property_tests); ++j) + { + const struct property_test *property_test = &property_tests[j]; + winetest_push_context("Property %u", j); + + name[0] = 0; + hr = ID2D1Effect_GetPropertyName(effect, 0xdeadbeef, name, sizeof(name)); + todo_wine ok(hr == D2DERR_INVALID_PROPERTY, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_GetPropertyName(effect, property_test->index, name, sizeof(name)); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + todo_wine ok(!wcscmp(name, property_test->name), "Got unexpected property name %s, expected %s.\n", + debugstr_w(name), debugstr_w(property_test->name)); + + type = ID2D1Effect_GetType(effect, 0xdeadbeef); + ok(type == D2D1_PROPERTY_TYPE_UNKNOWN, "Got unexpected property type %#x.\n", type); + type = ID2D1Effect_GetType(effect, property_test->index); + todo_wine ok(type == property_test->type, "Got unexpected property type %#x, expected %#x.\n", + type, property_test->type); + + value_size = ID2D1Effect_GetValueSize(effect, 0xdeadbeef); + ok(value_size == 0, "Got unexpected value size %u.\n", value_size); + value_size = ID2D1Effect_GetValueSize(effect, property_test->index); + if (property_test->value_size != 0) + { + todo_wine ok(value_size == property_test->value_size, "Got unexpected value size %u, expected %u.\n", + value_size, property_test->value_size); + } + else if (property_test->type == D2D1_PROPERTY_TYPE_STRING) + { + hr = ID2D1Effect_GetValue(effect, property_test->index, + D2D1_PROPERTY_TYPE_STRING, buffer, sizeof(buffer)); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + str_size = (wcslen((WCHAR *)buffer) + 1) * sizeof(WCHAR); + todo_wine ok(value_size == str_size, "Got unexpected value size %u, expected %u.\n", + value_size, str_size); + } + + winetest_pop_context(); + } + + /* Test GetValue() */ hr = ID2D1Effect_GetValue(effect, 0xdeadbeef, D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); ok(hr == D2DERR_INVALID_PROPERTY, "Got unexpected hr %#lx.\n", hr); @@ -10436,10 +10502,12 @@ static void test_effect(BOOL d3d11) ok(max_inputs == test->max_inputs, "Got unexpected max inputs %u, expected %u.\n", max_inputs, test->max_inputs); + /* Test default input count */ input_count = ID2D1Effect_GetInputCount(effect); ok(input_count == test->default_input_count, "Got unexpected input count %u, expected %u.\n", input_count, test->default_input_count); + /* Test SetInputCount() */ input_count = (test->max_inputs < 16 ? test->max_inputs : 16); for (j = 0; j < input_count + 4; ++j) { @@ -10452,6 +10520,7 @@ static void test_effect(BOOL d3d11) winetest_pop_context(); } + /* Test GetInput() before any input is set */ input_count = ID2D1Effect_GetInputCount(effect); for (j = 0; j < input_count + 4; ++j) { @@ -10461,6 +10530,7 @@ static void test_effect(BOOL d3d11) winetest_pop_context(); } + /* Test GetInput() after an input is set */ set_size_u(&size, 1, 1); bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; @@ -10487,6 +10557,7 @@ static void test_effect(BOOL d3d11) winetest_pop_context(); } + /* Test setting inputs with out-of-bounds index */ for (j = input_count; j < input_count + 4; ++j) { winetest_push_context("Input %u", j); @@ -12304,7 +12375,7 @@ START_TEST(d2d1) queue_test(test_effect_register); queue_test(test_effect_context); queue_test(test_effect_properties); - queue_test(test_effect); + queue_test(test_builtin_effect); queue_test(test_effect_2d_affine); queue_test(test_effect_crop); queue_test(test_effect_grayscale); -- 2.25.1

2 6

[PATCH 1/3] d2d1: Support registering builtin effect.
by Ziqing Hui June 22, 2022

June 22, 2022

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 44 +++++++++++++++++++++++-- dlls/d2d1/effect.c | 69 ++++++++++++++++++++++++++++++---------- dlls/d2d1/factory.c | 44 ++----------------------- 3 files changed, 96 insertions(+), 61 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 9be553c72d8..75a9c4f9366 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -20,6 +20,7 @@ #define __WINE_D2D1_PRIVATE_H #include "wine/debug.h" +#include "wine/list.h" #include <assert.h> #include <limits.h> @@ -61,6 +62,22 @@ struct d2d_settings }; extern struct d2d_settings d2d_settings DECLSPEC_HIDDEN; +struct d2d_factory +{ + ID2D1Factory3 ID2D1Factory3_iface; + ID2D1Multithread ID2D1Multithread_iface; + LONG refcount; + + ID3D10Device1 *device; + + float dpi_x; + float dpi_y; + + struct list effects; + + CRITICAL_SECTION cs; +}; + struct d2d_clip_stack { D2D1_RECT_F *stack; @@ -602,12 +619,30 @@ struct d2d_effect_context void d2d_effect_context_init(struct d2d_effect_context *effect_context, struct d2d_device_context *device_context) DECLSPEC_HIDDEN; -struct d2d_effect_info +struct d2d_effect_property { - const CLSID *clsid; + WCHAR *name; + D2D1_PROPERTY_TYPE type; + BYTE *value; + PD2D1_PROPERTY_SET_FUNCTION set_function; + PD2D1_PROPERTY_GET_FUNCTION get_function; +}; + +struct d2d_effect_registration +{ + struct list entry; + BOOL is_builtin; + PD2D1_EFFECT_FACTORY factory; + UINT32 registration_count; + CLSID id; + UINT32 default_input_count; UINT32 min_inputs; UINT32 max_inputs; + + struct d2d_effect_property *properties; + size_t property_size; + size_t property_count; }; struct d2d_effect @@ -616,7 +651,9 @@ struct d2d_effect ID2D1Image ID2D1Image_iface; LONG refcount; - const struct d2d_effect_info *info; + CLSID id; + UINT32 min_inputs; + UINT32 max_inputs; struct d2d_effect_context *effect_context; ID2D1Image **inputs; @@ -626,6 +663,7 @@ struct d2d_effect HRESULT d2d_effect_init(struct d2d_effect *effect, struct d2d_effect_context *effect_context, const CLSID *effect_id) DECLSPEC_HIDDEN; +HRESULT d2d_register_builtin_effects(struct d2d_factory *factory) DECLSPEC_HIDDEN; static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index f5d5494c67a..a87fedd0742 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -20,14 +20,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -static const struct d2d_effect_info builtin_effects[] = +struct d2d_builtin_effect_registration { - {&CLSID_D2D12DAffineTransform, 1, 1, 1}, - {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, - {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, - {&CLSID_D2D1Crop, 1, 1, 1}, - {&CLSID_D2D1Shadow, 1, 1, 1}, - {&CLSID_D2D1Grayscale, 1, 1, 1}, + const CLSID *id; + PD2D1_EFFECT_FACTORY factory; + UINT32 default_input_count; + UINT32 min_inputs; + UINT32 max_inputs; +}; + +static const struct d2d_builtin_effect_registration builtin_effects[] = +{ + {&CLSID_D2D12DAffineTransform, NULL, 1, 1, 1}, + {&CLSID_D2D13DPerspectiveTransform, NULL, 1, 1, 1}, + {&CLSID_D2D1Composite, NULL, 2, 1, 0xffffffff}, + {&CLSID_D2D1Crop, NULL, 1, 1, 1}, + {&CLSID_D2D1Shadow, NULL, 1, 1, 1}, + {&CLSID_D2D1Grayscale, NULL, 1, 1, 1}, }; static inline struct d2d_effect_context *impl_from_ID2D1EffectContext(ID2D1EffectContext *iface) @@ -554,21 +563,21 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_GetValue(ID2D1Effect *iface, UINT32 { case D2D1_PROPERTY_CLSID: if ((type != D2D1_PROPERTY_TYPE_UNKNOWN && type != D2D1_PROPERTY_TYPE_CLSID) - || value_size != sizeof(*effect->info->clsid)) + || value_size != sizeof(effect->id)) return E_INVALIDARG; - src = effect->info->clsid; + src = &effect->id; break; case D2D1_PROPERTY_MIN_INPUTS: if ((type != D2D1_PROPERTY_TYPE_UNKNOWN && type != D2D1_PROPERTY_TYPE_UINT32) - || value_size != sizeof(effect->info->min_inputs)) + || value_size != sizeof(effect->min_inputs)) return E_INVALIDARG; - src = &effect->info->min_inputs; + src = &effect->min_inputs; break; case D2D1_PROPERTY_MAX_INPUTS: if ((type != D2D1_PROPERTY_TYPE_UNKNOWN && type != D2D1_PROPERTY_TYPE_UINT32) - || value_size != sizeof(effect->info->max_inputs)) + || value_size != sizeof(effect->max_inputs)) return E_INVALIDARG; - src = &effect->info->max_inputs; + src = &effect->max_inputs; break; default: if (index < D2D1_PROPERTY_CLSID) @@ -619,7 +628,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_SetInputCount(ID2D1Effect *iface, UI TRACE("iface %p, count %u.\n", iface, count); - if (count < effect->info->min_inputs || count > effect->info->max_inputs) + if (count < effect->min_inputs || count > effect->max_inputs) return E_INVALIDARG; if (count == effect->input_count) return S_OK; @@ -760,10 +769,11 @@ HRESULT d2d_effect_init(struct d2d_effect *effect, struct d2d_effect_context *ef for (i = 0; i < ARRAY_SIZE(builtin_effects); ++i) { - if (IsEqualGUID(effect_id, builtin_effects[i].clsid)) + if (IsEqualGUID(effect_id, &builtin_effects[i].id)) { - effect->info = &builtin_effects[i]; - d2d_effect_SetInputCount(&effect->ID2D1Effect_iface, effect->info->default_input_count); + effect->min_inputs = builtin_effects[i].min_inputs; + effect->max_inputs = builtin_effects[i].max_inputs; + d2d_effect_SetInputCount(&effect->ID2D1Effect_iface, builtin_effects[i].default_input_count); effect->effect_context = effect_context; ID2D1EffectContext_AddRef(&effect_context->ID2D1EffectContext_iface); return S_OK; @@ -773,3 +783,28 @@ HRESULT d2d_effect_init(struct d2d_effect *effect, struct d2d_effect_context *ef WARN("Unsupported effect clsid %s.\n", debugstr_guid(effect_id)); return E_FAIL; } + +HRESULT d2d_register_builtin_effects(struct d2d_factory *factory) +{ + struct d2d_effect_registration *reg; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(builtin_effects); ++i) + { + const struct d2d_builtin_effect_registration *builtin_reg = &builtin_effects[i]; + + if (!(reg = calloc(1, sizeof(*reg)))) + return E_OUTOFMEMORY; + + reg->is_builtin = TRUE; + reg->factory = builtin_reg->factory; + reg->registration_count = 1; + reg->id = *builtin_reg->id; + reg->default_input_count = builtin_reg->default_input_count; + reg->min_inputs = builtin_reg->min_inputs; + reg->max_inputs = builtin_reg->max_inputs; + list_add_tail(&factory->effects, &reg->entry); + } + + return S_OK; +} diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 5c79d1791ff..7eec52c01a1 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -20,7 +20,6 @@ #include "d2d1_private.h" #include "xmllite.h" -#include "wine/list.h" WINE_DECLARE_DEBUG_CHANNEL(winediag); WINE_DEFAULT_DEBUG_CHANNEL(d2d); @@ -30,29 +29,6 @@ struct d2d_settings d2d_settings = ~0u, /* No ID2D1Factory version limit by default. */ }; -struct d2d_effect_property -{ - WCHAR *name; - D2D1_PROPERTY_TYPE type; - BYTE *value; - PD2D1_PROPERTY_SET_FUNCTION set_function; - PD2D1_PROPERTY_GET_FUNCTION get_function; -}; - -struct d2d_effect_registration -{ - struct list entry; - PD2D1_EFFECT_FACTORY factory; - UINT32 registration_count; - CLSID id; - - UINT32 input_count; - - struct d2d_effect_property *properties; - size_t property_size; - size_t property_count; -}; - static void d2d_effect_registration_cleanup(struct d2d_effect_registration *reg) { size_t i; @@ -66,22 +42,6 @@ static void d2d_effect_registration_cleanup(struct d2d_effect_registration *reg) free(reg); } -struct d2d_factory -{ - ID2D1Factory3 ID2D1Factory3_iface; - ID2D1Multithread ID2D1Multithread_iface; - LONG refcount; - - ID3D10Device1 *device; - - float dpi_x; - float dpi_y; - - struct list effects; - - CRITICAL_SECTION cs; -}; - static inline struct d2d_factory *impl_from_ID2D1Factory3(ID2D1Factory3 *iface) { return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory3_iface); @@ -916,6 +876,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Facto property->set_function = bindings[i].setFunction; } + effect->is_builtin = FALSE; effect->registration_count = 1; effect->id = *effect_id; effect->factory = effect_factory; @@ -960,7 +921,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_UnregisterEffect(ID2D1Factory3 *ifa LIST_FOR_EACH_ENTRY(effect, &factory->effects, struct d2d_effect_registration, entry) { - if (IsEqualGUID(effect_id, &effect->id)) + if (!effect->is_builtin && IsEqualGUID(effect_id, &effect->id)) { if (!--effect->registration_count) { @@ -1126,6 +1087,7 @@ static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE fact factory->refcount = 1; d2d_factory_reload_sysmetrics(factory); list_init(&factory->effects); + d2d_register_builtin_effects(factory); InitializeCriticalSection(&factory->cs); } -- 2.25.1

3 12

[PATCH v2 0/4] MR47: kernel32/tests: Add tests for CancelSynchronousIo.
by Daniel Lehman (＠dlehman25) June 22, 2022

June 22, 2022

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> -- v2: kernelbase: Call NtCancelSynchronousIoFile in CancelSynchronousIo. ntdll: Partially implement NtCancelSynchronousIoFile. ntdll: Add NtCancelSynchronousIoFile stub. kernel32/tests: Add tests for CancelSynchronousIo. https://gitlab.winehq.org/wine/wine/-/merge_requests/47

3 6

[PATCH 0/5] MR297: uxtheme: Support parsing more listview parts and states.
by Zhiyi Zhang (＠zhiyi) June 21, 2022

June 21, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/297

2 5

[PATCH v2 0/1] MR289: d3drm: Implement IDirect3DRMFrame2::SetSceneBackgroundImage
by Alistair Leslie-Hughes (＠alesliehughes) June 21, 2022

June 21, 2022

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v2: d3drm: Implement IDirect3DRMFrame{1/2/3}::SetSceneBackgroundImage https://gitlab.winehq.org/wine/wine/-/merge_requests/289

5 5