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

Alistair Leslie-Hughes : include: Add some DWMWA_* enum values.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: wine Branch: master Commit: e08fbd2743196835ab76fb35416b7da2c5981c2d URL: https://gitlab.winehq.org/wine/wine/-/commit/e08fbd2743196835ab76fb35416b7d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 4 14:19:57 2024 +1100 include: Add some DWMWA_* enum values. --- include/dwmapi.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/dwmapi.h b/include/dwmapi.h index 1b19426ce2d..fb39aeeba10 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -57,6 +57,15 @@ enum DWMWINDOWATTRIBUTE { DWMWA_CLOAK, DWMWA_CLOAKED, DWMWA_FREEZE_REPRESENTATION, + DWMWA_PASSIVE_UPDATE_MODE, + DWMWA_USE_HOSTBACKDROPBRUSH, + DWMWA_USE_IMMERSIVE_DARK_MODE = 20, + DWMWA_WINDOW_CORNER_PREFERENCE = 33, + DWMWA_BORDER_COLOR, + DWMWA_CAPTION_COLOR, + DWMWA_TEXT_COLOR, + DWMWA_VISIBLE_FRAME_BORDER_THICKNESS, + DWMWA_SYSTEMBACKDROP_TYPE, DWMWA_LAST };

1 0

Alistair Leslie-Hughes : include: Add STORAGE_HOTPLUG_INFO structure.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: wine Branch: master Commit: a865ec353c85bf2492225344d89ab621d65ee9c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/a865ec353c85bf2492225344d89ab6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 4 16:09:35 2024 +1100 include: Add STORAGE_HOTPLUG_INFO structure. --- include/ntddstor.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/ntddstor.h b/include/ntddstor.h index b8c4bb73b0d..4d715efd1ef 100644 --- a/include/ntddstor.h +++ b/include/ntddstor.h @@ -272,6 +272,14 @@ typedef struct _STORAGE_ADAPTER_DESCRIPTOR { USHORT BusMinorVersion; } STORAGE_ADAPTER_DESCRIPTOR, *PSTORAGE_ADAPTER_DESCRIPTOR; +typedef struct _STORAGE_HOTPLUG_INFO { + ULONG Size; + BOOLEAN MediaRemovable; + BOOLEAN MediaHotplug; + BOOLEAN DeviceHotplug; + BOOLEAN WriteCacheEnableOverride; +} STORAGE_HOTPLUG_INFO, *PSTORAGE_HOTPLUG_INFO; + #ifdef __cplusplus } #endif

1 0

