March 2024 - Wine-Commits - list.winehq.org

Henri Verbeet : vkd3d-utils: Restore the \since 1.11 command on D3DReflect().
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: vkd3d Branch: master Commit: 0885bf30826a97934d4dddbe6a16ae07c73de464 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0885bf30826a97934d4dddbe6a16a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 5 10:30:53 2024 +0100 vkd3d-utils: Restore the \since 1.11 command on D3DReflect(). This was effectively dropped by 8c6f5b847ba112301693eda38a1ce30b282ec555. --- include/vkd3d_utils.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 7616a3f3..65e17276 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -119,6 +119,7 @@ VKD3D_UTILS_API HRESULT WINAPI D3DStripShader(const void *data, SIZE_T data_size /** \since 1.11 */ VKD3D_UTILS_API HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T data_size, UINT flags, const char *comments, ID3DBlob **blob); +/** \since 1.11 */ VKD3D_UTILS_API HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID iid, void **reflection); #ifdef __cplusplus

1 0

Henri Verbeet : Release 1.11.
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: vkd3d Branch: master Commit: f866fb95ad53a860669418d310440262c62ec77c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f866fb95ad53a860669418d310440… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 5 12:00:00 2024 +0100 Release 1.11. --- ANNOUNCE | 789 ++++++++++++++++++++++++++++++------ AUTHORS | 2 + COPYING | 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 | 6 +- libs/vkd3d/state.c | 6 +- programs/vkd3d-compiler/main.c | 2 +- tests/shader_runner_gl.c | 2 +- tests/shader_runner_vulkan.c | 2 +- 14 files changed, 694 insertions(+), 131 deletions(-)

1 0

Henri Verbeet : vkd3d-shader: Update the chained structure list for vkd3d_shader_compile().
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: vkd3d Branch: master Commit: 22d5e24bad03fa7bcf682b60230bb94b23a5b41d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/22d5e24bad03fa7bcf682b60230bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 5 10:56:21 2024 +0100 vkd3d-shader: Update the chained structure list for vkd3d_shader_compile(). --- include/vkd3d_shader.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index a5c3c8f8..e32e8b13 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -2004,14 +2004,17 @@ VKD3D_SHADER_API const enum vkd3d_shader_target_type *vkd3d_shader_get_supported * * Depending on the source and target types, this function may support the * following chained structures: + * - vkd3d_shader_descriptor_offset_info * - vkd3d_shader_hlsl_source_info * - vkd3d_shader_interface_info - * - vkd3d_shader_varying_map_info + * - vkd3d_shader_preprocess_info + * - vkd3d_shader_scan_combined_resource_sampler_info * - vkd3d_shader_scan_descriptor_info * - vkd3d_shader_scan_signature_info * - vkd3d_shader_spirv_domain_shader_target_info * - vkd3d_shader_spirv_target_info * - vkd3d_shader_transform_feedback_info + * - vkd3d_shader_varying_map_info * * \param compile_info A chained structure containing compilation parameters. *

1 0

Tag vkd3d-1.11 : Alexandre Julliard : Release 1.11
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: vkd3d Branch: refs/tags/vkd3d-1.11 Tag: 28c40f8e7f7433e3df157a389f8f50aeb19ea1f6 URL: https://gitlab.winehq.org/wine/vkd3d/-/tags/28c40f8e7f7433e3df157a389f8f50a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 5 21:00:39 2024 +0100 Release 1.11

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write the SFI0 section and "REQUIRES_ROVS" flag when ROVs are used.
by Alexandre Julliard March 4, 2024

March 4, 2024

