June 2023 - Wine-Commits - list.winehq.org

Rémi Bernon : server: Use hardware message category when checking filter.
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: wine Branch: master Commit: 6ac82b2a24a8dc9c4547ba896c9313c5864795a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ac82b2a24a8dc9c4547ba896c9313… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jun 10 15:17:41 2023 +0200 server: Use hardware message category when checking filter. --- server/queue.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/server/queue.c b/server/queue.c index c3c3d595d00..57067dd6f51 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2114,19 +2114,19 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ static int check_hw_message_filter( user_handle_t win, unsigned int msg_code, user_handle_t filter_win, unsigned int first, unsigned int last ) { - if (msg_code >= WM_KEYFIRST && msg_code <= WM_KEYLAST) + switch (get_hardware_msg_bit( msg_code )) { + case QS_KEY: /* we can only test the window for a keyboard message since the * dest window for a mouse message depends on hittest */ if (filter_win && win != filter_win && !is_child_window( filter_win, win )) return 0; /* the message code is final for a keyboard message, we can simply check it */ return check_msg_filter( msg_code, first, last ); - } - else /* mouse message */ - { - /* we need to check all possible values that the message can have in the end */ + case QS_MOUSEMOVE: + case QS_MOUSEBUTTON: + /* we need to check all possible values that the message can have in the end */ if (check_msg_filter( msg_code, first, last )) return 1; if (msg_code == WM_MOUSEWHEEL) return 0; /* no other possible value for this one */ @@ -2141,6 +2141,9 @@ static int check_hw_message_filter( user_handle_t win, unsigned int msg_code, if (check_msg_filter( msg_code + (WM_NCLBUTTONDBLCLK - WM_LBUTTONDOWN), first, last )) return 1; } return 0; + + default: + return check_msg_filter( msg_code, first, last ); } }

1 0

Alexandre Julliard : include: Remove redundant __WINE_USE_MSVCRT checks.
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: wine Branch: master Commit: 93630ce14ebf16333fda8481b5ede6f587eb32ca URL: https://gitlab.winehq.org/wine/wine/-/commit/93630ce14ebf16333fda8481b5ede6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 12:06:33 2023 +0200 include: Remove redundant __WINE_USE_MSVCRT checks. --- dlls/dinput/tests/driver_hid.h | 2 +- dlls/msi/tests/custom.c | 2 +- dlls/ntoskrnl.exe/tests/utils.h | 2 +- include/msvcrt/corecrt.h | 2 +- include/winternl.h | 4 ---- programs/services/tests/service.c | 6 ------ 6 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/tests/driver_hid.h b/dlls/dinput/tests/driver_hid.h index 10a5c4c90cf..e97b4e3493b 100644 --- a/dlls/dinput/tests/driver_hid.h +++ b/dlls/dinput/tests/driver_hid.h @@ -177,7 +177,7 @@ static inline const char *debugstr_ioctl( ULONG code ) #ifndef __WINE_WINE_TEST_H -#if !defined( __WINE_USE_MSVCRT ) || defined( __MINGW32__ ) +#ifdef __MINGW32__ #define __WINE_PRINTF_ATTR( fmt, args ) __attribute__((format( printf, fmt, args ))) #else #define __WINE_PRINTF_ATTR( fmt, args ) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 5b81deb2c94..30b9040acff 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -32,7 +32,7 @@ #include <msiquery.h> #include <msidefs.h> -#if defined(__MINGW32__) || (!defined(__WINE_USE_MSVCRT) && (defined(__GNUC__) || defined(__clang__))) +#ifdef __MINGW32__ #define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) #else #define __WINE_PRINTF_ATTR(fmt,args) diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index 28fbe10c8e1..023f78b5318 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -30,7 +30,7 @@ #include <ddk/wdm.h> -#if !defined(__WINE_USE_MSVCRT) || defined(__MINGW32__) +#ifdef __MINGW32__ #define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) #else #define __WINE_PRINTF_ATTR(fmt,args) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index 9ad707824ff..945d8ac4055 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -323,7 +323,7 @@ typedef struct threadlocaleinfostruct { #define _THREADLOCALEINFO #endif -#if !defined(__WINE_USE_MSVCRT) || defined(__MINGW32__) +#ifdef __MINGW32__ #define __WINE_CRT_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) #define __WINE_CRT_SCANF_ATTR(fmt,args) __attribute__((format (scanf,fmt,args))) #else diff --git a/include/winternl.h b/include/winternl.h index df0f8dc1f84..455e199f3e1 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4823,10 +4823,6 @@ NTSYSAPI void WINAPI TpWaitForWork(TP_WORK *,BOOL); NTSYSAPI NTSTATUS WINAPI vDbgPrintEx(ULONG,ULONG,LPCSTR,__ms_va_list); NTSYSAPI NTSTATUS WINAPI vDbgPrintExWithPrefix(LPCSTR,ULONG,ULONG,LPCSTR,__ms_va_list); -#ifndef __WINE_USE_MSVCRT -NTSYSAPI int __cdecl _strnicmp(LPCSTR,LPCSTR,size_t); -#endif - /* 32-bit or 64-bit only functions */ #ifdef _WIN64 diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 99cf0838bf0..530f551b1ee 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -26,12 +26,6 @@ #include "wine/test.h" -#if !defined(__WINE_USE_MSVCRT) || defined(__MINGW32__) -#define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) -#else -#define __WINE_PRINTF_ATTR(fmt,args) -#endif - static SERVICE_STATUS_HANDLE (WINAPI *pRegisterServiceCtrlHandlerExA)(LPCSTR,LPHANDLER_FUNCTION_EX,LPVOID); static HANDLE pipe_handle = INVALID_HANDLE_VALUE;

