December 2023 - Wine-commits

Alexandre Julliard : msvcrt: Add a stub ARM64EC CPU backend.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: 457a6fd4b468772d15d2abb80d4ead472944dab8 URL: https://gitlab.winehq.org/wine/wine/-/commit/457a6fd4b468772d15d2abb80d4ead… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 7 14:49:51 2023 +0100 msvcrt: Add a stub ARM64EC CPU backend. --- dlls/crtdll/Makefile.in | 1 + dlls/msvcr100/Makefile.in | 1 + dlls/msvcr110/Makefile.in | 1 + dlls/msvcr120/Makefile.in | 1 + dlls/msvcr70/Makefile.in | 1 + dlls/msvcr71/Makefile.in | 1 + dlls/msvcr80/Makefile.in | 1 + dlls/msvcr90/Makefile.in | 1 + dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/except_arm64ec.c | 158 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/except_x86_64.c | 2 +- dlls/msvcrtd/Makefile.in | 1 + dlls/ucrtbase/Makefile.in | 1 + 13 files changed, 170 insertions(+), 1 deletion(-) diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in index b2559f3b91e..40b12eba29a 100644 --- a/dlls/crtdll/Makefile.in +++ b/dlls/crtdll/Makefile.in @@ -15,6 +15,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index 71bd580a6e7..09939efe08f 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -17,6 +17,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in index a397b04efa2..d3795cecd7c 100644 --- a/dlls/msvcr110/Makefile.in +++ b/dlls/msvcr110/Makefile.in @@ -17,6 +17,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index ea9df276926..5954973cfec 100644 --- a/dlls/msvcr120/Makefile.in +++ b/dlls/msvcr120/Makefile.in @@ -17,6 +17,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/msvcr70/Makefile.in b/dlls/msvcr70/Makefile.in index a1d8bf0f001..7979542caa2 100644 --- a/dlls/msvcr70/Makefile.in +++ b/dlls/msvcr70/Makefile.in @@ -16,6 +16,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/msvcr71/Makefile.in b/dlls/msvcr71/Makefile.in index 6da68524dc6..2dfa5478544 100644 --- a/dlls/msvcr71/Makefile.in +++ b/dlls/msvcr71/Makefile.in @@ -16,6 +16,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index c6d2bb884f3..1bbabee0dac 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -16,6 +16,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in index f86dfa18105..fb6047297e7 100644 --- a/dlls/msvcr90/Makefile.in +++ b/dlls/msvcr90/Makefile.in @@ -16,6 +16,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in index 7dd1f9ed1a8..aa068b62e51 100644 --- a/dlls/msvcrt/Makefile.in +++ b/dlls/msvcrt/Makefile.in @@ -21,6 +21,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/msvcrt/except_arm64ec.c b/dlls/msvcrt/except_arm64ec.c new file mode 100644 index 00000000000..f098449892a --- /dev/null +++ b/dlls/msvcrt/except_arm64ec.c @@ -0,0 +1,158 @@ +/* + * msvcrt C++ exception handling + * + * Copyright 2011 Alexandre Julliard + * Copyright 2013 André Hentschel + * Copyright 2017 Martin Storsjo + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __arm64ec__ + +#include <setjmp.h> +#include <stdarg.h> +#include <fpieee.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "msvcrt.h" +#include "wine/exception.h" +#include "excpt.h" +#include "wine/debug.h" + +#include "cppexcept.h" + +WINE_DEFAULT_DEBUG_CHANNEL(seh); + +/********************************************************************* + * __CxxExceptionFilter (MSVCRT.@) + */ +int CDECL __CxxExceptionFilter( PEXCEPTION_POINTERS ptrs, + const type_info *ti, int flags, void **copy ) +{ + FIXME( "%p %p %x %p: not implemented\n", ptrs, ti, flags, copy ); + return EXCEPTION_CONTINUE_SEARCH; +} + +/********************************************************************* + * __CxxFrameHandler (MSVCRT.@) + */ +EXCEPTION_DISPOSITION CDECL __CxxFrameHandler( EXCEPTION_RECORD *rec, ULONG64 frame, CONTEXT *context, + DISPATCHER_CONTEXT *dispatch ) +{ + FIXME("%p %I64x %p %p: not implemented\n", rec, frame, context, dispatch); + return ExceptionContinueSearch; +} + + +/********************************************************************* + * __CppXcptFilter (MSVCRT.@) + */ +int CDECL __CppXcptFilter( NTSTATUS ex, PEXCEPTION_POINTERS ptr ) +{ + /* only filter c++ exceptions */ + if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; + return _XcptFilter(ex, ptr); +} + + +/********************************************************************* + * __CxxDetectRethrow (MSVCRT.@) + */ +BOOL CDECL __CxxDetectRethrow( PEXCEPTION_POINTERS ptrs ) +{ + PEXCEPTION_RECORD rec; + + if (!ptrs) + return FALSE; + + rec = ptrs->ExceptionRecord; + + if (rec->ExceptionCode == CXX_EXCEPTION && + rec->NumberParameters == 3 && + rec->ExceptionInformation[0] == CXX_FRAME_MAGIC_VC6 && + rec->ExceptionInformation[2]) + { + ptrs->ExceptionRecord = msvcrt_get_thread_data()->exc_record; + return TRUE; + } + return (msvcrt_get_thread_data()->exc_record == rec); +} + + +/********************************************************************* + * __CxxQueryExceptionSize (MSVCRT.@) + */ +unsigned int CDECL __CxxQueryExceptionSize(void) +{ + return sizeof(cxx_exception_type); +} + + +/******************************************************************* + * _setjmp (MSVCRT.@) + */ +int __attribute__((naked)) MSVCRT__setjmp( jmp_buf buf ) +{ + asm( "b " __ASM_NAME("__wine_setjmpex") ); +} + + +/******************************************************************* + * longjmp (MSVCRT.@) + */ +void __cdecl MSVCRT_longjmp( _JUMP_BUFFER *jmp, int retval ) +{ + EXCEPTION_RECORD rec; + + if (!retval) retval = 1; + if (jmp->Frame) + { + rec.ExceptionCode = STATUS_LONGJUMP; + rec.ExceptionFlags = 0; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = NULL; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = (DWORD_PTR)jmp; + RtlUnwind( (void *)jmp->Frame, (void *)jmp->Rip, &rec, IntToPtr(retval) ); + } + __wine_longjmp( (__wine_jmp_buf *)jmp, retval ); +} + +/********************************************************************* + * _fpieee_flt (MSVCRT.@) + */ +int __cdecl _fpieee_flt( __msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, + int (__cdecl *handler)(_FPIEEE_RECORD*) ) +{ + FIXME("(%lx %p %p)\n", exception_code, ep, handler); + return EXCEPTION_CONTINUE_SEARCH; +} + +#if _MSVCR_VER>=110 && _MSVCR_VER<=120 +/********************************************************************* + * __crtCapturePreviousContext (MSVCR110.@) + */ +void __cdecl __crtCapturePreviousContext( CONTEXT *ctx ) +{ + FIXME("not implemented\n"); +} +#endif + +#endif /* __arm64ec__ */ diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index b07a7b83772..9b8db6d0d67 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifdef __x86_64__ +#if defined(__x86_64__) && !defined(__arm64ec__) #include <setjmp.h> #include <stdarg.h> diff --git a/dlls/msvcrtd/Makefile.in b/dlls/msvcrtd/Makefile.in index 8bfae2270f8..a06a244747e 100644 --- a/dlls/msvcrtd/Makefile.in +++ b/dlls/msvcrtd/Makefile.in @@ -17,6 +17,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index 433ca5d4b48..a3bb54750af 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -21,6 +21,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic Unary.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: a33a9127cacfa92475453adb981ab3ec741a56af URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a33a9127cacfa92475453adb981ab… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Nov 27 13:29:14 2023 +1000 vkd3d-shader/dxil: Implement DX intrinsic Unary. --- libs/vkd3d-shader/dxil.c | 153 +++++++++++++++++++++++++++++++++++++-- tests/hlsl/ceil.shader_test | 6 +- tests/hlsl/ddxddy.shader_test | 8 +- tests/hlsl/distance.shader_test | 2 +- tests/hlsl/exp.shader_test | 4 +- tests/hlsl/floor.shader_test | 6 +- tests/hlsl/frac.shader_test | 2 +- tests/hlsl/ldexp.shader_test | 4 +- tests/hlsl/length.shader_test | 6 +- tests/hlsl/lit.shader_test | 8 +- tests/hlsl/log.shader_test | 6 +- tests/hlsl/normalize.shader_test | 4 +- tests/hlsl/pow.shader_test | 2 +- tests/hlsl/round.shader_test | 6 +- tests/hlsl/sqrt.shader_test | 4 +- tests/hlsl/trunc.shader_test | 8 +- 16 files changed, 185 insertions(+), 44 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/dxil: Apply metadata attachments to instructions.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: 1630fd9a3c10a31850bf877d73f88169e617cef8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1630fd9a3c10a31850bf877d73f88… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Nov 27 16:55:29 2023 +1000 vkd3d-shader/dxil: Apply metadata attachments to instructions. These are apparently only used for 'dx.op' intrinsics, because the instructions based on native LLVM ones have their own way to apply attributes. --- libs/vkd3d-shader/dxil.c | 217 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 218 insertions(+)