Module: vkd3d Branch: master Commit: 9177df883ecf1bc66b39e28d8f6bb616572a75fe URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9177df883ecf1bc66b39e28d8f6bb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 3 23:58:15 2024 -0600 vkd3d-shader/hlsl: Write the SFI0 section and "REQUIRES_ROVS" flag when ROVs are used. --- include/private/vkd3d_common.h | 1 + libs/vkd3d-shader/tpf.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 8d6e7b37..dc0b2e17 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -64,6 +64,7 @@ #define TAG_RDEF VKD3D_MAKE_TAG('R', 'D', 'E', 'F') #define TAG_RTS0 VKD3D_MAKE_TAG('R', 'T', 'S', '0') #define TAG_SDBG VKD3D_MAKE_TAG('S', 'D', 'B', 'G') +#define TAG_SFI0 VKD3D_MAKE_TAG('S', 'F', 'I', '0') #define TAG_SHDR VKD3D_MAKE_TAG('S', 'H', 'D', 'R') #define TAG_SHEX VKD3D_MAKE_TAG('S', 'H', 'E', 'X') #define TAG_STAT VKD3D_MAKE_TAG('S', 'T', 'A', 'T') diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index c6cf1c95..3be4e40a 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -164,6 +164,21 @@ STATIC_ASSERT(SM4_MAX_SRC_COUNT <= SPIRV_MAX_SRC_COUNT); /* The shift that corresponds to the D3D_SIF_TEXTURE_COMPONENTS mask. */ #define VKD3D_SM4_SIF_TEXTURE_COMPONENTS_SHIFT 2 +#define VKD3D_SM4_REQUIRES_DOUBLES 0x00000001 +#define VKD3D_SM4_REQUIRES_EARLY_DEPTH_STENCIL 0x00000002 +#define VKD3D_SM4_REQUIRES_UAVS_AT_EVERY_STAGE 0x00000004 +#define VKD3D_SM4_REQUIRES_64_UAVS 0x00000008 +#define VKD3D_SM4_REQUIRES_MINIMUM_PRECISION 0x00000010 +#define VKD3D_SM4_REQUIRES_11_1_DOUBLE_EXTENSIONS 0x00000020 +#define VKD3D_SM4_REQUIRES_11_1_SHADER_EXTENSIONS 0x00000040 +#define VKD3D_SM4_REQUIRES_LEVEL_9_COMPARISON_FILTERING 0x00000080 +#define VKD3D_SM4_REQUIRES_TILED_RESOURCES 0x00000100 +#define VKD3D_SM4_REQUIRES_STENCIL_REF 0x00000200 +#define VKD3D_SM4_REQUIRES_INNER_COVERAGE 0x00000400 +#define VKD3D_SM4_REQUIRES_TYPED_UAV_LOAD_ADDITIONAL_FORMATS 0x00000800 +#define VKD3D_SM4_REQUIRES_ROVS 0x00001000 +#define VKD3D_SM4_REQUIRES_VIEWPORT_AND_RT_ARRAY_INDEX_FROM_ANY_SHADER_FEEDING_RASTERIZER 0x00002000 + enum vkd3d_sm4_opcode { VKD3D_SM4_OP_ADD = 0x00, @@ -5896,6 +5911,31 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, sm4_free_extern_resources(extern_resources, extern_resources_count); } +static void write_sm4_sfi0(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) +{ + struct extern_resource *extern_resources; + unsigned int extern_resources_count; + uint64_t *flags; + + flags = vkd3d_calloc(1, sizeof(*flags)); + + extern_resources = sm4_get_extern_resources(ctx, &extern_resources_count); + for (unsigned int i = 0; i < extern_resources_count; ++i) + { + if (extern_resources[i].data_type->e.resource.rasteriser_ordered) + *flags |= VKD3D_SM4_REQUIRES_ROVS; + } + sm4_free_extern_resources(extern_resources, extern_resources_count); + + /* FIXME: We also emit code that should require UAVS_AT_EVERY_STAGE, + * STENCIL_REF, and TYPED_UAV_LOAD_ADDITIONAL_FORMATS. */ + + if (flags) + dxbc_writer_add_section(dxbc, TAG_SFI0, flags, sizeof(*flags)); + else + vkd3d_free(flags); +} + int hlsl_sm4_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out) { struct dxbc_writer dxbc; @@ -5908,6 +5948,7 @@ int hlsl_sm4_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun write_sm4_signature(ctx, &dxbc, true); write_sm4_rdef(ctx, &dxbc); write_sm4_shdr(ctx, entry_func, &dxbc); + write_sm4_sfi0(ctx, &dxbc); if (!(ret = ctx->result)) ret = dxbc_writer_write(&dxbc, out);

1 0

Henri Verbeet : tests/shader_runner: Set the SPIR-V feature flags based on the runner caps.
by Alexandre Julliard March 4, 2024

March 4, 2024

