- Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader/tpf: Return unsigned int from hlsl_sm4_register_from_semantic().
by Alexandre Julliard April 21, 2023

April 21, 2023

Module: vkd3d Branch: master Commit: b46df551eba19ccf45ad907bef0e622367fef3da URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b46df551eba19ccf45ad907bef0e6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 20 17:53:54 2023 -0500 vkd3d-shader/tpf: Return unsigned int from hlsl_sm4_register_from_semantic(). Fix a compile warning: ../vkd3d/libs/vkd3d-shader/hlsl_codegen.c: In function 'allocate_semantic_register': ../vkd3d/libs/vkd3d-shader/hlsl_codegen.c:2947:85: error: passing argument 4 of 'hlsl_sm4_register_from_semantic' from incompatible pointer type [-Werror=incompatible-pointer-types] 2947 | if ((builtin = hlsl_sm4_register_from_semantic(ctx, &var->semantic, output, &type, NULL, &has_idx))) | ^~~~~ | | | unsigned int * In file included from ../vkd3d/libs/vkd3d-shader/hlsl_codegen.c:21: ../vkd3d/libs/vkd3d-shader/hlsl.h:1171:52: note: expected 'enum vkd3d_sm4_register_type *' but argument is of type 'unsigned int *' 1171 | bool output, enum vkd3d_sm4_register_type *type, enum vkd3d_sm4_swizzle_type *swizzle_type, bool *has_idx); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ --- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/tpf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 86f35df2..974252d4 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1168,7 +1168,7 @@ int hlsl_sm1_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun bool hlsl_sm4_usage_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, bool output, D3D_NAME *usage); bool hlsl_sm4_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, - bool output, enum vkd3d_sm4_register_type *type, enum vkd3d_sm4_swizzle_type *swizzle_type, bool *has_idx); + bool output, unsigned int *type, enum vkd3d_sm4_swizzle_type *swizzle_type, bool *has_idx); int hlsl_sm4_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out); int hlsl_lexer_compile(struct hlsl_ctx *ctx, const struct vkd3d_shader_code *hlsl); diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 80487060..e76cf8c9 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2222,7 +2222,7 @@ static bool type_is_integer(const struct hlsl_type *type) } bool hlsl_sm4_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, - bool output, enum vkd3d_sm4_register_type *type, enum vkd3d_sm4_swizzle_type *swizzle_type, bool *has_idx) + bool output, unsigned int *type, enum vkd3d_sm4_swizzle_type *swizzle_type, bool *has_idx) { unsigned int i;

1 0

Brendan Shanks : msvcrt: Fix crash when rethrowing after a non-C++ exception on x86_64.
by Alexandre Julliard April 21, 2023

April 21, 2023

Module: wine Branch: master Commit: e414561a96156b028f73b0cf223ccf3dc9ad3587 URL: https://gitlab.winehq.org/wine/wine/-/commit/e414561a96156b028f73b0cf223ccf… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 20 14:39:42 2023 -0700 msvcrt: Fix crash when rethrowing after a non-C++ exception on x86_64. --- dlls/msvcrt/except_x86_64.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index d40b9985cd2..b07a7b83772 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -579,14 +579,14 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, return ExceptionContinueSearch; } + if (rec->ExceptionCode == CXX_EXCEPTION && + (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2])) + { + TRACE("rethrow detected.\n"); + *rec = *msvcrt_get_thread_data()->exc_record; + } if (rec->ExceptionCode == CXX_EXCEPTION) { - if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) - { - TRACE("rethrow detected.\n"); - *rec = *msvcrt_get_thread_data()->exc_record; - } - exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; if (TRACE_ON(seh))

1 0

Alexandre Julliard : makedep: Avoid generating empty dependencies.
by Alexandre Julliard April 21, 2023

April 21, 2023

Module: wine Branch: master Commit: 7e8ac46a5c33867bc4884aaae7d4a7f7fb308251 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e8ac46a5c33867bc4884aaae7d4a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 21 09:54:37 2023 +0200 makedep: Avoid generating empty dependencies. --- tools/makedep.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 3b5fa7085ab..00ebfa27e8f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -75,8 +75,8 @@ struct incl_file int included_line; /* line where this file was included */ enum incl_type type; /* type of include */ unsigned int arch; /* architecture for multi-arch files, otherwise 0 */ - int use_msvcrt:1; /* put msvcrt headers in the search path? */ - int is_external:1; /* file from external library? */ + unsigned int use_msvcrt:1; /* put msvcrt headers in the search path? */ + unsigned int is_external:1; /* file from external library? */ struct incl_file *owner; unsigned int files_count; /* files in use */ unsigned int files_size; /* total allocated size */ @@ -3241,10 +3241,13 @@ static void output_source_default( struct makefile *make, struct incl_file *sour strarray_add( &make->test_files, obj ); } - output_filenames_obj_dir( make, targets ); - output( ":" ); - output_filenames( source->dependencies ); - output( "\n" ); + if (targets.count && source->dependencies.count) + { + output_filenames_obj_dir( make, targets ); + output( ":" ); + output_filenames( source->dependencies ); + output( "\n" ); + } }

1 0

Alexandre Julliard : winedump: Print entry point names in code range lists.
by Alexandre Julliard April 21, 2023

April 21, 2023