1 0

Conor McCarthy : vkd3d-shader/dxil: Set the result register data type for nop casts.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: a4a1b4c5579f7bfeb9366d2772bcecf5d82042ee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a4a1b4c5579f7bfeb9366d2772bce… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Nov 29 14:38:50 2023 +1000 vkd3d-shader/dxil: Set the result register data type for nop casts. Casts from minimum precision types are emitted as nop, but the result value type must be set to the cast result type. --- libs/vkd3d-shader/dxil.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 0652df91..a1065c8b 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -3885,6 +3885,9 @@ static void sm6_parser_emit_cast(struct sm6_parser *sm6, const struct dxil_recor if (handler_idx == VKD3DSIH_NOP) { dst->u.reg = value->u.reg; + /* Set the result type for casts from 16-bit min precision. */ + if (type->u.width != 16) + dst->u.reg.data_type = vkd3d_data_type_from_sm6_type(type); return; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Avoid shadowing "load" in lower_index_loads().
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: 46e135f6a7f7a07069fed7593e7a8e4d795656d9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/46e135f6a7f7a07069fed7593e7a8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Apr 30 17:40:04 2023 -0500 vkd3d-shader/hlsl: Avoid shadowing "load" in lower_index_loads(). Found with -Wshadow. --- libs/vkd3d-shader/hlsl_codegen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 4a622185..6a7545da 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1090,7 +1090,7 @@ static bool lower_index_loads(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, unsigned int dim_count = hlsl_sampler_dim_count(val->data_type->sampler_dim); struct hlsl_ir_node *coords = index->idx.node; struct hlsl_resource_load_params params = {0}; - struct hlsl_ir_node *load; + struct hlsl_ir_node *resource_load; assert(coords->data_type->class == HLSL_CLASS_VECTOR); assert(coords->data_type->base_type == HLSL_TYPE_UINT); @@ -1104,9 +1104,9 @@ static bool lower_index_loads(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, params.coords = coords; params.format = val->data_type->e.resource_format; - if (!(load = hlsl_new_resource_load(ctx, &params, &instr->loc))) + if (!(resource_load = hlsl_new_resource_load(ctx, &params, &instr->loc))) return false; - hlsl_block_add_instr(block, load); + hlsl_block_add_instr(block, resource_load); return true; }

1 0

Zebediah Figura : tests: Avoid shadowing "l" in test_get_copyable_footprints().
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: fcd6ec33bd6bdc314cc2577bbf2e6bcec1b4c05d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fcd6ec33bd6bdc314cc2577bbf2e6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Apr 30 17:42:05 2023 -0500 tests: Avoid shadowing "l" in test_get_copyable_footprints(). Found with -Wshadow. --- tests/d3d12.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 91e91608..49e3a840 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -19893,7 +19893,7 @@ static void test_get_copyable_footprints(void) uint64_t row_sizes[10], total_size; D3D12_RESOURCE_DESC resource_desc; unsigned int sub_resource_count; - unsigned int i, j, k, l; + unsigned int i, j, k; ID3D12Device *device; UINT row_counts[10]; ULONG refcount; @@ -20090,7 +20090,7 @@ static void test_get_copyable_footprints(void) check_copyable_footprints(&resource_desc, 0, sub_resource_count, base_offsets[k], NULL, NULL, NULL, &total_size); - for (l = 0; l < sub_resource_count; ++l) + for (unsigned int l = 0; l < sub_resource_count; ++l) { vkd3d_test_push_context("sub-resource %u", l);

1 0

Zebediah Figura : vkd3d-shader/d3dbc: Avoid shadowing "instr" in write_sm1_jump().
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: ca8492c85556f9d79fa9d97fd3f16efb876c5cf5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ca8492c85556f9d79fa9d97fd3f16… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 28 12:31:58 2023 -0500 vkd3d-shader/d3dbc: Avoid shadowing "instr" in write_sm1_jump(). --- libs/vkd3d-shader/d3dbc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 3d139416..c78ffeba 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2253,7 +2253,7 @@ static void write_sm1_jump(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b { struct hlsl_reg *reg = &jump->condition.node->reg; - struct sm1_instruction instr = + struct sm1_instruction sm1_instr = { .opcode = D3DSIO_TEXKILL, @@ -2263,7 +2263,7 @@ static void write_sm1_jump(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b .has_dst = 1, }; - write_sm1_instruction(ctx, buffer, &instr); + write_sm1_instruction(ctx, buffer, &sm1_instr); break; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Avoid shadowing "block" in resolve_loop_continue().
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: a102e99897847c46b0c752ac4ed36c7903355029 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a102e99897847c46b0c752ac4ed36… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 28 12:32:17 2023 -0500 vkd3d-shader/hlsl: Avoid shadowing "block" in resolve_loop_continue(). --- libs/vkd3d-shader/hlsl.y | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 0dde4c18..d0210b82 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -487,27 +487,27 @@ static void resolve_loop_continue(struct hlsl_ctx *ctx, struct hlsl_block *block else if (instr->type == HLSL_IR_JUMP) { struct hlsl_ir_jump *jump = hlsl_ir_jump(instr); - struct hlsl_block block; + struct hlsl_block cond_block; if (jump->type != HLSL_IR_JUMP_UNRESOLVED_CONTINUE) continue; if (type == LOOP_DO_WHILE) { - if (!hlsl_clone_block(ctx, &block, cond)) + if (!hlsl_clone_block(ctx, &cond_block, cond)) return; - if (!append_conditional_break(ctx, &block)) + if (!append_conditional_break(ctx, &cond_block)) { - hlsl_block_cleanup(&block); + hlsl_block_cleanup(&cond_block); return; } - list_move_before(&instr->entry, &block.instrs); + list_move_before(&instr->entry, &cond_block.instrs); } else if (type == LOOP_FOR) { - if (!hlsl_clone_block(ctx, &block, iter)) + if (!hlsl_clone_block(ctx, &cond_block, iter)) return; - list_move_before(&instr->entry, &block.instrs); + list_move_before(&instr->entry, &cond_block.instrs); } jump->type = HLSL_IR_JUMP_CONTINUE; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Avoid shadowing "load" in intrinsic_tex().
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: 98a02ceffb433b342d075c6aef54cf9bb946cf11 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/98a02ceffb433b342d075c6aef54c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 28 12:32:29 2023 -0500 vkd3d-shader/hlsl: Avoid shadowing "load" in intrinsic_tex(). --- libs/vkd3d-shader/hlsl.y | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d0210b82..ed053f16 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3553,7 +3553,7 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer * { struct hlsl_resource_load_params load_params = { 0 }; const struct hlsl_type *sampler_type; - struct hlsl_ir_node *coords, *load; + struct hlsl_ir_node *coords, *sample; if (params->args_count != 2 && params->args_count != 4) { @@ -3688,9 +3688,9 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer * load_params.format = hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, 4); load_params.sampling_dim = dim; - if (!(load = hlsl_new_resource_load(ctx, &load_params, loc))) + if (!(sample = hlsl_new_resource_load(ctx, &load_params, loc))) return false; - hlsl_block_add_instr(params->instrs, load); + hlsl_block_add_instr(params->instrs, sample); return true; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Avoid shadowing "jump" in normalize_switch_cases().
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: dfea1abbd8eb4635fc722a9f605ec8e9ea69fa01 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dfea1abbd8eb4635fc722a9f605ec… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 24 17:25:21 2023 -0600 vkd3d-shader/hlsl: Avoid shadowing "jump" in normalize_switch_cases(). --- libs/vkd3d-shader/hlsl_codegen.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 6a7545da..88cbef61 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2301,7 +2301,6 @@ static bool normalize_switch_cases(struct hlsl_ctx *ctx, struct hlsl_ir_node *in struct hlsl_ir_switch_case *c, *def = NULL; bool missing_terminal_break = false; struct hlsl_ir_node *node; - struct hlsl_ir_jump *jump; struct hlsl_ir_switch *s; if (instr->type != HLSL_IR_SWITCH) @@ -2320,10 +2319,7 @@ static bool normalize_switch_cases(struct hlsl_ctx *ctx, struct hlsl_ir_node *in { node = LIST_ENTRY(list_tail(&c->body.instrs), struct hlsl_ir_node, entry); if (node->type == HLSL_IR_JUMP) - { - jump = hlsl_ir_jump(node); - terminal_break = jump->type == HLSL_IR_JUMP_BREAK; - } + terminal_break = (hlsl_ir_jump(node)->type == HLSL_IR_JUMP_BREAK); } missing_terminal_break |= !terminal_break;

1 0