March 2022 - Wine-Devel - list.winehq.org

[PATCH v2] ws2_32: Base inet_addr() implementation on musl.
by Paul Gofman March 2, 2022

March 2, 2022

The imported algorithm modified to match the tests. Fixes a regression introduced by commit 671cf16f773e5dafc7edbf7766aed9e52e4e7b56. Windows inet_addr() behaves basically the same as Unix inet_addr() which is different from inet_pton(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - add TRACE(); - formatting. dlls/ws2_32/protocol.c | 51 +++++++++++++++++++++-- dlls/ws2_32/tests/protocol.c | 80 ++++++++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 0f56b1604d8..3194fff93cd 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -1834,17 +1834,60 @@ int WINAPI WSAAddressToStringW( struct sockaddr *addr, DWORD addr_len, return 0; } - /*********************************************************************** * inet_addr (ws2_32.11) */ u_long WINAPI inet_addr( const char *str ) { + unsigned long a[4] = { 0 }; + const char *s = str; + unsigned char *d; + unsigned int i; u_long addr; + char *z; + + TRACE( "str %s.\n", debugstr_a(str) ); + + if (!s) + { + SetLastError( WSAEFAULT ); + return INADDR_NONE; + } + + d = (unsigned char *)&addr; + + if (s[0] == ' ' && !s[1]) return 0; - if (inet_pton( AF_INET, str, &addr ) == 1) - return addr; - return INADDR_NONE; + for (i = 0; i < 4; ++i) + { + a[i] = strtoul( s, &z, 0 ); + if (z == s || !isdigit( *s )) return INADDR_NONE; + if (!*z || *z == ' ') break; + if (*z != '.') return INADDR_NONE; + s = z + 1; + } + + if (i == 4) return INADDR_NONE; + + switch (i) { + case 0: + a[1] = a[0] & 0xffffff; + a[0] >>= 24; + /* fallthrough */ + case 1: + a[2] = a[1] & 0xffff; + a[1] >>= 16; + /* fallthrough */ + case 2: + a[3] = a[2] & 0xff; + a[2] >>= 8; + } + for (i = 0; i < 4; ++i) + { + if (a[i] > 255) return INADDR_NONE; + d[i] = a[i]; + } + return addr; } diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 374fa01789d..847c147b4fd 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -674,6 +674,85 @@ static void test_inet_ntoa(void) CloseHandle(thread); } +static void test_inet_addr(void) +{ + static const struct + { + const char *input; + u_long addr; + } + tests[] = + { + {"1.2.3.4", 0x04030201}, + {"1 2 3 4", 0x01000000}, + {"1.2.3. 4", 0xffffffff}, + {"1.2.3 .4", 0x03000201}, + {"1.2.3 \xfe\xff", 0x03000201}, + {"3.4.5.6.7", 0xffffffff}, + {"3.4.5.6. 7", 0xffffffff}, + {"3.4.5.6 7", 0x06050403}, + {" 3.4.5.6", 0xffffffff}, + {"\t3.4.5.6", 0xffffffff}, + {"3.4.5.6 ", 0x06050403}, + {"3.4.5.6 ", 0x06050403}, + {"3. 4.5.6", 0xffffffff}, + {"3 .4.5.6", 0x03000000}, + {"1.2.3", 0x03000201}, + {".1.2.3", 0xffffffff}, + {"0.0.0.0", 0x00000000}, + {"", 0xffffffff}, + {" 0", 0xffffffff}, + {"0xa1a2b3b4 ", 0xb4b3a2a1}, + {".", 0xffffffff}, + {" ", 0x00000000}, + {"\t", 0xffffffff}, + {" ", 0xffffffff}, + {"127.127.127.255", 0xff7f7f7f}, + {"127.127.127.255:123", 0xffffffff}, + {"127.127.127.256", 0xffffffff}, + {"a", 0xffffffff}, + {"1.2.3.0xaA", 0xaa030201}, + {"1.1.1.0x", 0xffffffff}, + {"1.2.3.010", 0x08030201}, + {"1.2.3.00", 0x00030201}, + {"1.2.3.0a", 0xffffffff}, + {"1.1.1.0o10", 0xffffffff}, + {"1.1.1.0b10", 0xffffffff}, + {"1.1.1.-2", 0xffffffff}, + {"1", 0x01000000}, + {"1.2", 0x02000001}, + {"1.2.3", 0x03000201}, + {"203569230", 0x4e38220c}, + {"[0.1.2.3]", 0xffffffff}, + {"0x00010203", 0x03020100}, + {"0x2134", 0x34210000}, + {"1234BEEF", 0xffffffff}, + {"017700000001", 0x0100007f}, + {"0777", 0xff010000}, + {"2607:f0d0:1002:51::4", 0xffffffff}, + {"::177.32.45.20", 0xffffffff}, + {"::1/128", 0xffffffff}, + {"::1", 0xffffffff}, + {":1", 0xffffffff}, + }; + unsigned int i; + u_long addr; + + WSASetLastError(0xdeadbeef); + addr = inet_addr(NULL); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + ok(addr == 0xffffffff, "got addr %#08x\n", addr); + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context( "Address %s, i %u", debugstr_a(tests[i].input), i ); + WSASetLastError(0xdeadbeef); + addr = inet_addr(tests[i].input); + ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); + ok(addr == tests[i].addr, "got addr %#08x\n", addr); + winetest_pop_context(); + } +} + static void test_inet_pton(void) { static const struct @@ -2871,6 +2950,7 @@ START_TEST( protocol ) test_WSALookupService(); test_inet_ntoa(); + test_inet_addr(); test_inet_pton(); test_addr_to_print(); test_WSAAddressToString(); -- 2.35.1

2 1

[PATCH vkd3d v3 8/8] vkd3d-shader/hlsl: Treat all braceless initializers as assignments.
by Francisco Casas March 2, 2022

March 2, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v3: - New in v3, split of vkd3d-shader/hlsl: vkd3d-shader/hlsl: Reroute initialization towards a generic variable initializer. - Using the 'braces' flag. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 91 +++++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c98e73f7..2a6feff5 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1498,61 +1498,66 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (v->initializer.args_count) { - unsigned int size = initializer_size(&v->initializer); - struct hlsl_ir_load *load; - - if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.braces - && type->dimx * type->dimy != size) + if (v->initializer.braces) { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, v->initializer.args_count); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + unsigned int size = initializer_size(&v->initializer); - if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) - && hlsl_type_component_count(type) != size) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + if (type->type <= HLSL_CLASS_LAST_NUMERIC && type->dimx * type->dimy != size) + { + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in numeric initializer, but got %u.", + type->dimx * type->dimy, v->initializer.args_count); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } - if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) - { - FIXME("Initializers for non scalar/struct variables not supported yet.\n"); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) + && hlsl_type_component_count(type) != size) + { + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; + if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) + { + FIXME("Initializers for non scalar/struct variables not supported yet.\n"); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + + if (type->type == HLSL_CLASS_STRUCT) + { + struct_var_initializer(ctx, statements_list, var, &v->initializer); + vkd3d_free(v); + continue; + } + else + { + hlsl_fixme(ctx, &v->loc, "Complex initializer."); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } } - if (v->initializer.args_count > 1) + else { - hlsl_fixme(ctx, &v->loc, "Complex initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + struct hlsl_ir_load *load = hlsl_new_var_load(ctx, var, var->loc); - load = hlsl_new_var_load(ctx, var, var->loc); - list_add_tail(v->initializer.instrs, &load->node.entry); - add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); - vkd3d_free(v->initializer.args); + assert(v->initializer.args_count == 1); + list_add_tail(v->initializer.instrs, &load->node.entry); + add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); + } if (modifiers & HLSL_STORAGE_STATIC) list_move_tail(&ctx->static_initializers, v->initializer.instrs); else list_move_tail(statements_list, v->initializer.instrs); + vkd3d_free(v->initializer.args); vkd3d_free(v->initializer.instrs); } vkd3d_free(v); -- 2.25.1