1 0

Alex Henrie : windows.media.speech: Fix memory leak on error path in session_worker_thread_cb (scan-build).
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: wine Branch: master Commit: adccd96c2bb38e14afcb6569748027ab26da3a7b URL: https://gitlab.winehq.org/wine/wine/-/commit/adccd96c2bb38e14afcb6569748027… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jun 12 00:03:09 2023 -0600 windows.media.speech: Fix memory leak on error path in session_worker_thread_cb (scan-build). --- dlls/windows.media.speech/recognizer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index c2f386206b8..790d127fc64 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -193,7 +193,7 @@ static DWORD CALLBACK session_worker_thread_cb( void *args ) struct session *impl = impl_from_ISpeechContinuousRecognitionSession(iface); BOOLEAN running = TRUE, paused = FALSE; UINT32 frame_count, tmp_buf_size; - BYTE *audio_buf, *tmp_buf; + BYTE *audio_buf, *tmp_buf = NULL; DWORD flags, status; HANDLE events[2]; HRESULT hr; @@ -285,6 +285,7 @@ static DWORD CALLBACK session_worker_thread_cb( void *args ) error: ERR("The recognition session worker encountered a serious error and needs to stop. hr: %lx.\n", hr); + free(tmp_buf); return 1; }

1 0

Rémi Bernon : server: Pass the message code to get_hardware_msg_bit.
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: wine Branch: master Commit: 3ae2dc46484712cd2454b5aab4e82bd2c63d9ef4 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ae2dc46484712cd2454b5aab4e82b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jun 10 15:17:28 2023 +0200 server: Pass the message code to get_hardware_msg_bit. --- server/queue.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/server/queue.c b/server/queue.c index 1e2647aac27..c3c3d595d00 100644 --- a/server/queue.c +++ b/server/queue.c @@ -574,12 +574,12 @@ static inline int filter_contains_hw_range( unsigned int first, unsigned int las } /* get the QS_* bit corresponding to a given hardware message */ -static inline int get_hardware_msg_bit( struct message *msg ) +static inline int get_hardware_msg_bit( unsigned int message ) { - if (msg->msg == WM_INPUT_DEVICE_CHANGE || msg->msg == WM_INPUT) return QS_RAWINPUT; - if (msg->msg == WM_MOUSEMOVE || msg->msg == WM_NCMOUSEMOVE) return QS_MOUSEMOVE; - if (msg->msg >= WM_KEYFIRST && msg->msg <= WM_KEYLAST) return QS_KEY; - if (msg->msg == WM_WINE_CLIPCURSOR) return QS_RAWINPUT; + if (message == WM_INPUT_DEVICE_CHANGE || message == WM_INPUT) return QS_RAWINPUT; + if (message == WM_MOUSEMOVE || message == WM_NCMOUSEMOVE) return QS_MOUSEMOVE; + if (message >= WM_KEYFIRST && message <= WM_KEYLAST) return QS_KEY; + if (message == WM_WINE_CLIPCURSOR) return QS_RAWINPUT; return QS_MOUSEBUTTON; } @@ -1494,10 +1494,10 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i if (&msg->entry == &input->msg_list) return; /* not found */ /* clear the queue bit for that message */ - clr_bit = get_hardware_msg_bit( msg ); + clr_bit = get_hardware_msg_bit( msg->msg ); LIST_FOR_EACH_ENTRY( other, &input->msg_list, struct message, entry ) { - if (other != msg && get_hardware_msg_bit( other ) == clr_bit) + if (other != msg && get_hardware_msg_bit( other->msg ) == clr_bit) { clr_bit = 0; break; @@ -1556,7 +1556,7 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru *thread = NULL; *msg_code = msg->msg; - switch (get_hardware_msg_bit( msg )) + switch (get_hardware_msg_bit( msg->msg )) { case QS_RAWINPUT: if (!(win = msg->win) && input) win = input->focus; @@ -1620,7 +1620,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg last_input_time = get_tick_count(); if (msg->msg != WM_MOUSEMOVE) always_queue = 1; - switch (get_hardware_msg_bit( msg )) + switch (get_hardware_msg_bit( msg->msg )) { case QS_KEY: if (queue_hotkey_message( desktop, msg )) return; @@ -1669,7 +1669,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg { msg->unique_id = 0; /* will be set once we return it to the app */ list_add_tail( &input->msg_list, &msg->entry ); - set_queue_bits( thread->queue, get_hardware_msg_bit(msg) ); + set_queue_bits( thread->queue, get_hardware_msg_bit( msg->msg ) ); } release_object( thread ); } @@ -2195,7 +2195,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user if (win_thread->queue->input == input) { /* wake the other thread */ - set_queue_bits( win_thread->queue, get_hardware_msg_bit(msg) ); + set_queue_bits( win_thread->queue, get_hardware_msg_bit( msg->msg ) ); got_one = 1; } else @@ -2214,7 +2214,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user * match the filter we skip it */ if (got_one || !check_hw_message_filter( win, msg_code, filter_win, first, last )) { - clear_bits &= ~get_hardware_msg_bit( msg ); + clear_bits &= ~get_hardware_msg_bit( msg->msg ); continue; } @@ -2238,7 +2238,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user data->hw_id = msg->unique_id; set_reply_data( msg->data, msg->data_size ); - if (get_hardware_msg_bit( msg ) == QS_RAWINPUT && (flags & PM_REMOVE)) + if (get_hardware_msg_bit( msg->msg ) == QS_RAWINPUT && (flags & PM_REMOVE)) release_hardware_message( current->queue, data->hw_id ); return 1; }

1 0

Zebediah Figura : vkd3d-shader/spirv: Retrieve input sysvals from the signature for geometry shaders as well.
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: vkd3d Branch: master Commit: df0a031ad8621d2bfbdebcfe7266bd56abfe73e6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/df0a031ad8621d2bfbdebcfe7266b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 9 19:59:11 2023 -0500 vkd3d-shader/spirv: Retrieve input sysvals from the signature for geometry shaders as well. This only affects clip and cull distances. The HLSL compiler emits these using dcl_input, but the previous shader (vertex or TES) will write them as a SPIRV builtin, and hence we want to read this as a SPIRV builtin as well. This fixes validation errors in Wine's test_clip_distance(). --- libs/vkd3d-shader/spirv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index cc0b63e8..a6700e66 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4479,7 +4479,8 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, element_idx = shader_register_get_io_indices(reg, array_sizes); signature_element = &shader_signature->elements[element_idx]; - if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL && !sysval && signature_element->sysval_semantic) + if ((compiler->shader_type == VKD3D_SHADER_TYPE_HULL || compiler->shader_type == VKD3D_SHADER_TYPE_GEOMETRY) + && !sysval && signature_element->sysval_semantic) sysval = vkd3d_siv_from_sysval(signature_element->sysval_semantic); builtin = get_spirv_builtin_for_sysval(compiler, sysval);

1 0

Etaash Mathamsetty : user32: Add GetSystemDpiForProcess export.
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: wine Branch: master Commit: f2fef431d598db4af241f03d8cd617a353fe7207 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2fef431d598db4af241f03d8cd617… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Fri Jun 9 20:22:35 2023 -0400 user32: Add GetSystemDpiForProcess export. --- dlls/user32/user32.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 38462607ccd..121561b1860 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -386,6 +386,7 @@ @ stdcall GetSubMenu(long long) @ stdcall GetSysColor(long) @ stdcall GetSysColorBrush(long) +@ stdcall GetSystemDpiForProcess(long) NtUserGetSystemDpiForProcess @ stdcall GetSystemMenu(long long) NtUserGetSystemMenu @ stdcall GetSystemMetrics(long) @ stdcall GetSystemMetricsForDpi(long long)

1 0

Etaash Mathamsetty : ntdll: Allow RtlAllocateHeap to crash with invalid handle.
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: wine Branch: master Commit: 6ecca8cf6307d3866b40a64577fe47db195ae9bf URL: https://gitlab.winehq.org/wine/wine/-/commit/6ecca8cf6307d3866b40a64577fe47… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Fri Jun 9 12:52:31 2023 -0400 ntdll: Allow RtlAllocateHeap to crash with invalid handle. --- dlls/ntdll/heap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 921a51cf8b1..aca8e7181a8 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -2052,9 +2052,8 @@ void *WINAPI DECLSPEC_HOTPATCH RtlAllocateHeap( HANDLE handle, ULONG flags, SIZE ULONG heap_flags; NTSTATUS status; - if (!(heap = unsafe_heap_from_handle( handle, flags, &heap_flags ))) - status = STATUS_INVALID_HANDLE; - else if ((block_size = heap_get_block_size( heap, heap_flags, size )) == ~0U) + heap = unsafe_heap_from_handle( handle, flags, &heap_flags ); + if ((block_size = heap_get_block_size( heap, heap_flags, size )) == ~0U) status = STATUS_NO_MEMORY; else if (block_size >= HEAP_MIN_LARGE_BLOCK_SIZE) status = heap_allocate_large( heap, heap_flags, block_size, size, &ptr );

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Handle static constants in array size expressions.
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: vkd3d Branch: master Commit: d856be05196adc2dc83c5228acf2a171fe9a5899 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d856be05196adc2dc83c5228acf2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 9 15:39:38 2023 +0200 vkd3d-shader/hlsl: Handle static constants in array size expressions. --- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 9 +++++++-- libs/vkd3d-shader/hlsl_codegen.c | 4 ++-- tests/hlsl-array-size-expr.shader_test | 6 +++--- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3f43ab25..a797ef6a 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1213,6 +1213,7 @@ bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); +bool hlsl_copy_propagation_execute(struct hlsl_ctx *ctx, struct hlsl_block *block); bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context); bool hlsl_fold_constant_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context); bool hlsl_transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx, struct hlsl_ir_node *, void *), diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c25f5c4a..0e07fe57 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1098,12 +1098,17 @@ static unsigned int evaluate_static_expression_as_uint(struct hlsl_ctx *ctx, str struct hlsl_ir_constant *constant; struct hlsl_ir_node *node; unsigned int ret = 0; + bool progress; if (!add_implicit_conversion(ctx, &block->instrs, node_from_list(&block->instrs), hlsl_get_scalar_type(ctx, HLSL_TYPE_UINT), loc)) return 0; - while (hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, block, NULL)); + do + { + progress = hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, block, NULL); + progress |= hlsl_copy_propagation_execute(ctx, block); + } while (progress); node = node_from_list(&block->instrs); if (node->type == HLSL_IR_CONSTANT) @@ -5494,7 +5499,7 @@ arrays: uint32_t *new_array; unsigned int size; - hlsl_block_init(&block); + hlsl_clone_block(ctx, &block, &ctx->static_initializers); list_move_tail(&block.instrs, $2); size = evaluate_static_expression_as_uint(ctx, &block, &@2); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 7a235986..96b4cb66 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1649,7 +1649,7 @@ static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_b return progress; } -static bool copy_propagation_execute(struct hlsl_ctx *ctx, struct hlsl_block *block) +bool hlsl_copy_propagation_execute(struct hlsl_ctx *ctx, struct hlsl_block *block) { struct copy_propagation_state state; bool progress; @@ -4073,7 +4073,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry { progress = hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL); progress |= hlsl_transform_ir(ctx, hlsl_fold_constant_swizzles, body, NULL); - progress |= copy_propagation_execute(ctx, body); + progress |= hlsl_copy_propagation_execute(ctx, body); progress |= hlsl_transform_ir(ctx, fold_swizzle_chains, body, NULL); progress |= hlsl_transform_ir(ctx, remove_trivial_swizzles, body, NULL); } diff --git a/tests/hlsl-array-size-expr.shader_test b/tests/hlsl-array-size-expr.shader_test index 7235ac73..ac774be1 100644 --- a/tests/hlsl-array-size-expr.shader_test +++ b/tests/hlsl-array-size-expr.shader_test @@ -39,7 +39,7 @@ float4 main() : SV_TARGET draw quad probe all rgba (61, 62, 63, 64) -[pixel shader todo] +[pixel shader] static const int size = 8; static const float array[size] = {1, 2, 3, 4, 5, 6, 7, 8}; @@ -49,5 +49,5 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (2, 3, 6, 1) +draw quad +probe all rgba (2, 3, 6, 1)

