January 2024 - Wine-Commits

Conor McCarthy : vkd3d-shader/spirv: Handle RETP in spirv_compiler_handle_instruction().
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: vkd3d Branch: master Commit: f3d464de0e5b6c46b5cbfb1aa2e25836bf0411d7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f3d464de0e5b6c46b5cbfb1aa2e25… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Dec 12 16:10:12 2023 +1000 vkd3d-shader/spirv: Handle RETP in spirv_compiler_handle_instruction(). --- libs/vkd3d-shader/spirv.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a8fe645a..9492811a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7972,10 +7972,6 @@ static int spirv_compiler_emit_control_flow_instruction(struct spirv_compiler *c compiler->main_block_open = false; break; - case VKD3DSIH_RETP: - spirv_compiler_emit_retc(compiler, instruction); - break; - default: ERR("Unexpected instruction %#x.\n", instruction->handler_idx); break; @@ -9741,10 +9737,12 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_IF: case VKD3DSIH_LOOP: case VKD3DSIH_RET: - case VKD3DSIH_RETP: case VKD3DSIH_SWITCH: ret = spirv_compiler_emit_control_flow_instruction(compiler, instruction); break; + case VKD3DSIH_RETP: + spirv_compiler_emit_retc(compiler, instruction); + break; case VKD3DSIH_DISCARD: case VKD3DSIH_TEXKILL: spirv_compiler_emit_kill(compiler, instruction);

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle DISCARD and TEXKILL in spirv_compiler_handle_instruction().
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: vkd3d Branch: master Commit: bc1b5e71320c9e26462cc7ab2e9ee4acdc67691e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bc1b5e71320c9e26462cc7ab2e9ee… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Dec 12 16:07:05 2023 +1000 vkd3d-shader/spirv: Handle DISCARD and TEXKILL in spirv_compiler_handle_instruction(). --- libs/vkd3d-shader/spirv.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9f63d678..a8fe645a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7976,11 +7976,6 @@ static int spirv_compiler_emit_control_flow_instruction(struct spirv_compiler *c spirv_compiler_emit_retc(compiler, instruction); break; - case VKD3DSIH_DISCARD: - case VKD3DSIH_TEXKILL: - spirv_compiler_emit_kill(compiler, instruction); - break; - default: ERR("Unexpected instruction %#x.\n", instruction->handler_idx); break; @@ -9739,7 +9734,6 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_CONTINUE: case VKD3DSIH_CONTINUEP: case VKD3DSIH_DEFAULT: - case VKD3DSIH_DISCARD: case VKD3DSIH_ELSE: case VKD3DSIH_ENDIF: case VKD3DSIH_ENDLOOP: @@ -9749,9 +9743,12 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_RET: case VKD3DSIH_RETP: case VKD3DSIH_SWITCH: - case VKD3DSIH_TEXKILL: ret = spirv_compiler_emit_control_flow_instruction(compiler, instruction); break; + case VKD3DSIH_DISCARD: + case VKD3DSIH_TEXKILL: + spirv_compiler_emit_kill(compiler, instruction); + break; case VKD3DSIH_DSX: case VKD3DSIH_DSX_COARSE: case VKD3DSIH_DSX_FINE:

1 0

Tag wine-9.0 : Alexandre Julliard : Release 9.0
by Alexandre Julliard Jan. 16, 2024

Jan. 16, 2024

Module: wine Branch: refs/tags/wine-9.0 Tag: a9cb627f1d67a24bfa4bce18281558dc6759c51a URL: https://gitlab.winehq.org/wine/wine/-/tags/a9cb627f1d67a24bfa4bce18281558dc… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 16 21:55:47 2024 +0100 Release 9.0

1 0

Alexandre Julliard : Release 9.0.
by Alexandre Julliard Jan. 16, 2024

Jan. 16, 2024

Module: wine Branch: master Commit: fd1153552d779e1ac14b0b1c48fbd1cde894eb0a URL: https://gitlab.winehq.org/wine/wine/-/commit/fd1153552d779e1ac14b0b1c48fbd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 16 21:55:47 2024 +0100 Release 9.0. --- ANNOUNCE.md | 404 +++++++++++++++++++++++++++++++++++++++++++++++------------- VERSION | 2 +- configure | 18 +-- 3 files changed, 326 insertions(+), 98 deletions(-)

1 0

Rémi Bernon : gitlab: Add key to the jobs ccache cache config.
by Alexandre Julliard Jan. 15, 2024

Jan. 15, 2024

Module: wine Branch: master Commit: 3d4ee138ec5a87ec04be6c9374d91dcda666c019 URL: https://gitlab.winehq.org/wine/wine/-/commit/3d4ee138ec5a87ec04be6c9374d91d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 15 14:35:54 2024 +0100 gitlab: Add key to the jobs ccache cache config. To avoid jobs with different compilers overwriting each other. --- tools/gitlab/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 9e5ce467e96..66daf518386 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -7,7 +7,8 @@ variables: GIT_DEPTH: 0 cache: - - paths: + - key: $CI_JOB_NAME-ccache + paths: - ccache/ - key: files:

1 0

Rémi Bernon : gitlab: Use a common configure cache key prefix.
by Alexandre Julliard Jan. 15, 2024

Jan. 15, 2024

Module: wine Branch: master Commit: 2d9f5bea79da044a3077f6fbfb35f25301b4b098 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d9f5bea79da044a3077f6fbfb35f2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 15 14:22:17 2024 +0100 gitlab: Use a common configure cache key prefix. Partially reverts commit 67f2da2a8d1f219f528bf820b3d6002c5f34d5e4 which broke ccache cache as the job configurations were overriding the default cache configuration from .wine-build instead of extending it. --- tools/gitlab/build-clang | 2 +- tools/gitlab/build.yml | 30 +++++++++--------------------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/tools/gitlab/build-clang b/tools/gitlab/build-clang index b93bdf146f3..3ed87b3b173 100755 --- a/tools/gitlab/build-clang +++ b/tools/gitlab/build-clang @@ -9,7 +9,7 @@ set -Eeuxo pipefail ./tools/make_makefiles autoreconf -f -cd build +cd build64 ../configure -q -C --enable-archs=i386,x86_64,aarch64 --with-mingw=clang make -s -j$(nproc) cd .. diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 9337d6c3b43..9e5ce467e96 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -9,6 +9,13 @@ cache: - paths: - ccache/ + - key: + files: + - configure.ac + prefix: $CI_JOB_NAME-config + paths: + - build32/config.cache + - build64/config.cache before_script: - export BASEDIR="$PWD" - export CCACHE_BASEDIR="$BASEDIR" @@ -28,13 +35,6 @@ build-linux: expire_in: 1 day paths: - usr/local/ - cache: - - key: - files: - - configure.ac - paths: - - build32/config.cache - - build64/config.cache script: - mkdir -p build32 build64 - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-linux @@ -45,14 +45,8 @@ build-clang: extends: .wine-build rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - cache: - - key: - files: - - configure.ac - paths: - - build/config.cache script: - - mkdir -p build + - mkdir -p build32 build64 - ./tools/gitlab/build-clang build-mac: @@ -61,13 +55,6 @@ build-mac: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' tags: - mac - cache: - - key: - files: - - configure.ac - paths: - - build32/config.cache - - build64/config.cache artifacts: when: on_failure paths: @@ -107,6 +94,7 @@ build-daily-linux: paths: - usr/local/ script: + - mkdir -p build32 build64 - ./tools/gitlab/build-linux build-daily-winetest:

1 0

Henri Verbeet : vkd3d-shader/tpf: Store the "recognized_bits" mask as a uint32_t in shader_sm4_read_instruction_modifier().
by Alexandre Julliard Jan. 15, 2024

Jan. 15, 2024

Module: vkd3d Branch: master Commit: ad2af68d2aaa4c8eff1893be0bf55018f2fa8f85 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ad2af68d2aaa4c8eff1893be0bf55… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 10 22:46:09 2024 +0100 vkd3d-shader/tpf: Store the "recognized_bits" mask as a uint32_t in shader_sm4_read_instruction_modifier(). --- libs/vkd3d-shader/tpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index c7b19a09..40bd91e5 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2250,7 +2250,7 @@ static void shader_sm4_read_instruction_modifier(uint32_t modifier, struct vkd3d { case VKD3D_SM4_MODIFIER_AOFFIMMI: { - static const DWORD recognized_bits = VKD3D_SM4_INSTRUCTION_MODIFIER + static const uint32_t recognized_bits = VKD3D_SM4_INSTRUCTION_MODIFIER | VKD3D_SM4_MODIFIER_MASK | VKD3D_SM4_AOFFIMMI_U_MASK | VKD3D_SM4_AOFFIMMI_V_MASK

1 0

Henri Verbeet : vkd3d-shader/tpf: Store the current token as a uint32_t in shader_sm4_read_src_param().
by Alexandre Julliard Jan. 15, 2024

Jan. 15, 2024

Module: vkd3d Branch: master Commit: fd854bc0c09d2b0f81926547a508836b810acc3b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fd854bc0c09d2b0f81926547a5088… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 10 17:10:07 2024 +0100 vkd3d-shader/tpf: Store the current token as a uint32_t in shader_sm4_read_src_param(). --- libs/vkd3d-shader/tpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 5c95c363..74e086c3 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2075,7 +2075,7 @@ static bool shader_sm4_read_src_param(struct vkd3d_shader_sm4_parser *priv, cons const uint32_t *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param) { unsigned int dimension, mask; - DWORD token; + uint32_t token; if (*ptr >= end) {

1 0

Henri Verbeet : vkd3d-shader/tpf: Store the current token as a uint32_t in shader_sm4_read_dst_param().
by Alexandre Julliard Jan. 15, 2024

Jan. 15, 2024

Module: vkd3d Branch: master Commit: b8903f55269186f016cfa5fc9b8c12735791989f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b8903f55269186f016cfa5fc9b8c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 10 22:43:57 2024 +0100 vkd3d-shader/tpf: Store the current token as a uint32_t in shader_sm4_read_dst_param(). --- libs/vkd3d-shader/tpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 74e086c3..c7b19a09 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2162,7 +2162,7 @@ static bool shader_sm4_read_dst_param(struct vkd3d_shader_sm4_parser *priv, cons enum vkd3d_sm4_swizzle_type swizzle_type; enum vkd3d_shader_src_modifier modifier; unsigned int dimension, swizzle; - DWORD token; + uint32_t token; if (*ptr >= end) {

1 0

Henri Verbeet : vkd3d-shader/tpf: Store the "precise" mask as a uint32_t in shader_sm4_read_instruction().
by Alexandre Julliard Jan. 15, 2024

Jan. 15, 2024

Module: vkd3d Branch: master Commit: 68b898fcb6b4ab2a9660f35edf3554465ab0efbe URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/68b898fcb6b4ab2a9660f35edf355… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 10 22:49:28 2024 +0100 vkd3d-shader/tpf: Store the "precise" mask as a uint32_t in shader_sm4_read_instruction(). --- libs/vkd3d-shader/tpf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 40bd91e5..1f1944bc 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2334,9 +2334,9 @@ static void shader_sm4_read_instruction(struct vkd3d_shader_sm4_parser *sm4, str struct vkd3d_shader_src_param *src_params; const uint32_t **ptr = &sm4->ptr; unsigned int i, len; - size_t remaining; const uint32_t *p; - DWORD precise; + uint32_t precise; + size_t remaining; if (*ptr >= sm4->end) {

1 0