1 0

[PATCH vkd3d v3 6/8] vkd3d-shader/hlsl: Don't check exact number of components for braceless initialization of numeric types.
by Francisco Casas March 2, 2022

March 2, 2022

The implicit conversion in add_assignment() takes responsability now. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v3: - New patch, split of vkd3d-shader/hlsl: Support complex numeric initializers. - Using the 'braces' flag instead of 'v->initializer.args_count != 1' Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index e702c234..547a2ff4 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1501,19 +1501,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t unsigned int size = initializer_size(&v->initializer); struct hlsl_ir_load *load; - if (type->type <= HLSL_CLASS_LAST_NUMERIC - && type->dimx * type->dimy != size && size != 1) + if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.braces + && type->dimx * type->dimy != size) { - if (size < type->dimx * type->dimy) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in numeric initializer, but got %u.", + type->dimx * type->dimy, v->initializer.args_count); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; } + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) && hlsl_type_component_count(type) != size) { -- 2.25.1

1 0

[PATCH vkd3d v3 4/8] vkd3d-shader/hlsl: Add 'braces' flag to parse initializers.
by Francisco Casas March 2, 2022

March 2, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v3: - New in v3. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7678cf3c..6a59134e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -48,6 +48,7 @@ struct parse_initializer struct hlsl_ir_node **args; unsigned int args_count; struct list *instrs; + bool braces; }; struct parse_array_sizes @@ -3114,14 +3115,17 @@ complex_initializer: YYABORT; $$.args[0] = node_from_list($1); $$.instrs = $1; + $$.braces = false; } | '{' complex_initializer_list '}' { $$ = $2; + $$.braces = true; } | '{' complex_initializer_list ',' '}' { $$ = $2; + $$.braces = true; } complex_initializer_list: @@ -3148,6 +3152,7 @@ initializer_expr_list: YYABORT; $$.args[0] = node_from_list($1); $$.instrs = $1; + $$.braces = false; } | initializer_expr_list ',' initializer_expr { @@ -3277,6 +3282,7 @@ func_arguments: $$.args_count = 0; if (!($$.instrs = make_empty_list(ctx))) YYABORT; + $$.braces = false; } | initializer_expr_list -- 2.25.1