Module: vkd3d Branch: master Commit: 5c637d68da64f5de21f865da91cee0a66dfd17fe URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5c637d68da64f5de21f865da91cee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 4 15:29:05 2024 +0100 tests/shader_runner: Set the SPIR-V feature flags based on the runner caps. --- tests/shader_runner.h | 13 +++++++++++++ tests/shader_runner_gl.c | 4 ++-- tests/shader_runner_vulkan.c | 7 +++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 62358d78..ec6c340c 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -23,6 +23,7 @@ #include "vkd3d_d3d12.h" #include "vkd3d_dxgiformat.h" #include "vkd3d_common.h" +#include "vkd3d_shader.h" #include "utils.h" #define RENDER_TARGET_WIDTH 640 @@ -128,6 +129,18 @@ struct shader_runner_caps bool rov; }; +static inline unsigned int shader_runner_caps_get_feature_flags(const struct shader_runner_caps *caps) +{ + unsigned int flags = 0; + + if (caps->int64) + flags |= VKD3D_SHADER_COMPILE_OPTION_FEATURE_INT64; + if (caps->float64) + flags |= VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLOAT64; + + return flags; +} + struct shader_runner { const struct shader_runner_ops *ops; diff --git a/tests/shader_runner_gl.c b/tests/shader_runner_gl.c index 6cec33a4..010b11d7 100644 --- a/tests/shader_runner_gl.c +++ b/tests/shader_runner_gl.c @@ -27,7 +27,6 @@ #include <EGL/eglext.h> #include <GL/gl.h> #include "shader_runner.h" -#include "vkd3d_shader.h" #include "vkd3d_d3dcompiler.h" static PFNGLSPECIALIZESHADERPROC p_glSpecializeShader; @@ -442,11 +441,12 @@ static bool compile_shader(struct gl_runner *runner, ID3DBlob *blob, struct vkd3 char *messages; int ret; - static const struct vkd3d_shader_compile_option options[] = + const struct vkd3d_shader_compile_option options[] = { {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_10}, {VKD3D_SHADER_COMPILE_OPTION_FRAGMENT_COORDINATE_ORIGIN, VKD3D_SHADER_COMPILE_OPTION_FRAGMENT_COORDINATE_ORIGIN_LOWER_LEFT}, + {VKD3D_SHADER_COMPILE_OPTION_FEATURE, shader_runner_caps_get_feature_flags(&runner->caps)}, }; info.next = &combined_sampler_info; diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index c919e256..4e68fd14 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -24,7 +24,6 @@ #define VKD3D_TEST_NO_DEFS #include "config.h" #include "vulkan/vulkan.h" -#include "vkd3d_shader.h" #include "vkd3d.h" #include "vkd3d_d3dcompiler.h" #include "shader_runner.h" @@ -420,7 +419,7 @@ static bool compile_shader(struct vulkan_shader_runner *runner, const char *sour struct vkd3d_shader_resource_binding bindings[MAX_RESOURCES + MAX_SAMPLERS]; struct vkd3d_shader_push_constant_buffer push_constants; struct vkd3d_shader_resource_binding *binding; - struct vkd3d_shader_compile_option options[2]; + struct vkd3d_shader_compile_option options[3]; struct vkd3d_shader_compile_option *option; unsigned int i, compile_options; char profile[7]; @@ -499,6 +498,10 @@ static bool compile_shader(struct vulkan_shader_runner *runner, const char *sour info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; + option = &options[info.option_count++]; + option->name = VKD3D_SHADER_COMPILE_OPTION_FEATURE; + option->value = shader_runner_caps_get_feature_flags(&runner->caps); + spirv_info.next = &interface_info; spirv_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0;

1 0

Henri Verbeet : tests/shader_runner: Set the vkd3d-shader API version in the Vulkan runner.
by Alexandre Julliard March 4, 2024

March 4, 2024