Module: wine Branch: master Commit: 90cc094260ea987071f160d77168199c339008f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/90cc094260ea987071f160d7716819… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 21 16:34:13 2023 +0200 winedump: Print entry point names in code range lists. --- tools/winedump/pe.c | 80 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 22 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 4e293fa32b5..fa9c5eedec5 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -647,6 +647,30 @@ static void dump_section_apiset(void) } } +static const char *find_export_from_rva( UINT rva ) +{ + UINT i, *func_names; + const UINT *funcs; + const UINT *names; + const WORD *ordinals; + const IMAGE_EXPORT_DIRECTORY *dir; + const char *ret = NULL; + + if (!(dir = get_dir( IMAGE_FILE_EXPORT_DIRECTORY ))) return NULL; + if (!(funcs = RVA( dir->AddressOfFunctions, dir->NumberOfFunctions * sizeof(DWORD) ))) return NULL; + names = RVA( dir->AddressOfNames, dir->NumberOfNames * sizeof(DWORD) ); + ordinals = RVA( dir->AddressOfNameOrdinals, dir->NumberOfNames * sizeof(WORD) ); + func_names = calloc( dir->NumberOfFunctions, sizeof(*func_names) ); + + for (i = 0; i < dir->NumberOfNames; i++) func_names[ordinals[i]] = names[i]; + for (i = 0; i < dir->NumberOfFunctions && !ret; i++) + if (funcs[i] == rva) ret = get_symbol_str( RVA( func_names[i], sizeof(DWORD) )); + + free( func_names ); + if (!ret && rva == PE_nt_headers->OptionalHeader.AddressOfEntryPoint) return "<EntryPoint>"; + return ret; +} + static void dump_dir_exported_functions(void) { unsigned int size; @@ -1833,26 +1857,26 @@ static void dump_hybrid_metadata(void) { const IMAGE_ARM64EC_METADATA *data = metadata; - printf( "Version %#x\n", (int)data->Version ); - printf( "CodeMap %#x\n", (int)data->CodeMap ); - printf( "CodeMapCount %#x\n", (int)data->CodeMapCount ); - printf( "CodeRangesToEntryPoints %#x\n", (int)data->CodeRangesToEntryPoints ); - printf( "RedirectionMetadata %#x\n", (int)data->RedirectionMetadata ); - printf( "__os_arm64x_dispatch_call_no_redirect %#x\n", (int)data->__os_arm64x_dispatch_call_no_redirect ); - printf( "__os_arm64x_dispatch_ret %#x\n", (int)data->__os_arm64x_dispatch_ret ); - printf( "__os_arm64x_dispatch_call %#x\n", (int)data->__os_arm64x_dispatch_call ); - printf( "__os_arm64x_dispatch_icall %#x\n", (int)data->__os_arm64x_dispatch_icall ); - printf( "__os_arm64x_dispatch_icall_cfg %#x\n", (int)data->__os_arm64x_dispatch_icall_cfg ); - printf( "AlternateEntryPoint %#x\n", (int)data->AlternateEntryPoint ); - printf( "AuxiliaryIAT %#x\n", (int)data->AuxiliaryIAT ); - printf( "CodeRangesToEntryPointsCount %#x\n", (int)data->CodeRangesToEntryPointsCount ); - printf( "RedirectionMetadataCount %#x\n", (int)data->RedirectionMetadataCount ); - printf( "GetX64InformationFunctionPointer %#x\n", (int)data->GetX64InformationFunctionPointer ); - printf( "SetX64InformationFunctionPointer %#x\n", (int)data->SetX64InformationFunctionPointer ); - printf( "ExtraRFETable %#x\n", (int)data->ExtraRFETable ); - printf( "ExtraRFETableSize %#x\n", (int)data->ExtraRFETableSize ); - printf( "__os_arm64x_dispatch_fptr %#x\n", (int)data->__os_arm64x_dispatch_fptr ); - printf( "AuxiliaryIATCopy %#x\n", (int)data->AuxiliaryIATCopy ); + printf( " Version %#x\n", (int)data->Version ); + printf( " CodeMap %#x\n", (int)data->CodeMap ); + printf( " CodeMapCount %#x\n", (int)data->CodeMapCount ); + printf( " CodeRangesToEntryPoints %#x\n", (int)data->CodeRangesToEntryPoints ); + printf( " RedirectionMetadata %#x\n", (int)data->RedirectionMetadata ); + printf( " __os_arm64x_dispatch_call_no_redirect %#x\n", (int)data->__os_arm64x_dispatch_call_no_redirect ); + printf( " __os_arm64x_dispatch_ret %#x\n", (int)data->__os_arm64x_dispatch_ret ); + printf( " __os_arm64x_dispatch_call %#x\n", (int)data->__os_arm64x_dispatch_call ); + printf( " __os_arm64x_dispatch_icall %#x\n", (int)data->__os_arm64x_dispatch_icall ); + printf( " __os_arm64x_dispatch_icall_cfg %#x\n", (int)data->__os_arm64x_dispatch_icall_cfg ); + printf( " AlternateEntryPoint %#x\n", (int)data->AlternateEntryPoint ); + printf( " AuxiliaryIAT %#x\n", (int)data->AuxiliaryIAT ); + printf( " CodeRangesToEntryPointsCount %#x\n", (int)data->CodeRangesToEntryPointsCount ); + printf( " RedirectionMetadataCount %#x\n", (int)data->RedirectionMetadataCount ); + printf( " GetX64InformationFunctionPointer %#x\n", (int)data->GetX64InformationFunctionPointer ); + printf( " SetX64InformationFunctionPointer %#x\n", (int)data->SetX64InformationFunctionPointer ); + printf( " ExtraRFETable %#x\n", (int)data->ExtraRFETable ); + printf( " ExtraRFETableSize %#x\n", (int)data->ExtraRFETableSize ); + printf( " __os_arm64x_dispatch_fptr %#x\n", (int)data->__os_arm64x_dispatch_fptr ); + printf( " AuxiliaryIATCopy %#x\n", (int)data->AuxiliaryIATCopy ); if (data->CodeMap) { @@ -1868,6 +1892,8 @@ static void dump_hybrid_metadata(void) } } + if (PE_nt_headers->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM64) break; + if (data->CodeRangesToEntryPoints) { const IMAGE_ARM64EC_CODE_RANGE_ENTRY_POINT *map = RVA( data->CodeRangesToEntryPoints, @@ -1876,8 +1902,13 @@ static void dump_hybrid_metadata(void) printf( "\nCode ranges to entry points\n" ); printf( " Start - End Entry point\n" ); for (i = 0; i < data->CodeRangesToEntryPointsCount; i++) - printf( " %08x - %08x %08x\n", + { + const char *name = find_export_from_rva( map[i].EntryPoint ); + printf( " %08x - %08x %08x", (int)map[i].StartRva, (int)map[i].EndRva, (int)map[i].EntryPoint ); + if (name) printf( " %s", name ); + printf( "\n" ); + } } if (data->RedirectionMetadata) @@ -1887,7 +1918,12 @@ static void dump_hybrid_metadata(void) printf( "\nEntry point redirection\n" ); for (i = 0; i < data->RedirectionMetadataCount; i++) - printf( " %08x -> %08x\n", (int)map[i].Source, (int)map[i].Destination ); + { + const char *name = find_export_from_rva( map[i].Source ); + printf( " %08x -> %08x", (int)map[i].Source, (int)map[i].Destination ); + if (name) printf( " (%s)", name ); + printf( "\n" ); + } } break; }

1 0

Alexandros Frantzis : winewayland.drv: Infer and report Windows monitor positions.
by Alexandre Julliard April 21, 2023

April 21, 2023

Module: wine Branch: master Commit: bddfcd071615b51503c0ffa03bd8fc179012e6c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/bddfcd071615b51503c0ffa03bd8fc… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Mar 7 13:36:02 2023 +0200 winewayland.drv: Infer and report Windows monitor positions. Use the xdg-output-unstable-v1 protocol to get the size of the Wayland outputs in the compositor logical space, and use this information, along with the logical position and size in physical pixels (i.e., the current mode) to infer the Windows virtual screen coordinates of the monitors. Note that there are multiple possible mappings from Wayland logical coordinates to Windows virtual screen coordinates. We choose one algorithm that works well for the majority of output arrangements, and we can refine in the future as needed. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winewayland.drv/display.c | 112 +++++++++++++++++++++++++++++++++- dlls/winewayland.drv/wayland_output.c | 9 ++- dlls/winewayland.drv/waylanddrv.h | 1 + 3 files changed, 119 insertions(+), 3 deletions(-) diff --git a/dlls/winewayland.drv/display.c b/dlls/winewayland.drv/display.c index 77f5f8b140d..5234a1f03aa 100644 --- a/dlls/winewayland.drv/display.c +++ b/dlls/winewayland.drv/display.c @@ -63,18 +63,128 @@ static int output_info_cmp_primary_x_y(const void *va, const void *vb) return strcmp(a->output->name, b->output->name); } +static inline BOOL output_info_overlap(struct output_info *a, struct output_info *b) +{ + return b->x < a->x + a->output->current_mode->width && + b->x + b->output->current_mode->width > a->x && + b->y < a->y + a->output->current_mode->height && + b->y + b->output->current_mode->height > a->y; +} + +/* Map a point to one of the four quadrants of our 2d coordinate space: + * 0: bottom right (x >= 0, y >= 0) + * 1: top right (x >= 0, y < 0) + * 2: bottom left (x < 0, y >= 0) + * 3: top left (x < 0, y < 0) */ +static inline int point_to_quadrant(int x, int y) +{ + return (x < 0) * 2 + (y < 0); +} + +/* Decide which of two outputs to keep stationary in order + * to resolve an overlap. */ +static struct output_info *output_info_get_overlap_anchor(struct output_info *a, + struct output_info *b) +{ + /* Preferences for the direction of growth in each quadrant, with a + * lower value signifying a higher preference. */ + static const int quadrant_prefs[4][4] = + { + {0, 1, 2, 3}, /* quadrant 0 */ + {3, 0, 2, 1}, /* quadrant 1 */ + {2, 3, 0, 1}, /* quadrant 2 */ + {3, 2, 1, 0}, /* quadrant 3 */ + }; + int qa = point_to_quadrant(a->output->logical_x, a->output->logical_y); + int qb = point_to_quadrant(b->output->logical_x, b->output->logical_y); + /* Direction of growth if a is the anchor. */ + int qab = point_to_quadrant(b->output->logical_x - a->output->logical_x, + b->output->logical_y - a->output->logical_y); + /* Direction of growth if b is the anchor. */ + int qba = point_to_quadrant(a->output->logical_x - b->output->logical_x, + a->output->logical_y - b->output->logical_y); + + /* If the two output origins are in different quadrants, use the output + * in the lower valued quadrant as the anchor (so effectively outputs + * grow/move away from quadrant 0). */ + if (qa != qb) return (qa < qb) ? a : b; + + /* If the outputs are in the same quadrant, use the preference for the + * direction of growth in that quadrant to select the anchor. Again the + * intended effect is to grow/move outputs away from the origin. */ + return (quadrant_prefs[qa][qab] < quadrant_prefs[qa][qba]) ? a : b; +} + +static BOOL output_info_array_resolve_overlaps(struct wl_array *output_info_array) +{ + struct output_info *a, *b; + BOOL found_overlap = FALSE; + + wl_array_for_each(a, output_info_array) + { + wl_array_for_each(b, output_info_array) + { + struct output_info *anchor, *move; + BOOL x_use_end, y_use_end; + double rel_x, rel_y; + + /* Break if we reach the same output in the inner loop, so that we + * don't process output pairs twice (since order doesn't matter for + * our algorithm.) */ + if (a == b) break; + + if (!output_info_overlap(a, b)) continue; + found_overlap = TRUE; + + /* Decide which output to move to resolve the overlap. */ + anchor = output_info_get_overlap_anchor(a, b); + move = anchor == a ? b : a; + + /* Move the selected output on the X axis to resolve the overlap, + * while maintaining the same relative positioning of the outputs as + * the one they have in logical space. Use either the start or end + * of the moved output as the point to maintain the relative + * position of, depending on whether the anchor is before or after + * the moved output on the axis. */ + x_use_end = move->output->logical_x < anchor->output->logical_x; + rel_x = (move->output->logical_x - anchor->output->logical_x + + (x_use_end ? move->output->logical_w : 0)) / + (double)anchor->output->logical_w; + move->x = anchor->x + anchor->output->current_mode->width * rel_x - + (x_use_end ? move->output->current_mode->width : 0); + + /* Similarly for the Y axis. */ + y_use_end = move->output->logical_y < anchor->output->logical_y; + rel_y = (move->output->logical_y - anchor->output->logical_y + + (y_use_end ? move->output->logical_h : 0)) / + (double)anchor->output->logical_h; + move->y = anchor->y + anchor->output->current_mode->height * rel_y - + (y_use_end ? move->output->current_mode->height : 0); + } + } + + return found_overlap; +} + static void output_info_array_arrange_physical_coords(struct wl_array *output_info_array) { struct output_info *info; size_t num_outputs = output_info_array->size / sizeof(struct output_info); + int steps = 0; - /* Set physical pixel coordinates. */ + /* Set the initial physical pixel coordinates. */ wl_array_for_each(info, output_info_array) { info->x = info->output->logical_x; info->y = info->output->logical_y; } + /* Try to iteratively resolve overlaps, but be defensive and set an upper + * iteration bound to ensure we avoid infinite loops. */ + while (output_info_array_resolve_overlaps(output_info_array) && + ++steps < num_outputs) + continue; + /* Now that we have our physical pixel coordinates, sort from physical left * to right, but ensure the primary output is first. */ qsort(output_info_array->data, num_outputs, sizeof(struct output_info), diff --git a/dlls/winewayland.drv/wayland_output.c b/dlls/winewayland.drv/wayland_output.c index 2090c5d45c9..5cd6e74f24a 100644 --- a/dlls/winewayland.drv/wayland_output.c +++ b/dlls/winewayland.drv/wayland_output.c @@ -101,8 +101,9 @@ static void wayland_output_done(struct wayland_output *output) { struct wayland_output_mode *mode; - TRACE("name=%s logical=%d,%d\n", - output->name, output->logical_x, output->logical_y); + TRACE("name=%s logical=%d,%d+%dx%d\n", + output->name, output->logical_x, output->logical_y, + output->logical_w, output->logical_h); RB_FOR_EACH_ENTRY(mode, &output->modes, struct wayland_output_mode, entry) { @@ -173,6 +174,10 @@ static void zxdg_output_v1_handle_logical_size(void *data, int32_t width, int32_t height) { + struct wayland_output *output = data; + TRACE("logical_w=%d logical_h=%d\n", width, height); + output->logical_w = width; + output->logical_h = height; } static void zxdg_output_v1_handle_done(void *data, diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index f17790173a9..e1ea66f3b33 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -71,6 +71,7 @@ struct wayland_output struct wayland_output_mode *current_mode; char *name; int logical_x, logical_y; + int logical_w, logical_h; uint32_t global_id; };

1 0

Alexandros Frantzis : winewayland.drv: Basic support for Windows monitor positioning.
by Alexandre Julliard April 21, 2023

April 21, 2023

Module: wine Branch: master Commit: ce6a7ae84110fc1e8963f5c6e82d3f65f6c0cac7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce6a7ae84110fc1e8963f5c6e82d3f… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Apr 11 17:47:56 2023 +0300 winewayland.drv: Basic support for Windows monitor positioning. Use the xdg-output-unstable-v1 protocol to get the positions of the Wayland outputs in the compositor logical space, and use this information to arrange the monitors in the Windows virtual screen space. For now we assume that the logical positions match the physical pixel positions (i.e., the outputs are not scaled), a deficiency which will be addressed in an upcoming commit. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winewayland.drv/display.c | 88 ++++++++++++++++++++++++++++++----- dlls/winewayland.drv/wayland_output.c | 7 ++- dlls/winewayland.drv/waylanddrv.h | 1 + 3 files changed, 83 insertions(+), 13 deletions(-) diff --git a/dlls/winewayland.drv/display.c b/dlls/winewayland.drv/display.c index 36d1703e010..77f5f8b140d 100644 --- a/dlls/winewayland.drv/display.c +++ b/dlls/winewayland.drv/display.c @@ -30,6 +30,8 @@ #include "ntuser.h" +#include <stdlib.h> + WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv); void wayland_init_display_devices(void) @@ -39,6 +41,46 @@ void wayland_init_display_devices(void) NtUserGetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS, &num_path, &num_mode); } +struct output_info +{ + int x, y; + struct wayland_output *output; +}; + +static int output_info_cmp_primary_x_y(const void *va, const void *vb) +{ + const struct output_info *a = va; + const struct output_info *b = vb; + BOOL a_is_primary = a->x == 0 && a->y == 0; + BOOL b_is_primary = b->x == 0 && b->y == 0; + + if (a_is_primary && !b_is_primary) return -1; + if (!a_is_primary && b_is_primary) return 1; + if (a->x < b->x) return -1; + if (a->x > b->x) return 1; + if (a->y < b->y) return -1; + if (a->y > b->y) return 1; + return strcmp(a->output->name, b->output->name); +} + +static void output_info_array_arrange_physical_coords(struct wl_array *output_info_array) +{ + struct output_info *info; + size_t num_outputs = output_info_array->size / sizeof(struct output_info); + + /* Set physical pixel coordinates. */ + wl_array_for_each(info, output_info_array) + { + info->x = info->output->logical_x; + info->y = info->output->logical_y; + } + + /* Now that we have our physical pixel coordinates, sort from physical left + * to right, but ensure the primary output is first. */ + qsort(output_info_array->data, num_outputs, sizeof(struct output_info), + output_info_cmp_primary_x_y); +} + static void wayland_add_device_gpu(const struct gdi_device_manager *device_manager, void *param) { @@ -68,13 +110,13 @@ static void wayland_add_device_adapter(const struct gdi_device_manager *device_m } static void wayland_add_device_monitor(const struct gdi_device_manager *device_manager, - void *param, struct wayland_output *output) + void *param, struct output_info *output_info) { struct gdi_monitor monitor = {0}; - SetRect(&monitor.rc_monitor, 0, 0, - output->current_mode->width, - output->current_mode->height); + SetRect(&monitor.rc_monitor, output_info->x, output_info->y, + output_info->x + output_info->output->current_mode->width, + output_info->y + output_info->output->current_mode->height); /* We don't have a direct way to get the work area in Wayland. */ monitor.rc_work = monitor.rc_monitor; @@ -82,7 +124,7 @@ static void wayland_add_device_monitor(const struct gdi_device_manager *device_m monitor.state_flags = DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE; TRACE("name=%s rc_monitor=rc_work=%s state_flags=0x%x\n", - output->name, wine_dbgstr_rect(&monitor.rc_monitor), + output_info->output->name, wine_dbgstr_rect(&monitor.rc_monitor), (UINT)monitor.state_flags); device_manager->add_monitor(&monitor, param); @@ -101,16 +143,22 @@ static void populate_devmode(struct wayland_output_mode *output_mode, DEVMODEW * } static void wayland_add_device_modes(const struct gdi_device_manager *device_manager, - void *param, struct wayland_output *output) + void *param, struct output_info *output_info) { struct wayland_output_mode *output_mode; - RB_FOR_EACH_ENTRY(output_mode, &output->modes, struct wayland_output_mode, entry) + RB_FOR_EACH_ENTRY(output_mode, &output_info->output->modes, + struct wayland_output_mode, entry) { DEVMODEW mode = {.dmSize = sizeof(mode)}; - BOOL mode_is_current = output_mode == output->current_mode; + BOOL mode_is_current = output_mode == output_info->output->current_mode; populate_devmode(output_mode, &mode); - if (mode_is_current) mode.dmFields |= DM_POSITION; + if (mode_is_current) + { + mode.dmFields |= DM_POSITION; + mode.dmPosition.x = output_info->x; + mode.dmPosition.y = output_info->y; + } device_manager->add_mode(&mode, mode_is_current, param); } } @@ -123,21 +171,37 @@ BOOL WAYLAND_UpdateDisplayDevices(const struct gdi_device_manager *device_manage { struct wayland_output *output; INT output_id = 0; + struct wl_array output_info_array; + struct output_info *output_info; if (!force) return TRUE; TRACE("force=%d\n", force); - wayland_add_device_gpu(device_manager, param); + wl_array_init(&output_info_array); wl_list_for_each(output, &process_wayland->output_list, link) { if (!output->current_mode) continue; + output_info = wl_array_add(&output_info_array, sizeof(*output_info)); + if (output_info) output_info->output = output; + else ERR("Failed to allocate space for output_info\n"); + } + + output_info_array_arrange_physical_coords(&output_info_array); + + /* Populate GDI devices. */ + wayland_add_device_gpu(device_manager, param); + + wl_array_for_each(output_info, &output_info_array) + { wayland_add_device_adapter(device_manager, param, output_id); - wayland_add_device_monitor(device_manager, param, output); - wayland_add_device_modes(device_manager, param, output); + wayland_add_device_monitor(device_manager, param, output_info); + wayland_add_device_modes(device_manager, param, output_info); output_id++; } + wl_array_release(&output_info_array); + return TRUE; } diff --git a/dlls/winewayland.drv/wayland_output.c b/dlls/winewayland.drv/wayland_output.c index 08c5c96824c..2090c5d45c9 100644 --- a/dlls/winewayland.drv/wayland_output.c +++ b/dlls/winewayland.drv/wayland_output.c @@ -101,7 +101,8 @@ static void wayland_output_done(struct wayland_output *output) { struct wayland_output_mode *mode; - TRACE("name=%s\n", output->name); + TRACE("name=%s logical=%d,%d\n", + output->name, output->logical_x, output->logical_y); RB_FOR_EACH_ENTRY(mode, &output->modes, struct wayland_output_mode, entry) { @@ -161,6 +162,10 @@ static void zxdg_output_v1_handle_logical_position(void *data, int32_t x, int32_t y) { + struct wayland_output *output = data; + TRACE("logical_x=%d logical_y=%d\n", x, y); + output->logical_x = x; + output->logical_y = y; } static void zxdg_output_v1_handle_logical_size(void *data, diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index da0fccecda9..f17790173a9 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -70,6 +70,7 @@ struct wayland_output struct rb_tree modes; struct wayland_output_mode *current_mode; char *name; + int logical_x, logical_y; uint32_t global_id; };

1 0

Alexandros Frantzis : tools: Support building Wayland protocol source files.
by Alexandre Julliard April 21, 2023

April 21, 2023

Module: wine Branch: master Commit: 85700167833d5a9965c91ba242e34584f8cd0c63 URL: https://gitlab.winehq.org/wine/wine/-/commit/85700167833d5a9965c91ba242e345… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu Sep 2 14:04:43 2021 +0300 tools: Support building Wayland protocol source files. Wayland protocol descriptions are distributed as source XML files that need to be transformed to C source and header files with a version of the wayland-scanner tool compatible with the used libwayland library. This commit enhances the makedep build tool to support building such Wayland protocol XML files. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- configure | 63 ++++++- configure.ac | 10 +- dlls/winewayland.drv/Makefile.in | 8 +- dlls/winewayland.drv/xdg-output-unstable-v1.xml | 220 ++++++++++++++++++++++++ tools/make_makefiles | 5 + tools/makedep.c | 34 ++++ 6 files changed, 325 insertions(+), 15 deletions(-)

1 0

Alexandros Frantzis : winewayland.drv: Initialize display devices once after process init.
by Alexandre Julliard April 21, 2023

April 21, 2023

Module: wine Branch: master Commit: fcaed00a03ebe12bf68b25d7d11248b898e395a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/fcaed00a03ebe12bf68b25d7d11248… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Mar 21 21:05:45 2023 +0200 winewayland.drv: Initialize display devices once after process init. After the driver process initialization is done, use all the received wl_output information to non-forcefully initialize the display devices. We will reintroduce dynamic display device reinitialization (i.e., as a response to non-initial wl_output events) when we start reading and dispatching Wayland events. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winewayland.drv/display.c | 25 +++---------------------- dlls/winewayland.drv/wayland.c | 3 ++- dlls/winewayland.drv/wayland_output.c | 2 -- 3 files changed, 5 insertions(+), 25 deletions(-) diff --git a/dlls/winewayland.drv/display.c b/dlls/winewayland.drv/display.c index bd99441170e..36d1703e010 100644 --- a/dlls/winewayland.drv/display.c +++ b/dlls/winewayland.drv/display.c @@ -32,30 +32,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv); -static BOOL force_display_devices_refresh; - -static void wayland_refresh_display_devices(void) +void wayland_init_display_devices(void) { UINT32 num_path, num_mode; - force_display_devices_refresh = TRUE; /* Trigger refresh in win32u */ NtUserGetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS, &num_path, &num_mode); } -void wayland_init_display_devices(void) -{ - struct ntuser_thread_info *thread_info = NtUserGetThreadInfo(); - DWORD current_pid = GetCurrentProcessId(); - HWND desktop_hwnd = UlongToHandle(thread_info->top_window); - DWORD desktop_pid = 0; - - if (desktop_hwnd) NtUserGetWindowThread(desktop_hwnd, &desktop_pid); - - /* Refresh devices only from the desktop window process. */ - if (!desktop_pid || current_pid == desktop_pid) - wayland_refresh_display_devices(); -} - static void wayland_add_device_gpu(const struct gdi_device_manager *device_manager, void *param) { @@ -141,11 +124,9 @@ BOOL WAYLAND_UpdateDisplayDevices(const struct gdi_device_manager *device_manage struct wayland_output *output; INT output_id = 0; - if (!force && !force_display_devices_refresh) return TRUE; - - TRACE("force=%d force_refresh=%d\n", force, force_display_devices_refresh); + if (!force) return TRUE; - force_display_devices_refresh = FALSE; + TRACE("force=%d\n", force); wayland_add_device_gpu(device_manager, param); diff --git a/dlls/winewayland.drv/wayland.c b/dlls/winewayland.drv/wayland.c index 104a091ea80..e09843e1f50 100644 --- a/dlls/winewayland.drv/wayland.c +++ b/dlls/winewayland.drv/wayland.c @@ -65,7 +65,6 @@ static void registry_handle_global_remove(void *data, struct wl_registry *regist { TRACE("removing output->name=%s\n", output->name); wayland_output_destroy(output); - wayland_init_display_devices(); return; } } @@ -129,5 +128,7 @@ BOOL wayland_process_init(void) wl_display_roundtrip_queue(process_wl_display, process_wayland->wl_event_queue); wl_display_roundtrip_queue(process_wl_display, process_wayland->wl_event_queue); + wayland_init_display_devices(); + return TRUE; } diff --git a/dlls/winewayland.drv/wayland_output.c b/dlls/winewayland.drv/wayland_output.c index be9ea32bd72..0bdfd491bfe 100644 --- a/dlls/winewayland.drv/wayland_output.c +++ b/dlls/winewayland.drv/wayland_output.c @@ -132,8 +132,6 @@ static void output_handle_done(void *data, struct wl_output *wl_output) mode->width, mode->height, mode->refresh, output->current_mode == mode ? "*" : ""); } - - wayland_init_display_devices(); } static void output_handle_scale(void *data, struct wl_output *wl_output,

1 0

Alexandros Frantzis : winewayland.drv: Use the output name reported by the compositor.
by Alexandre Julliard April 21, 2023

April 21, 2023

Module: wine Branch: master Commit: 7b48de324ac7333df3d5d0ae71d1f8d3fe948ed6 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b48de324ac7333df3d5d0ae71d1f8… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Mar 7 13:42:07 2023 +0200 winewayland.drv: Use the output name reported by the compositor. Use the xdg-output-unstable-v1 protocol to get a unique, cross-process consistent name for the outputs. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winewayland.drv/wayland.c | 12 ++++ dlls/winewayland.drv/wayland_output.c | 107 +++++++++++++++++++++++++++++++--- dlls/winewayland.drv/waylanddrv.h | 6 +- 3 files changed, 115 insertions(+), 10 deletions(-) diff --git a/dlls/winewayland.drv/wayland.c b/dlls/winewayland.drv/wayland.c index e09843e1f50..22a7a8cc63f 100644 --- a/dlls/winewayland.drv/wayland.c +++ b/dlls/winewayland.drv/wayland.c @@ -50,6 +50,18 @@ static void registry_handle_global(void *data, struct wl_registry *registry, if (!wayland_output_create(id, version)) ERR("Failed to create wayland_output for global id=%u\n", id); } + else if (strcmp(interface, "zxdg_output_manager_v1") == 0) + { + struct wayland_output *output; + + process_wayland->zxdg_output_manager_v1 = + wl_registry_bind(registry, id, &zxdg_output_manager_v1_interface, + version < 3 ? version : 3); + + /* Add zxdg_output_v1 to existing outputs. */ + wl_list_for_each(output, &process_wayland->output_list, link) + wayland_output_use_xdg_extension(output); + } } static void registry_handle_global_remove(void *data, struct wl_registry *registry, diff --git a/dlls/winewayland.drv/wayland_output.c b/dlls/winewayland.drv/wayland_output.c index 0bdfd491bfe..08c5c96824c 100644 --- a/dlls/winewayland.drv/wayland_output.c +++ b/dlls/winewayland.drv/wayland_output.c @@ -97,6 +97,20 @@ static void wayland_output_add_mode(struct wayland_output *output, if (current) output->current_mode = mode; } +static void wayland_output_done(struct wayland_output *output) +{ + struct wayland_output_mode *mode; + + TRACE("name=%s\n", output->name); + + RB_FOR_EACH_ENTRY(mode, &output->modes, struct wayland_output_mode, entry) + { + TRACE("mode %dx%d @ %d %s\n", + mode->width, mode->height, mode->refresh, + output->current_mode == mode ? "*" : ""); + } +} + static void output_handle_geometry(void *data, struct wl_output *wl_output, int32_t x, int32_t y, int32_t physical_width, int32_t physical_height, @@ -122,15 +136,11 @@ static void output_handle_mode(void *data, struct wl_output *wl_output, static void output_handle_done(void *data, struct wl_output *wl_output) { struct wayland_output *output = data; - struct wayland_output_mode *mode; - TRACE("name=%s\n", output->name); - - RB_FOR_EACH_ENTRY(mode, &output->modes, struct wayland_output_mode, entry) + if (!output->zxdg_output_v1 || + zxdg_output_v1_get_version(output->zxdg_output_v1) >= 3) { - TRACE("mode %dx%d @ %d %s\n", - mode->width, mode->height, mode->refresh, - output->current_mode == mode ? "*" : ""); + wayland_output_done(output); } } @@ -146,6 +156,54 @@ static const struct wl_output_listener output_listener = { output_handle_scale }; +static void zxdg_output_v1_handle_logical_position(void *data, + struct zxdg_output_v1 *zxdg_output_v1, + int32_t x, + int32_t y) +{ +} + +static void zxdg_output_v1_handle_logical_size(void *data, + struct zxdg_output_v1 *zxdg_output_v1, + int32_t width, + int32_t height) +{ +} + +static void zxdg_output_v1_handle_done(void *data, + struct zxdg_output_v1 *zxdg_output_v1) +{ + if (zxdg_output_v1_get_version(zxdg_output_v1) < 3) + { + struct wayland_output *output = data; + wayland_output_done(output); + } +} + +static void zxdg_output_v1_handle_name(void *data, + struct zxdg_output_v1 *zxdg_output_v1, + const char *name) +{ + struct wayland_output *output = data; + + free(output->name); + output->name = strdup(name); +} + +static void zxdg_output_v1_handle_description(void *data, + struct zxdg_output_v1 *zxdg_output_v1, + const char *description) +{ +} + +static const struct zxdg_output_v1_listener zxdg_output_v1_listener = { + zxdg_output_v1_handle_logical_position, + zxdg_output_v1_handle_logical_size, + zxdg_output_v1_handle_done, + zxdg_output_v1_handle_name, + zxdg_output_v1_handle_description, +}; + /********************************************************************** * wayland_output_create * @@ -154,6 +212,7 @@ static const struct wl_output_listener output_listener = { BOOL wayland_output_create(uint32_t id, uint32_t version) { struct wayland_output *output = calloc(1, sizeof(*output)); + int name_len; if (!output) { @@ -170,8 +229,21 @@ BOOL wayland_output_create(uint32_t id, uint32_t version) wl_list_init(&output->link); rb_init(&output->modes, wayland_output_mode_cmp_rb); - snprintf(output->name, sizeof(output->name), "WaylandOutput%d", - next_output_id++); + /* Have a fallback while we don't have compositor given name. */ + name_len = snprintf(NULL, 0, "WaylandOutput%d", next_output_id); + output->name = malloc(name_len + 1); + if (output->name) + { + snprintf(output->name, name_len + 1, "WaylandOutput%d", next_output_id++); + } + else + { + ERR("Couldn't allocate space for output name\n"); + goto err; + } + + if (process_wayland->zxdg_output_manager_v1) + wayland_output_use_xdg_extension(output); wl_list_insert(process_wayland->output_list.prev, &output->link); @@ -196,6 +268,23 @@ void wayland_output_destroy(struct wayland_output *output) { rb_destroy(&output->modes, wayland_output_mode_free_rb, NULL); wl_list_remove(&output->link); + if (output->zxdg_output_v1) + zxdg_output_v1_destroy(output->zxdg_output_v1); wl_output_destroy(output->wl_output); + free(output->name); free(output); } + +/********************************************************************** + * wayland_output_use_xdg_extension + * + * Use the zxdg_output_v1 extension to get output information. + */ +void wayland_output_use_xdg_extension(struct wayland_output *output) +{ + output->zxdg_output_v1 = + zxdg_output_manager_v1_get_xdg_output(process_wayland->zxdg_output_manager_v1, + output->wl_output); + zxdg_output_v1_add_listener(output->zxdg_output_v1, &zxdg_output_v1_listener, + output); +} diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 8458ed17df2..da0fccecda9 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -26,6 +26,7 @@ #endif #include <wayland-client.h> +#include "xdg-output-unstable-v1-client-protocol.h" #include "windef.h" #include "winbase.h" @@ -49,6 +50,7 @@ struct wayland { struct wl_event_queue *wl_event_queue; struct wl_registry *wl_registry; + struct zxdg_output_manager_v1 *zxdg_output_manager_v1; struct wl_list output_list; }; @@ -64,9 +66,10 @@ struct wayland_output { struct wl_list link; struct wl_output *wl_output; + struct zxdg_output_v1 *zxdg_output_v1; struct rb_tree modes; struct wayland_output_mode *current_mode; - char name[20]; + char *name; uint32_t global_id; }; @@ -83,6 +86,7 @@ void wayland_init_display_devices(void) DECLSPEC_HIDDEN; BOOL wayland_output_create(uint32_t id, uint32_t version) DECLSPEC_HIDDEN; void wayland_output_destroy(struct wayland_output *output) DECLSPEC_HIDDEN; +void wayland_output_use_xdg_extension(struct wayland_output *output) DECLSPEC_HIDDEN; /********************************************************************** * USER driver functions

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Ignore "unroll" attribute for loops.
by Alexandre Julliard April 21, 2023

April 21, 2023

Module: vkd3d Branch: master Commit: 317b8aa039dd6b1ef9c363bf19552ff51d76db33 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/317b8aa039dd6b1ef9c363bf19552… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 21 08:20:32 2023 +0200 vkd3d-shader/hlsl: Ignore "unroll" attribute for loops. --- libs/vkd3d-shader/hlsl.y | 74 ++++++++++++++++++++++++++++++++++++++++------ tests/hlsl-for.shader_test | 30 ++++++++++++++++++- 2 files changed, 94 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b9e03325..194d21f4 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -439,11 +439,58 @@ enum loop_type LOOP_DO_WHILE }; -static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, struct list *init, struct list *cond, +static bool attribute_list_has_duplicates(const struct parse_attribute_list *attrs) +{ + unsigned int i, j; + + for (i = 0; i < attrs->count; ++i) + { + for (j = i + 1; j < attrs->count; ++j) + { + if (!strcmp(attrs->attrs[i]->name, attrs->attrs[j]->name)) + return true; + } + } + + return false; +} + +static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, const struct parse_attribute_list *attributes, struct list *init, struct list *cond, struct list *iter, struct list *body, const struct vkd3d_shader_location *loc) { struct list *list = NULL; struct hlsl_ir_loop *loop = NULL; + unsigned int i; + + if (attribute_list_has_duplicates(attributes)) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Found duplicate attribute."); + + /* Ignore unroll(0) attribute, and any invalid attribute. */ + for (i = 0; i < attributes->count; ++i) + { + const struct hlsl_attribute *attr = attributes->attrs[i]; + if (!strcmp(attr->name, "unroll")) + { + if (attr->args_count) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED, "Unroll attribute with iteration count."); + } + else + { + hlsl_warning(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED, "Loop unrolling is not implemented.\n"); + } + } + else if (!strcmp(attr->name, "loop") + || !strcmp(attr->name, "fastopt") + || !strcmp(attr->name, "allow_uav_condition")) + { + hlsl_fixme(ctx, loc, "Unhandled attribute %s.", attr->name); + } + else + { + hlsl_warning(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED, "Unrecognized attribute %s.", attr->name); + } + } if (!(list = make_empty_list(ctx))) goto oom; @@ -4063,6 +4110,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <attr> attribute %type <attr_list> attribute_list +%type <attr_list> attribute_list_optional %type <boolval> boolean @@ -4357,6 +4405,14 @@ attribute_list: $$.attrs[$$.count++] = $2; } +attribute_list_optional: + %empty + { + $$.count = 0; + $$.attrs = NULL; + } + | attribute_list + func_declaration: func_prototype compound_statement { @@ -5328,22 +5384,22 @@ if_body: } loop_statement: - KW_WHILE '(' expr ')' statement + attribute_list_optional KW_WHILE '(' expr ')' statement { - $$ = create_loop(ctx, LOOP_WHILE, NULL, $3, NULL, $5, &@1); + $$ = create_loop(ctx, LOOP_WHILE, &$1, NULL, $4, NULL, $6, &@2); } - | KW_DO statement KW_WHILE '(' expr ')' ';' + | attribute_list_optional KW_DO statement KW_WHILE '(' expr ')' ';' { - $$ = create_loop(ctx, LOOP_DO_WHILE, NULL, $5, NULL, $2, &@1); + $$ = create_loop(ctx, LOOP_DO_WHILE, &$1, NULL, $6, NULL, $3, &@2); } - | KW_FOR '(' scope_start expr_statement expr_statement expr_optional ')' statement + | attribute_list_optional KW_FOR '(' scope_start expr_statement expr_statement expr_optional ')' statement { - $$ = create_loop(ctx, LOOP_FOR, $4, $5, $6, $8, &@1); + $$ = create_loop(ctx, LOOP_FOR, &$1, $5, $6, $7, $9, &@2); hlsl_pop_scope(ctx); } - | KW_FOR '(' scope_start declaration expr_statement expr_optional ')' statement + | attribute_list_optional KW_FOR '(' scope_start declaration expr_statement expr_optional ')' statement { - $$ = create_loop(ctx, LOOP_FOR, $4, $5, $6, $8, &@1); + $$ = create_loop(ctx, LOOP_FOR, &$1, $5, $6, $7, $9, &@2); hlsl_pop_scope(ctx); } diff --git a/tests/hlsl-for.shader_test b/tests/hlsl-for.shader_test index ae7146c9..b6896981 100644 --- a/tests/hlsl-for.shader_test +++ b/tests/hlsl-for.shader_test @@ -9,7 +9,7 @@ float4 main(float tex : texcoord) : sv_target { int i; float x = 0.0; - for (i = 0; i < 10; i++) + [unroll] for (i = 0; i < 10; i++) { x += i; if (tex > 0.5 && i == 5) @@ -26,3 +26,31 @@ todo draw quad probe ( 0, 0, 159, 480) rgba (10.0, 35.0, 0.0, 0.0) probe (161, 0, 479, 480) rgba (10.0, 38.0, 0.0, 0.0) probe (481, 0, 640, 480) rgba ( 5.0, 10.0, 0.0, 0.0) + +[pixel shader] +float4 main(float tex : texcoord) : sv_target +{ + int i; + float x = 0.0; + [unroll] [attr1] for (i = 0; i < 10; i++) + { + x += i; + } + return float4(i, x, 0.0, 0.0); +} + +[test] +draw quad +probe all rgba (10.0, 45.0, 0.0, 0.0) + +[pixel shader fail] +float4 main(float tex : texcoord) : sv_target +{ + int i; + float x = 0.0; + [unroll] [unroll] for (i = 0; i < 10; i++) + { + x += i; + } + return float4(i, x, 0.0, 0.0); +}

1 0