1 0

[PATCH vkd3d 7/7] Release 1.3.
by Henri Verbeet March 2, 2022

March 2, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- ANNOUNCE | 248 ++++++++++++++++---------------------- AUTHORS | 11 ++ COPYING | 2 +- Makefile.am | 6 +- configure.ac | 2 +- demos/demo_xcb.h | 2 +- include/vkd3d.h | 1 + libs/vkd3d-shader/spirv.c | 2 +- 8 files changed, 125 insertions(+), 149 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 01739d2d..29a627fc 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,17 +1,16 @@ -The Wine team is proud to announce that release 1.2 of vkd3d, the Direct3D to +The Wine team is proud to announce that release 1.3 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: - - Availability of libvkd3d-shader as a public library. - - Support for tessellation shaders. - - Version 1.1 root signatures. - - Stream output support. + - Initial HLSL compilation support. + - Shader model 5.1 descriptor array support. + - Support for disassembling Direct3D shaders. The source is available from the following location: - https://dl.winehq.org/vkd3d/source/vkd3d-1.2.tar.xz + https://dl.winehq.org/vkd3d/source/vkd3d-1.3.tar.xz The current source can also be pulled directly from the git repository: @@ -22,171 +21,136 @@ for the complete list. ---------------------------------------------------------------- -What's new in vkd3d 1.2 +What's new in vkd3d 1.3 ======================= *** libvkd3d - Newly implemented Direct3D 12 features: - - Multi-sampling. - - Reserved resources. - - Instance data step rates. This requires the - VK_EXT_vertex_attribute_divisor extension. - - `Private data' APIs for all interfaces. - - Shader-resource view component mappings. - - Indirect indexed draws. - - Indirect draws with a count buffer. This requires the - VK_KHR_draw_indirect_count extension. - - Stream output and stream output queries. This requires the - VK_EXT_transform_feedback extension. - - Predicated/conditional rendering. - - Primitive restart. - - Depth rendering without a pixel shader. - - Depth clipping. This requires the VK_EXT_depth_clip_enable extension. - - Rasteriser discard. - - Dual-source blending. - - Mapping placed resources. - - The ReadFromSubresource() and WriteToSubresource() ID3D12Resource methods. - - Simultaneous access to resources from multiple queues. - - Null-views. I.e., views without an underlying resource. - - Several more feature support queries. + - 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. - New interfaces: - - vkd3d_serialize_versioned_root_signature() and - vkd3d_create_versioned_root_signature_deserializer() provide support for - versioned root signatures. - - The vkd3d_application_info structure extends the - vkd3d_instance_create_info structure, and can be used to pass information - about the application to libvkd3d. It is analogous to the - VkApplicationInfo structure in Vulkan. Its `api_version' field should be - set to the version of the libvkd3d API that the application targets. - - The vkd3d_optional_device_extensions_info structure extends the - vkd3d_device_create_info structure, and can be used to pass a list of - device extensions to enable only when available to libvkd3d. It is - analogous to the vkd3d_optional_instance_extensions_info structure for - instance extensions. - -- New environment variables: - - VKD3D_CONFIG can be used to set options that change the behaviour of - libvkd3d. - - VKD3D_TEST_BUG can be used to disable bug_if() conditions in the test - suite. - - VKD3D_TEST_FILTER can be used to control which tests are run. - - VKD3D_VULKAN_DEVICE can be used to override the Vulkan physical device - used by vkd3d. - See the README for more detailed descriptions and how to use these. - -- When the VK_KHR_dedicated_allocation extension is available, dedicated - allocations may be used for committed resources. - -- When the VK_KHR_image_format_list extension is available, it will be used to - inform the driver about the view formats that a particular mutable Vulkan - image can be used with. This improves performance on some Vulkan - implementations. - -- When the VK_EXT_debug_marker extension is available, object names set with - the ID3D12Object SetName() method will be propagated to the underlying - Vulkan objects. - -- Unordered-access view clears are supported on more formats. Previously these - were limited to integer formats for texture resources, and single component - integer formats for buffer resources. - -- When the D24_UNORM_S8_UINT format is not supported by the Vulkan - implementation, the D32_SFLOAT_S8_UINT format will be used instead to - implement the D24_UNORM_S8_UINT and related DXGI formats. This is required - because the DXGI D24_UNORM_S8_UINT format is mandatory, while the Vulkan - D24_UNORM_S8_UINT format is optional. + - 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. - Various bug fixes. *** libvkd3d-shader -- libvkd3d-shader is now available as a public instead of an internal library. - - New features: - - Tessellation shaders. - - Root signature version 1.1 serialisation, deserialisation, and conversion. - - Multi-sample masks. - - Per-sample shading. - - Early depth/stencil test. - - Conservative depth output. - - Dual-source blending. - - Stream output. - - Viewport arrays. - -- Support for OpenGL SPIR-V target environments. This allows SPIR-V produced - by libvkd3d-shader to be used with GL_ARB_gl_spirv. This includes support - for OpenGL atomic counters and combined samplers. - -- Preliminary support for shader model 5.1 shaders. This is still a work in - progress. Notably, support for resource arrays is not yet implemented. - -- When the SPV_EXT_demote_to_helper_invocation is available, it will be used - to implement the `discard' shader instruction instead of using SpvOpKill. In - particular, this ensures the `deriv_rtx' and `deriv_rty' instruction return - accurate results after a (conditional) `discard' instruction. - -- Support for using SPIR-V specialisation constants for shader parameters. - -- Support for more shader instructions: - - bufinfo, - - eval_centroid, - - eval_sample_index, - - ld2ms, - - sample_b, - - sample_d, - - sample_info, - - samplepos. - -- When built against SPIRV-Tools, libvkd3d-shader can produce SPIR-V shaders - in text form. - -- libvkd3d-shader now has its own environment variable (VKD3D_SHADER_DEBUG) to - control debug output. - -- Various shader translation fixes. + - 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 targetting. If left unspecified, + VKD3D_SHADER_API_VERSION_1_2 will be used. + +- Various shader translation fixes, for tessellation shaders in particular. *** vkd3d-compiler -- When supported by libvkd3d-shader, text form SPIR-V is available as a target - format, in addition to the existing binary form SPIR-V target format. +- 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. -- Input from standard input, and output to standard output is supported. +- 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. *** libvkd3d-utils -- To specify the libvkd3d API version to use when creating vkd3d instances, - define VKD3D_UTILS_API_VERSION to the desired version before including - vkd3d_utils.h. If VKD3D_UTILS_API_VERSION is not explicitly defined, - VKD3D_API_VERSION_1_0 will be used. - -- Support for versioned root signatures is provided by the - D3D12SerializeVersionedRootSignature() and - D3D12CreateVersionedRootSignatureDeserializer() entry points. +- 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. *** build -- The minimum required version of Vulkan-Headers and SPIRV-Headers for this - release is version 1.1.113. - -- The minimum required version of widl for this release is version 3.20. +- 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'. -- If doxygen is available, it will be used to build API documentation. By - default, documentation will be generated in HTML and PDF formats. +- The VULKAN_LIBS configure variable is used when detecting the Vulkan + library. -- If debug logs are not required or desired, defining VKD3D_NO_TRACE_MESSAGES - and VKD3D_NO_DEBUG_MESSAGES will prevent them from being included in the - build. For example, a release build may want to configure with - `CPPFLAGS="-DNDEBUG -DVKD3D_NO_TRACE_MESSAGES -DVKD3D_NO_DEBUG_MESSAGES"'. +- Builds for the Microsoft Windows target platform no longer require support + for POSIX threads. Windows synchronisation primitives are used instead. -- Microsoft Windows is now a supported target platform. To create a build for - Windows, either cross-compile by configuring with an appropriate --host - option like for example `--host=x86_64-w64-mingw32', or build on Windows - itself using an environment like MSYS2 or Cygwin. +- If ncurses is available, it will be use by vkd3d-compiler to determine the + capabilities of the connected teleprinter, if any. diff --git a/AUTHORS b/AUTHORS index 8528b200..bc2e08f6 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,15 +1,26 @@ Alexandre Julliard Andrew Eikum +Andrey Gusev +Atharva Nimbalkar +Biswapriyo Nath Chip Davis Conor McCarthy Derek Lesho +Francisco Casas +Giovanni Mascellani Hans-Kristian Arntzen Henri Verbeet Isabella Bosia Jactry Zeng +Joshua Ashton Józef Kucia +Matteo Bruni +Nikolay Sivov Philip Rebohle Rémi Bernon +Robin Kertels +Stefan Dösinger Sven Hesse +Vinson Lee Zebediah Figura Zhiyi Zhang diff --git a/COPYING b/COPYING index 4bb951fc..b7aa9277 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright 2016-2019 the Vkd3d project authors (see the file AUTHORS for a +Copyright 2016-2022 the Vkd3d project authors (see the file AUTHORS for a complete list) Vkd3d is free software; you can redistribute it and/or modify it under diff --git a/Makefile.am b/Makefile.am index adf74f18..d4402910 100644 --- a/Makefile.am +++ b/Makefile.am @@ -221,7 +221,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 1:0:0 +libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1 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 @@ -255,7 +255,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 3:0:2 +libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:0:3 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 @@ -267,7 +267,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 2:0:1 +libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 3:0:2 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 265dccc3..53029d2c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([vkd3d],[1.2]) +AC_INIT([vkd3d],[1.3]) AC_CONFIG_AUX_DIR([bin]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 6ce02ed5..d8be00f0 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -18,7 +18,7 @@ */ #define VK_USE_PLATFORM_XCB_KHR -#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_2 +#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_3 #include <vkd3d.h> #include <vkd3d_utils.h> #include <xcb/xcb_event.h> diff --git a/include/vkd3d.h b/include/vkd3d.h index a2c70116..bce3c6e4 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -59,6 +59,7 @@ enum vkd3d_api_version VKD3D_API_VERSION_1_0, VKD3D_API_VERSION_1_1, VKD3D_API_VERSION_1_2, + VKD3D_API_VERSION_1_3, }; typedef HRESULT (*PFN_vkd3d_signal_event)(HANDLE event); diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 03405add..1bb4c404 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 2 +#define VKD3D_SPIRV_GENERATOR_VERSION 3 #define VKD3D_SPIRV_GENERATOR_MAGIC vkd3d_make_u32(VKD3D_SPIRV_GENERATOR_VERSION, VKD3D_SPIRV_GENERATOR_ID) struct vkd3d_spirv_stream -- 2.20.1