Giovanni Mascellani : vkd3d-shader/ir: Synthesize selection constructs from conditional jumps.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: vkd3d Branch: master Commit: a278f32d3ffad1fb31b8185e3bb63fdfa2522510 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a278f32d3ffad1fb31b8185e3bb63… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Feb 20 23:29:48 2024 +0100 vkd3d-shader/ir: Synthesize selection constructs from conditional jumps. --- libs/vkd3d-shader/ir.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 140 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 08f643e8..8af53739 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -3050,6 +3050,8 @@ struct vsir_cfg_structure STRUCTURE_TYPE_BLOCK, /* Execute a loop, which is identified by an index. */ STRUCTURE_TYPE_LOOP, + /* Execute a selection construct. */ + STRUCTURE_TYPE_SELECTION, /* Execute a `return' or a (possibly) multilevel `break' or * `continue', targeting a loop by its index. If `condition' * is non-NULL, then the jump is conditional (this is @@ -3065,6 +3067,13 @@ struct vsir_cfg_structure unsigned idx; } loop; struct + { + struct vkd3d_shader_src_param *condition; + struct vsir_cfg_structure_list if_body; + struct vsir_cfg_structure_list else_body; + bool invert_condition; + } selection; + struct { enum vsir_cfg_jump_type { @@ -3110,6 +3119,20 @@ static struct vsir_cfg_structure *vsir_cfg_structure_list_append(struct vsir_cfg return ret; } +static enum vkd3d_result vsir_cfg_structure_list_append_from_region(struct vsir_cfg_structure_list *list, + struct vsir_cfg_structure *begin, size_t size) +{ + if (!vkd3d_array_reserve((void **)&list->structures, &list->capacity, list->count + size, + sizeof(*list->structures))) + return VKD3D_ERROR_OUT_OF_MEMORY; + + memcpy(&list->structures[list->count], begin, size * sizeof(*begin)); + + list->count += size; + + return VKD3D_OK; +} + static void vsir_cfg_structure_init(struct vsir_cfg_structure *structure, enum vsir_cfg_structure_type type) { memset(structure, 0, sizeof(*structure)); @@ -3118,8 +3141,20 @@ static void vsir_cfg_structure_init(struct vsir_cfg_structure *structure, enum v static void vsir_cfg_structure_cleanup(struct vsir_cfg_structure *structure) { - if (structure->type == STRUCTURE_TYPE_LOOP) - vsir_cfg_structure_list_cleanup(&structure->u.loop.body); + switch (structure->type) + { + case STRUCTURE_TYPE_LOOP: + vsir_cfg_structure_list_cleanup(&structure->u.loop.body); + break; + + case STRUCTURE_TYPE_SELECTION: + vsir_cfg_structure_list_cleanup(&structure->u.selection.if_body); + vsir_cfg_structure_list_cleanup(&structure->u.selection.else_body); + break; + + default: + break; + } } struct vsir_cfg @@ -3295,6 +3330,25 @@ static void vsir_cfg_structure_dump(struct vsir_cfg *cfg, struct vsir_cfg_struct TRACE("%s} # %u\n", cfg->debug_buffer.buffer, structure->u.loop.idx); break; + case STRUCTURE_TYPE_SELECTION: + TRACE("%sif {\n", cfg->debug_buffer.buffer); + + vsir_cfg_structure_list_dump(cfg, &structure->u.selection.if_body); + + if (structure->u.selection.else_body.count == 0) + { + TRACE("%s}\n", cfg->debug_buffer.buffer); + } + else + { + TRACE("%s} else {\n", cfg->debug_buffer.buffer); + + vsir_cfg_structure_list_dump(cfg, &structure->u.selection.else_body); + + TRACE("%s}\n", cfg->debug_buffer.buffer); + } + break; + case STRUCTURE_TYPE_JUMP: { const char *type_str; @@ -4205,6 +4259,52 @@ static void vsir_cfg_remove_trailing_continue(struct vsir_cfg_structure_list *li --list->count; } +static enum vkd3d_result vsir_cfg_synthesize_selections(struct vsir_cfg_structure_list *list) +{ + enum vkd3d_result ret; + size_t i; + + for (i = 0; i < list->count; ++i) + { + struct vsir_cfg_structure *structure = &list->structures[i], new_selection, *new_jump; + + if (structure->type != STRUCTURE_TYPE_JUMP || !structure->u.jump.condition) + continue; + + vsir_cfg_structure_init(&new_selection, STRUCTURE_TYPE_SELECTION); + new_selection.u.selection.condition = structure->u.jump.condition; + new_selection.u.selection.invert_condition = structure->u.jump.invert_condition; + + if (!(new_jump = vsir_cfg_structure_list_append(&new_selection.u.selection.if_body, + STRUCTURE_TYPE_JUMP))) + return VKD3D_ERROR_OUT_OF_MEMORY; + new_jump->u.jump.type = structure->u.jump.type; + new_jump->u.jump.target = structure->u.jump.target; + + /* Move the rest of the structure list in the else branch + * rather than leaving it after the selection construct. The + * reason is that this is more conducive to further + * optimization, because all the conditional `break's appear + * as the last instruction of a branch of a cascade of + * selection constructs at the end of the structure list we're + * processing, instead of being buried in the middle of the + * structure list itself. */ + if ((ret = vsir_cfg_structure_list_append_from_region(&new_selection.u.selection.else_body, + &list->structures[i + 1], list->count - i - 1)) < 0) + return ret; + + *structure = new_selection; + list->count = i + 1; + + if ((ret = vsir_cfg_synthesize_selections(&structure->u.selection.else_body)) < 0) + return ret; + + break; + } + + return VKD3D_OK; +} + static enum vkd3d_result vsir_cfg_optimize_recurse(struct vsir_cfg *cfg, struct vsir_cfg_structure_list *list) { enum vkd3d_result ret; @@ -4227,6 +4327,9 @@ static enum vkd3d_result vsir_cfg_optimize_recurse(struct vsir_cfg *cfg, struct if ((ret = vsir_cfg_optimize_recurse(cfg, loop_body)) < 0) return ret; + + if ((ret = vsir_cfg_synthesize_selections(loop_body)) < 0) + return ret; } return VKD3D_OK; @@ -4340,6 +4443,41 @@ static enum vkd3d_result vsir_cfg_structure_list_emit(struct vsir_cfg *cfg, break; } + case STRUCTURE_TYPE_SELECTION: + if (!reserve_instructions(&cfg->instructions, &cfg->ins_capacity, cfg->ins_count + 1)) + return VKD3D_ERROR_OUT_OF_MEMORY; + + if (!vsir_instruction_init_with_params(cfg->program, &cfg->instructions[cfg->ins_count], &no_loc, + VKD3DSIH_IF, 0, 1)) + return VKD3D_ERROR_OUT_OF_MEMORY; + + cfg->instructions[cfg->ins_count].src[0] = *structure->u.selection.condition; + + if (structure->u.selection.invert_condition) + cfg->instructions[cfg->ins_count].flags |= VKD3D_SHADER_CONDITIONAL_OP_Z; + + ++cfg->ins_count; + + if ((ret = vsir_cfg_structure_list_emit(cfg, &structure->u.selection.if_body, loop_idx)) < 0) + return ret; + + if (structure->u.selection.else_body.count != 0) + { + if (!reserve_instructions(&cfg->instructions, &cfg->ins_capacity, cfg->ins_count + 1)) + return VKD3D_ERROR_OUT_OF_MEMORY; + + vsir_instruction_init(&cfg->instructions[cfg->ins_count++], &no_loc, VKD3DSIH_ELSE); + + if ((ret = vsir_cfg_structure_list_emit(cfg, &structure->u.selection.else_body, loop_idx)) < 0) + return ret; + } + + if (!reserve_instructions(&cfg->instructions, &cfg->ins_capacity, cfg->ins_count + 1)) + return VKD3D_ERROR_OUT_OF_MEMORY; + + vsir_instruction_init(&cfg->instructions[cfg->ins_count++], &no_loc, VKD3DSIH_ENDIF); + break; + case STRUCTURE_TYPE_JUMP: { /* Encode the jump target as the loop index plus a bit to remember whether

1 0

Giovanni Mascellani : vkd3d-shader/ir: Remove trailing `continue's.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: vkd3d Branch: master Commit: 0d13b6afe9bf9b737cd0d3c6fef099629ef466b3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0d13b6afe9bf9b737cd0d3c6fef09… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Feb 20 23:29:48 2024 +0100 vkd3d-shader/ir: Remove trailing `continue's. --- libs/vkd3d-shader/ir.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index c495955d..08f643e8 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -4196,6 +4196,54 @@ fail: return VKD3D_ERROR_OUT_OF_MEMORY; } +static void vsir_cfg_remove_trailing_continue(struct vsir_cfg_structure_list *list, unsigned int target) +{ + struct vsir_cfg_structure *last = &list->structures[list->count - 1]; + + if (last->type == STRUCTURE_TYPE_JUMP && last->u.jump.type == JUMP_CONTINUE + && !last->u.jump.condition && last->u.jump.target == target) + --list->count; +} + +static enum vkd3d_result vsir_cfg_optimize_recurse(struct vsir_cfg *cfg, struct vsir_cfg_structure_list *list) +{ + enum vkd3d_result ret; + size_t i; + + for (i = 0; i < list->count; ++i) + { + struct vsir_cfg_structure *loop = &list->structures[i]; + struct vsir_cfg_structure_list *loop_body; + + if (loop->type != STRUCTURE_TYPE_LOOP) + continue; + + loop_body = &loop->u.loop.body; + + if (loop_body->count == 0) + continue; + + vsir_cfg_remove_trailing_continue(loop_body, loop->u.loop.idx); + + if ((ret = vsir_cfg_optimize_recurse(cfg, loop_body)) < 0) + return ret; + } + + return VKD3D_OK; +} + +static enum vkd3d_result vsir_cfg_optimize(struct vsir_cfg *cfg) +{ + enum vkd3d_result ret; + + ret = vsir_cfg_optimize_recurse(cfg, &cfg->structured_program); + + if (TRACE_ON()) + vsir_cfg_dump_structured_program(cfg); + + return ret; +} + static enum vkd3d_result vsir_cfg_structure_list_emit(struct vsir_cfg *cfg, struct vsir_cfg_structure_list *list, unsigned int loop_idx) { @@ -5317,6 +5365,12 @@ enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t return result; } + if ((result = vsir_cfg_optimize(&cfg)) < 0) + { + vsir_cfg_cleanup(&cfg); + return result; + } + if ((result = vsir_cfg_emit_structured_program(&cfg)) < 0) { vsir_cfg_cleanup(&cfg);

1 0

Giovanni Mascellani : vkd3d-shader/ir: Move `continue's to the false branch when possible.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: vkd3d Branch: master Commit: d8414302e89b43a60a40386a565459d62da4377d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d8414302e89b43a60a40386a56545… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Feb 29 16:00:51 2024 +0100 vkd3d-shader/ir: Move `continue's to the false branch when possible. --- libs/vkd3d-shader/ir.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 7230d0e8..c495955d 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -4115,11 +4115,29 @@ static enum vkd3d_result vsir_cfg_build_structured_program(struct vsir_cfg *cfg) * next block, in which case we make sure it's the * false branch. */ if (action_true.jump_type == JUMP_NONE) + { + invert_condition = true; + } + else if (stack_depth >= 2) + { + struct vsir_cfg_structure_list *inner_loop_frame = stack[stack_depth - 2]; + struct vsir_cfg_structure *inner_loop = &inner_loop_frame->structures[inner_loop_frame->count - 1]; + + assert(inner_loop->type == STRUCTURE_TYPE_LOOP); + + /* Otherwise, if one of the branches is + * continueing the inner loop we're inside, + * make sure it's the false branch (because it + * will be optimized out later). */ + if (action_true.jump_type == JUMP_CONTINUE && action_true.target == inner_loop->u.loop.idx) + invert_condition = true; + } + + if (invert_condition) { struct vsir_cfg_edge_action tmp = action_true; action_true = action_false; action_false = tmp; - invert_condition = true; } assert(action_true.jump_type != JUMP_NONE);

1 0

Jacek Caban : widl: Don't use old typelib format in do_everything mode.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: wine Branch: master Commit: a8fc62d1a269031b786f05b45ae9f57b4c365768 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8fc62d1a269031b786f05b45ae9f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 4 12:54:32 2024 +0200 widl: Don't use old typelib format in do_everything mode. Fixes a regression from 0bffa3222611015a3b3596c679be53c557daae1b. --- tools/widl/register.c | 2 +- tools/widl/widl.c | 5 ++--- tools/widl/widl.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index c4f81756352..66a07aeb5c4 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -317,7 +317,7 @@ void write_typelib_regscript( const statement_list_t *stmts ) error( "Cannot store multiple typelibs into %s\n", typelib_name ); else { - if (do_old_typelib) + if (old_typelib) create_sltg_typelib( stmt->u.lib ); else create_msft_typelib( stmt->u.lib ); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 489e7c2f9a2..6d7dd46c33e 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -99,7 +99,6 @@ int do_everything = 1; static int preprocess_only = 0; int do_header = 0; int do_typelib = 0; -int do_old_typelib = 0; int do_proxies = 0; int do_client = 0; int do_server = 0; @@ -108,6 +107,7 @@ int do_idfile = 0; int do_dlldata = 0; static int no_preprocess = 0; int old_names = 0; +int old_typelib = 0; int winrt_mode = 0; int interpreted_mode = 0; int use_abi_namespace = 0; @@ -256,7 +256,6 @@ static void set_everything(int x) { do_header = x; do_typelib = x; - do_old_typelib = x; do_proxies = x; do_client = x; do_server = x; @@ -618,7 +617,7 @@ static void option_callback( int optc, char *optarg ) do_typelib = 1; break; case OLD_TYPELIB_OPTION: - do_old_typelib = 1; + old_typelib = 1; break; case 'T': typelib_name = xstrdup(optarg); diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 33ecfa1f255..c5ccc140b36 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -39,7 +39,6 @@ extern int pedantic; extern int do_everything; extern int do_header; extern int do_typelib; -extern int do_old_typelib; extern int do_proxies; extern int do_client; extern int do_server; @@ -47,6 +46,7 @@ extern int do_regscript; extern int do_idfile; extern int do_dlldata; extern int old_names; +extern int old_typelib; extern int winrt_mode; extern int interpreted_mode; extern int use_abi_namespace;

1 0

Alexandre Julliard : widl: Map VT_USERDEFINED to VT_I4 for default values in typelibs.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: wine Branch: master Commit: 047b7fc293c651a11df7da58eb6fab33bfc5931a URL: https://gitlab.winehq.org/wine/wine/-/commit/047b7fc293c651a11df7da58eb6fab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 4 20:44:21 2024 +0200 widl: Map VT_USERDEFINED to VT_I4 for default values in typelibs. --- tools/widl/write_msft.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index ce99c23f16a..31e340e6bcd 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1229,6 +1229,9 @@ static void write_default_value(msft_typelib_t *typelib, type_t *type, expr_t *e case VT_UINT: case VT_HRESULT: break; + case VT_USERDEFINED: + vt = VT_I4; + break; case VT_VARIANT: { switch (expr->type) { case EXPR_DOUBLE:

1 0

Giovanni Mascellani : ci: Make llvmpipe from Mesa 24.0.3 available in the CI image.
by Alexandre Julliard April 3, 2024

April 3, 2024

Module: vkd3d Branch: master Commit: b3ce73984d8a16de6d38ee8b05400aab4d0c4367 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b3ce73984d8a16de6d38ee8b05400… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Mar 28 13:52:59 2024 +0100 ci: Make llvmpipe from Mesa 24.0.3 available in the CI image. --- gitlab/README | 17 ++++++++++++++++- gitlab/image.docker | 15 +++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/gitlab/README b/gitlab/README index 3b520323..94cbde4e 100644 --- a/gitlab/README +++ b/gitlab/README @@ -8,7 +8,22 @@ the vkd3d tests on each merge request. The CI target image-linux, in the file image.yml, builds a Docker image based on Debian bookworm with all the packages required for testing, and uploads it to the GitLab container registry. The Docker -script is in the file image.docker. +script is in the file image.docker. Most of the dependencies are +installed directly from the Debian repositories, with a few +exceptions: + + * widl is compiled from Wine sources, because installing it from the + Debian repositories would carry all the rest of Wine and make the + Docker image quite larger; + + * SPIRV-Tools are recompiled from sources, because the packages in + Debian do not ship shared objects and are not multiarch-compatible; + in order to make the packages multiarch-compatible, the utilities + are dropped (they're not used by the CI anyway); + + * llvmpipe from Mesa 24.0.1 is compiled (in addition to version + 22.3.6 available in Debian bookworm), because some Vulkan features + required by vkd3d are not available in Mesa 22.3.6. The file build.yml contains the actual testing targets. Currently vkd3d is tested on Linux, on x86-64 and i386, each architecture with diff --git a/gitlab/image.docker b/gitlab/image.docker index 270c509b..fb3ed626 100644 --- a/gitlab/image.docker +++ b/gitlab/image.docker @@ -23,6 +23,8 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ apt-get install -y build-essential pkg-config gcc-mingw-w64 crossbuild-essential-i386 \ autoconf automake libtool flex bison curl \ git ca-certificates rsync \ + llvm-15-dev meson ninja-build python3-mako \ + zlib1g-dev libexpat-dev libdrm-dev libglvnd-dev \ doxygen doxygen-latex graphviz \ mesa-vulkan-drivers mesa-vulkan-drivers:i386 \ vulkan-tools spirv-headers \ @@ -36,6 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ libxcb-keysyms1-dev libxcb-keysyms1-dev:i386 && \ apt-get build-dep -y spirv-tools && \ apt-get build-dep -y -ai386 spirv-tools && \ + git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git && \ cd wine && \ mkdir build && \ @@ -45,6 +48,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ cp tools/widl/widl /usr/local/bin && \ cd ../.. && \ rm -rf wine && \ + apt-get source spirv-tools && \ cd spirv-tools-* && \ sed -i -e 's|-DBUILD_SHARED_LIBS=OFF|-DBUILD_SHARED_LIBS=ON|g' debian/rules && \ @@ -55,6 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ rm -f spirv-tools-dbgsym_*.deb && \ dpkg -i spirv-tools_*.deb && \ rm -fr * && \ + apt-get source spirv-tools && \ cd spirv-tools-* && \ sed -i -e 's|-DBUILD_SHARED_LIBS=OFF|-DBUILD_SHARED_LIBS=ON|g' debian/rules && \ @@ -65,6 +70,16 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ rm -f spirv-tools-dbgsym_*.deb && \ dpkg -i spirv-tools_*.deb && \ rm -fr * && \ + + git clone --depth 1 --branch mesa-24.0.3 https://gitlab.freedesktop.org/mesa/mesa.git && \ + cd mesa && \ + mkdir build && \ + cd build && \ + meson setup -Dprefix=/opt/mesa24 -Dplatforms= -Dvideo-codecs= -Dvulkan-drivers=swrast -Dgallium-drivers=swrast -Dopengl=true -Degl=enabled -Dglvnd=true -Dshared-glapi=enabled -Dglx=disabled -Dgles1=disabled -Dgles2=disabled .. && \ + meson install && \ + cd ../.. && \ + rm -fr mesa && \ + apt-get clean && \ curl -L -s https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2… | tar zx -C /usr/local ./lib/libdxcompiler.so ./lib/libdxil.so && \ groupadd host-render -g 800 && \

1 0

Giovanni Mascellani : ci: Run tests on llvmpipe from Mesa 24.0.3.
by Alexandre Julliard April 3, 2024

April 3, 2024

Module: vkd3d Branch: master Commit: 636d8d385035a235a4bd99774a7623f9f400445d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/636d8d385035a235a4bd99774a762… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Mar 28 14:19:18 2024 +0100 ci: Run tests on llvmpipe from Mesa 24.0.3. --- gitlab/build-linux | 2 +- gitlab/build.yml | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gitlab/build-linux b/gitlab/build-linux index 532a462a..b149132c 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -11,7 +11,7 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -export LD_LIBRARY_PATH=/usr/local/lib +export LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH-}" if ../configure --enable-demos --with-spirv-tools DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL -DVKD3D_SHADER_UNSUPPORTED_GLSL" && \ make -j$(nproc) ; then make -j$(nproc) AM_COLOR_TESTS=always check || \ diff --git a/gitlab/build.yml b/gitlab/build.yml index af68e9ef..fb8a6879 100644 --- a/gitlab/build.yml +++ b/gitlab/build.yml @@ -61,6 +61,17 @@ build-llvmpipe-32: CC: 'i686-linux-gnu-gcc' VKD3D_SHADER_CONFIG: 'force_validation' +build-llvmpipe-64-mesa24: + extends: .build-linux + allow_failure: + exit_codes: + - 2 + variables: + VK_DRIVER_FILES: '/opt/mesa24/share/vulkan/icd.d/lvp_icd.x86_64.json' + LD_LIBRARY_PATH: '/opt/mesa24/lib/x86_64-linux-gnu' + __EGL_VENDOR_LIBRARY_FILENAMES: '/opt/mesa24/share/glvnd/egl_vendor.d/50_mesa.json' + VKD3D_SHADER_CONFIG: 'force_validation' + build-crosstest: stage: build rules:

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Allow 'export' modifier on functions.
by Alexandre Julliard April 3, 2024

April 3, 2024

Module: vkd3d Branch: master Commit: 4b0a328a2b58a86e3529ddcc2cdc785a08625f81 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4b0a328a2b58a86e3529ddcc2cdc7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 31 15:36:00 2024 +0200 vkd3d-shader/hlsl: Allow 'export' modifier on functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.l | 1 + libs/vkd3d-shader/hlsl.y | 9 +++++++-- tests/hlsl/function.shader_test | 12 ++++++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 16ddbf3c..f5a38a29 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -375,6 +375,7 @@ struct hlsl_attribute #define HLSL_STORAGE_NOPERSPECTIVE 0x00008000 #define HLSL_STORAGE_LINEAR 0x00010000 #define HLSL_MODIFIER_SINGLE 0x00020000 +#define HLSL_MODIFIER_EXPORT 0x00040000 #define HLSL_TYPE_MODIFIERS_MASK (HLSL_MODIFIER_PRECISE | HLSL_MODIFIER_VOLATILE | \ HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 600e2cf2..88b917ef 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -88,6 +88,7 @@ DomainShader {return KW_DOMAINSHADER; } do {return KW_DO; } double {return KW_DOUBLE; } else {return KW_ELSE; } +export {return KW_EXPORT; } extern {return KW_EXTERN; } false {return KW_FALSE; } for {return KW_FOR; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9135fb7a..e02e0c54 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5341,6 +5341,7 @@ static void validate_uav_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, %token KW_DOMAINSHADER %token KW_DOUBLE %token KW_ELSE +%token KW_EXPORT %token KW_EXTERN %token KW_FALSE %token KW_FOR @@ -5969,9 +5970,9 @@ func_prototype_no_attrs: /* Functions are unconditionally inlined. */ modifiers &= ~HLSL_MODIFIER_INLINE; - if (modifiers & ~HLSL_MODIFIERS_MAJORITY_MASK) + if (modifiers & ~(HLSL_MODIFIERS_MAJORITY_MASK | HLSL_MODIFIER_EXPORT)) hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Only majority modifiers are allowed on functions."); + "Unexpected modifier used on a function."); if (!(type = apply_type_modifiers(ctx, $2, &modifiers, true, &@1))) YYABORT; if ((var = hlsl_get_var(ctx->globals, $3))) @@ -6868,6 +6869,10 @@ var_modifiers: { $$ = add_modifiers(ctx, $2, HLSL_MODIFIER_INLINE, &@1); } + | KW_EXPORT var_modifiers + { + $$ = add_modifiers(ctx, $2, HLSL_MODIFIER_EXPORT, &@1); + } | var_identifier var_modifiers { if (!strcmp($1, "precise")) diff --git a/tests/hlsl/function.shader_test b/tests/hlsl/function.shader_test index dbe9d3a3..7743ee1f 100644 --- a/tests/hlsl/function.shader_test +++ b/tests/hlsl/function.shader_test @@ -333,3 +333,15 @@ inline float4 main() : sv_target [test] todo(glsl) draw quad probe all rgba (2.0, 3.0, 6.0, 7.0) + +% Export modifier + +[pixel shader] +export float4 main() : sv_target +{ + return float4(1.0, 2.0, 3.0, 4.0); +} + +[test] +todo(glsl) draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0)

1 0