Module: vkd3d Branch: master Commit: 015fde5e231b4da88a4fcaf1d03d0f46c2cc6072 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/015fde5e231b4da88a4fcaf1d03d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 4 15:26:44 2024 +0100 tests/shader_runner: Set the vkd3d-shader API version in the Vulkan runner. --- tests/shader_runner_vulkan.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index 35db729b..c919e256 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -420,7 +420,8 @@ static bool compile_shader(struct vulkan_shader_runner *runner, const char *sour struct vkd3d_shader_resource_binding bindings[MAX_RESOURCES + MAX_SAMPLERS]; struct vkd3d_shader_push_constant_buffer push_constants; struct vkd3d_shader_resource_binding *binding; - struct vkd3d_shader_compile_option options[1]; + struct vkd3d_shader_compile_option options[2]; + struct vkd3d_shader_compile_option *option; unsigned int i, compile_options; char profile[7]; char *messages; @@ -449,10 +450,14 @@ static bool compile_shader(struct vulkan_shader_runner *runner, const char *sour info.options = options; info.option_count = 0; + + option = &options[info.option_count++]; + option->name = VKD3D_SHADER_COMPILE_OPTION_API_VERSION; + option->value = VKD3D_SHADER_API_VERSION_1_10; + compile_options = runner->r.compile_options; if (compile_options) { - struct vkd3d_shader_compile_option *option; if (compile_options & (D3DCOMPILE_PACK_MATRIX_ROW_MAJOR | D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR)) {

1 0

Henri Verbeet : vkd3d-compiler: Compile SPIR-V shaders with the int64 and float64 features.
by Alexandre Julliard March 4, 2024

March 4, 2024

Module: vkd3d Branch: master Commit: 5552be552b9112ad655f71a245527ee5b9819df8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5552be552b9112ad655f71a245527… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 4 15:22:47 2024 +0100 vkd3d-compiler: Compile SPIR-V shaders with the int64 and float64 features. --- programs/vkd3d-compiler/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index fdb1cade..4b0f37fe 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -835,6 +835,10 @@ int main(int argc, char **argv) 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_10); + if (options.target_type == VKD3D_SHADER_TARGET_SPIRV_BINARY + || options.target_type == VKD3D_SHADER_TARGET_SPIRV_TEXT) + add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_FEATURE, + VKD3D_SHADER_COMPILE_OPTION_FEATURE_INT64 | VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLOAT64); info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = &hlsl_source_info;

1 0

Eric Pouech : dbghelp/tests: Add tests about SymLoadModule and finding pdb files.
by Alexandre Julliard March 4, 2024

March 4, 2024

Module: wine Branch: master Commit: 0ca1350a0345b51f05d9c5edd6560f3f32f19a3b URL: https://gitlab.winehq.org/wine/wine/-/commit/0ca1350a0345b51f05d9c5edd6560f… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Feb 23 11:09:37 2024 +0100 dbghelp/tests: Add tests about SymLoadModule and finding pdb files. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/path.c | 233 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 233 insertions(+)

1 0

Eric Pouech : dbghelp: Don't search the passed path in SymFindFileInPath.
by Alexandre Julliard March 4, 2024

March 4, 2024

Module: wine Branch: master Commit: c1b8db0c28ac5b7a14567bfb6df2c0af364de6a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1b8db0c28ac5b7a14567bfb6df2c0… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sun Dec 31 10:11:29 2023 +0100 dbghelp: Don't search the passed path in SymFindFileInPath. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/path.c | 8 +------- dlls/dbghelp/tests/path.c | 11 ----------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index ec182c969d3..f45807c634f 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -398,13 +398,6 @@ BOOL WINAPI SymFindFileInPathW(HANDLE hProcess, PCWSTR searchPath, PCWSTR full_p filename = file_name(full_path); - /* first check full path to file */ - if (sffip_cb(full_path, &s)) - { - lstrcpyW(buffer, full_path); - return TRUE; - } - while (searchPath) { ptr = wcschr(searchPath, ';'); @@ -425,6 +418,7 @@ BOOL WINAPI SymFindFileInPathW(HANDLE hProcess, PCWSTR searchPath, PCWSTR full_p return TRUE; } } + SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } diff --git a/dlls/dbghelp/tests/path.c b/dlls/dbghelp/tests/path.c index 9074d42ac94..0efe55defd2 100644 --- a/dlls/dbghelp/tests/path.c +++ b/dlls/dbghelp/tests/path.c @@ -957,12 +957,7 @@ static BOOL CALLBACK path_cb(PCWSTR filename, void* _usr) BOOL ret; pv->cb_count++; - /* wine returns paths in relative form, but relative to search path... - * fail (== continue search) until it's fixed - */ - todo_wine_if(!filename[0] || filename[1] != ':') ok(filename[0] && filename[1] == ':', "Expecting full path, but got %ls\n", filename); - if (!filename[0] || filename[1] != ':') return TRUE; memset(&ssii, 0, sizeof(ssii)); ssii.sizeofstruct = sizeof(ssii); @@ -1161,7 +1156,6 @@ static void test_find_in_path_pe(void) image_tests[i].lookup_size_of_image, 0, SSRVOPT_DWORDPTR, found, path_cb, &pv); - todo_wine ok(pv.cb_count == image_tests[i].expected_cb_count, "Mismatch in cb count, got %u (expected %lu)\n", pv.cb_count, image_tests[i].expected_cb_count); @@ -1184,9 +1178,7 @@ static void test_find_in_path_pe(void) } else { - todo_wine_if(i == 26 || i == 27) ok(!ret, "File reported found, while failure is expected\n"); - todo_wine_if(i == 26 || i == 27 || (GetLastError() != ERROR_FILE_NOT_FOUND)) ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Unexpected error %lu\n", GetLastError()); } for (ptr = image_tests[i].files; *ptr; ptr++) @@ -1378,7 +1370,6 @@ static void test_find_in_path_pdb(void) 0, pdb_tests[i].lookup_age, SSRVOPT_GUIDPTR, found, path_cb, &pv); - todo_wine ok(pv.cb_count == pdb_tests[i].expected_cb_count, "Mismatch in cb count, got %u (expected %lu)\n", pv.cb_count, pdb_tests[i].expected_cb_count); @@ -1401,9 +1392,7 @@ static void test_find_in_path_pdb(void) } else { - todo_wine_if(i == 26 || i == 27) ok(!ret, "File reported found, while failure is expected\n"); - todo_wine ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Unexpected error %lu\n", GetLastError()); }

1 0