2 1

[PATCH vkd3d 6/7] vkd3d-shader/glsl: Disable support for the GLSL target.
by Henri Verbeet March 2, 2022

March 2, 2022

Regrettably, support for the GLSL target is not mature enough for the upcoming 1.3 release. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index bc3402a0..62baf17f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1456,7 +1456,9 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( VKD3D_SHADER_TARGET_SPIRV_TEXT, #endif VKD3D_SHADER_TARGET_D3D_ASM, +#if 0 VKD3D_SHADER_TARGET_GLSL, +#endif }; static const enum vkd3d_shader_target_type hlsl_types[] = -- 2.20.1

1 0

[PATCH vkd3d 5/7] vkd3d-shader: Add missing version information for some enum elements.
by Henri Verbeet March 2, 2022

March 2, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 406f3afe..05d235f9 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -566,11 +566,11 @@ enum vkd3d_shader_source_type * the format used for Direct3D shader model 4 and 5 shaders. */ VKD3D_SHADER_SOURCE_DXBC_TPF, - /** High-Level Shader Language source code. */ + /** High-Level Shader Language source code. \since 1.3 */ VKD3D_SHADER_SOURCE_HLSL, /** * Legacy Direct3D byte-code. This is the format used for Direct3D shader - * model 1, 2, and 3 shaders. + * model 1, 2, and 3 shaders. \since 1.3 */ VKD3D_SHADER_SOURCE_D3D_BYTECODE, @@ -597,16 +597,16 @@ enum vkd3d_shader_target_type VKD3D_SHADER_TARGET_D3D_ASM, /** * Legacy Direct3D byte-code. This is the format used for Direct3D shader - * model 1, 2, and 3 shaders. + * model 1, 2, and 3 shaders. \since 1.3 */ VKD3D_SHADER_TARGET_D3D_BYTECODE, /** * A 'Tokenized Program Format' shader embedded in a DXBC container. This is - * the format used for Direct3D shader model 4 and 5 shaders. + * the format used for Direct3D shader model 4 and 5 shaders. \since 1.3 */ VKD3D_SHADER_TARGET_DXBC_TPF, /** - * An 'OpenGL Shading Language' shader. + * An 'OpenGL Shading Language' shader. \since 1.3 */ VKD3D_SHADER_TARGET_GLSL, @@ -691,7 +691,9 @@ enum vkd3d_shader_spirv_extension { VKD3D_SHADER_SPIRV_EXTENSION_NONE, VKD3D_SHADER_SPIRV_EXTENSION_EXT_DEMOTE_TO_HELPER_INVOCATION, + /** \since 1.3 */ VKD3D_SHADER_SPIRV_EXTENSION_EXT_DESCRIPTOR_INDEXING, + /** \since 1.3 */ VKD3D_SHADER_SPIRV_EXTENSION_EXT_STENCIL_EXPORT, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SPIRV_EXTENSION), -- 2.20.1

1 0

[PATCH vkd3d 4/7] vkd3d-shader: Add a description for VKD3D_SHADER_TARGET_D3D_ASM.
by Henri Verbeet March 2, 2022

March 2, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 8797de51..406f3afe 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -591,6 +591,9 @@ enum vkd3d_shader_target_type */ VKD3D_SHADER_TARGET_SPIRV_BINARY, VKD3D_SHADER_TARGET_SPIRV_TEXT, + /** + * Direct3D shader assembly. \since 1.3 + */ VKD3D_SHADER_TARGET_D3D_ASM, /** * Legacy Direct3D byte-code. This is the format used for Direct3D shader -- 2.20.1

1 0

[PATCH vkd3d 3/7] vkd3d-shader: Slightly clarify the documentation for struct vkd3d_shader_descriptor_offset_info.
by Henri Verbeet March 2, 2022

March 2, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index df15047c..8797de51 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -538,7 +538,7 @@ struct vkd3d_shader_descriptor_offset_info * binding.count = 2 * \endcode * - * and then pass \c {8, \c 4} as \a binding_offsets here. + * and then pass \c {8, \c 4} as static binding offsets here. * * This field may be NULL, in which case the corresponding offsets are * specified to be 0. -- 2.20.1

1 0

[PATCH vkd3d 2/7] build: Add the shader tests to the distribution.
by Henri Verbeet March 2, 2022

March 2, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index db50be76..adf74f18 100644 --- a/Makefile.am +++ b/Makefile.am @@ -347,6 +347,8 @@ XFAIL_TESTS = \ tests/trigonometry.shader_test endif +EXTRA_DIST += $(vkd3d_shader_tests) + if BUILD_DEMOS DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @DEMO_LIBS@ @VULKAN_LIBS@ DEMOS_CFLAGS = $(AM_CFLAGS) @DEMO_CFLAGS@ -- 2.20.1

1 0