1 0

Nikolay Sivov : tests: Add a test for array size expressions using static constants.
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: vkd3d Branch: master Commit: 38c89442ac98d13b17eb8f49051da1beff6ed184 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/38c89442ac98d13b17eb8f49051da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 9 15:33:18 2023 +0200 tests: Add a test for array size expressions using static constants. --- tests/hlsl-array-size-expr.shader_test | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/hlsl-array-size-expr.shader_test b/tests/hlsl-array-size-expr.shader_test index 0d64462b..7235ac73 100644 --- a/tests/hlsl-array-size-expr.shader_test +++ b/tests/hlsl-array-size-expr.shader_test @@ -38,3 +38,16 @@ float4 main() : SV_TARGET [test] draw quad probe all rgba (61, 62, 63, 64) + +[pixel shader todo] +static const int size = 8; +static const float array[size] = {1, 2, 3, 4, 5, 6, 7, 8}; + +float4 main() : sv_target +{ + return float4(array[1], array[2], array[5], array[0]); +} + +[test] +todo draw quad +todo probe all rgba (2, 3, 6, 1)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Store static initialization instructions in a block.
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: vkd3d Branch: master Commit: 99314b6340a5a350cc1c1595df899ca633ab9404 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/99314b6340a5a350cc1c1595df899… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 9 15:28:06 2023 +0200 vkd3d-shader/hlsl: Store static initialization instructions in a block. --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/hlsl.h | 5 ++--- libs/vkd3d-shader/hlsl.y | 8 ++++---- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index f439c9f3..ba5bcfbf 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3236,7 +3236,7 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const char *source_name, rb_init(&ctx->functions, compare_function_rb); - list_init(&ctx->static_initializers); + hlsl_block_init(&ctx->static_initializers); list_init(&ctx->extern_vars); list_init(&ctx->buffers); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 7c4e74dc..3f43ab25 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -796,9 +796,8 @@ struct hlsl_ctx struct hlsl_type *Void; } builtin_types; - /* List of the instruction nodes for initializing static variables; linked by the - * hlsl_ir_node.entry fields. */ - struct list static_initializers; + /* List of the instruction nodes for initializing static variables. */ + struct hlsl_block static_initializers; /* Dynamic array of constant values that appear in the shader, associated to the 'c' registers. * Only used for SM1 profiles. */ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 209428f7..c25f5c4a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2159,7 +2159,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t } if (modifiers & HLSL_STORAGE_STATIC) - list_move_tail(&ctx->static_initializers, v->initializer.instrs); + list_move_tail(&ctx->static_initializers.instrs, v->initializer.instrs); else list_move_tail(statements_list, v->initializer.instrs); vkd3d_free(v->initializer.args); @@ -2182,9 +2182,9 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t vkd3d_free(v); continue; } - list_add_tail(&ctx->static_initializers, &zero->entry); + hlsl_block_add_instr(&ctx->static_initializers, zero); - if (!(cast = add_cast(ctx, &ctx->static_initializers, zero, var->data_type, &var->loc))) + if (!(cast = add_cast(ctx, &ctx->static_initializers.instrs, zero, var->data_type, &var->loc))) { vkd3d_free(v); continue; @@ -2195,7 +2195,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t vkd3d_free(v); continue; } - list_add_tail(&ctx->static_initializers, &store->entry); + hlsl_block_add_instr(&ctx->static_initializers, store); } vkd3d_free(v); } diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 4317604b..7a235986 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -3977,7 +3977,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry unsigned int i; bool progress; - list_move_head(&body->instrs, &ctx->static_initializers); + list_move_head(&body->instrs, &ctx->static_initializers.instrs); memset(&recursive_call_ctx, 0, sizeof(recursive_call_ctx)); hlsl_transform_ir(ctx, find_recursive_calls, body, &recursive_call_ctx);

1 0