April 2023 - Wine-commits - list.winehq.org

Eric Pouech : winedbg: Improve size management in watch command.
by Alexandre Julliard 18 Apr '23

18 Apr '23

Module: wine Branch: master Commit: f01ce56a4935449be0bfbb994eb904c84363c90e URL: https://gitlab.winehq.org/wine/wine/-/commit/f01ce56a4935449be0bfbb994eb904… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 17 18:43:53 2023 +0200 winedbg: Improve size management in watch command. - support 8 byte targets - default to CPU pointer size if size isn't present nor supported. - detect unaligned requests Signed-off-by: Eric Pouech <eric.pouech(a)codeweavers.com> --- programs/winedbg/break.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index c9abb737487..8001ba1707b 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -398,7 +398,7 @@ void break_check_delayed_bp(void) void break_add_watch(const struct dbg_lvalue* lvalue, BOOL is_write) { int num; - DWORD64 l = 4; + DWORD l = ADDRSIZE; if (!lvalue->in_debuggee) { @@ -409,21 +409,30 @@ void break_add_watch(const struct dbg_lvalue* lvalue, BOOL is_write) &lvalue->addr); if (num == -1) return; + /* FIXME: this validation part should be moved to CPU backends (likely in a new method) */ if (lvalue->type.id != dbg_itype_none) { - if (types_get_info(&lvalue->type, TI_GET_LENGTH, &l)) + DWORD64 l64; + if (types_get_info(&lvalue->type, TI_GET_LENGTH, &l64)) { - switch (l) + /* Only allow size of a power of 2, smaller than CPU's pointer size. + * (Validation is done by CPU backend with insert_Xpoint method) + */ + if (!(l64 & (l64 - 1)) && l64 <= l) + l = l64; + else + dbg_printf("Unsupported length (%I64x) for watch-points, defaulting to %lu\n", l64, l); + /* most CPUs request watch address to be aligned on length */ + if (lvalue->addr.Offset & (l - 1)) { - case 4: case 2: case 1: break; - default: - dbg_printf("Unsupported length (%I64x) for watch-points, defaulting to 4\n", l); - break; + dbg_printf("Watchpoint on unaligned address is not supported\n"); + dbg_curr_process->bp[num].refcount = 0; + return; } } - else dbg_printf("Cannot get watch size, defaulting to 4\n"); + else dbg_printf("Cannot get watch size, defaulting to %lu\n", l); } - dbg_curr_process->bp[num].w.len = (DWORD)l - 1; + dbg_curr_process->bp[num].w.len = l - 1; if (!get_watched_value(num, &dbg_curr_process->bp[num].w.oldval)) {

1 0

Brendan Shanks : winemac: Refactor constrain_window_frame() to use separate origin and size arguments.
by Alexandre Julliard 18 Apr '23

18 Apr '23

Module: wine Branch: master Commit: 51f9bb766add67278093ed1020b37d0272687454 URL: https://gitlab.winehq.org/wine/wine/-/commit/51f9bb766add67278093ed1020b37d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Apr 17 14:16:45 2023 -0700 winemac: Refactor constrain_window_frame() to use separate origin and size arguments. --- dlls/winemac.drv/window.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 896efb6a68e..2a7998762ac 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -216,7 +216,7 @@ static void macdrv_mac_to_window_rect(struct macdrv_win_data *data, RECT *rect) * Alter a window frame rectangle to fit within a) Cocoa's documented * limits, and b) sane sizes, like twice the desktop rect. */ -static void constrain_window_frame(CGRect* frame) +static void constrain_window_frame(CGPoint* origin, CGSize* size) { CGRect desktop_rect = macdrv_get_desktop_rect(); int max_width, max_height; @@ -224,12 +224,18 @@ static void constrain_window_frame(CGRect* frame) max_width = min(32000, 2 * CGRectGetWidth(desktop_rect)); max_height = min(32000, 2 * CGRectGetHeight(desktop_rect)); - if (frame->origin.x < -16000) frame->origin.x = -16000; - if (frame->origin.y < -16000) frame->origin.y = -16000; - if (frame->origin.x > 16000) frame->origin.x = 16000; - if (frame->origin.y > 16000) frame->origin.y = 16000; - if (frame->size.width > max_width) frame->size.width = max_width; - if (frame->size.height > max_height) frame->size.height = max_height; + if (origin) + { + if (origin->x < -16000) origin->x = -16000; + if (origin->y < -16000) origin->y = -16000; + if (origin->x > 16000) origin->x = 16000; + if (origin->y > 16000) origin->y = 16000; + } + if (size) + { + if (size->width > max_width) size->width = max_width; + if (size->height > max_height) size->height = max_height; + } } @@ -698,7 +704,7 @@ static void create_cocoa_window(struct macdrv_win_data *data) get_cocoa_window_features(data, style, ex_style, &wf, &data->window_rect, &data->client_rect); frame = cgrect_from_rect(data->whole_rect); - constrain_window_frame(&frame); + constrain_window_frame(&frame.origin, &frame.size); if (frame.size.width < 1 || frame.size.height < 1) frame.size.width = frame.size.height = 1; @@ -1139,7 +1145,7 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c { if (data->minimized) return; - constrain_window_frame(&frame); + constrain_window_frame(&frame.origin, &frame.size); if (frame.size.width < 1 || frame.size.height < 1) frame.size.width = frame.size.height = 1;

1 0

Brendan Shanks : winemac: Set the Cocoa window contentMaxSize to the size limits from constrain_window_frame().
by Alexandre Julliard 18 Apr '23

18 Apr '23

Module: wine Branch: master Commit: 88a09dd3348c57595e7076d705af25fc0e9267ab URL: https://gitlab.winehq.org/wine/wine/-/commit/88a09dd3348c57595e7076d705af25… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Apr 17 14:27:57 2023 -0700 winemac: Set the Cocoa window contentMaxSize to the size limits from constrain_window_frame(). --- dlls/winemac.drv/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 2a7998762ac..a3690585127 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -641,6 +641,8 @@ static void sync_window_min_max_info(HWND hwnd) max_size = CGSizeMake(max_rect.right - max_rect.left, max_rect.bottom - max_rect.top); } + constrain_window_frame(NULL, &max_size); + TRACE("min_size (%g,%g) max_size (%g,%g)\n", min_size.width, min_size.height, max_size.width, max_size.height); macdrv_set_window_min_max_sizes(data->cocoa_window, min_size, max_size); }

1 0

Brendan Shanks : winemac: Don't constrain surface dimensions to the onscreen part of a window.
by Alexandre Julliard 18 Apr '23

18 Apr '23

Module: wine Branch: master Commit: 06011209d7fac818c1ffd268ef083dafea6c013b URL: https://gitlab.winehq.org/wine/wine/-/commit/06011209d7fac818c1ffd268ef083d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Mar 30 16:32:21 2023 -0700 winemac: Don't constrain surface dimensions to the onscreen part of a window. Fixes an issue where a window's image would be stretched as it was moved further offscreen. The offscreen part of a window also did not display correctly in Exposé. --- dlls/winemac.drv/window.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index a3690585127..104100a0770 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2037,10 +2037,8 @@ LRESULT macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) static inline RECT get_surface_rect(const RECT *visible_rect) { - RECT rect; - RECT desktop_rect = rect_from_cgrect(macdrv_get_desktop_rect()); + RECT rect = *visible_rect; - intersect_rect(&rect, visible_rect, &desktop_rect); OffsetRect(&rect, -visible_rect->left, -visible_rect->top); rect.left &= ~127; rect.top &= ~127;

1 0

Martin Garton : msvcrt: Fix typo in #define.
by Alexandre Julliard 18 Apr '23

18 Apr '23

Module: wine Branch: master Commit: 0dda5753c5a25d64b2a47ada515d78c684558268 URL: https://gitlab.winehq.org/wine/wine/-/commit/0dda5753c5a25d64b2a47ada515d78… Author: Martin Garton <garton(a)gmail.com> Date: Wed Jan 27 10:32:29 2021 +0000 msvcrt: Fix typo in #define. --- include/msvcrt/fcntl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/msvcrt/fcntl.h b/include/msvcrt/fcntl.h index a4ad38b64a4..f02a39b49ef 100644 --- a/include/msvcrt/fcntl.h +++ b/include/msvcrt/fcntl.h @@ -37,7 +37,7 @@ #define O_ACCMODE _O_ACCMODE #define O_APPEND _O_APPEND #define O_RANDOM _O_RANDOM -#define O_SEQENTIAL _O_SEQUENTIAL +#define O_SEQUENTIAL _O_SEQUENTIAL #define O_TEMPORARY _O_TEMPORARY #define O_NOINHERIT _O_NOINHERIT #define O_CREAT _O_CREAT

1 0

Zebediah Figura : wined3d: Allow retrieving the frontbuffer from a wined3d swapchain.
by Alexandre Julliard 18 Apr '23

18 Apr '23

Module: wine Branch: master Commit: 83518a6810e2dd1f2386b22d8cbe57b4b00542af URL: https://gitlab.winehq.org/wine/wine/-/commit/83518a6810e2dd1f2386b22d8cbe57… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 27 12:28:25 2022 -0600 wined3d: Allow retrieving the frontbuffer from a wined3d swapchain. For ddraw. --- dlls/wined3d/swapchain.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index bd4472d746a..b31c3393767 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -275,6 +275,13 @@ struct wined3d_texture * CDECL wined3d_swapchain_get_back_buffer(const struct wi return swapchain->back_buffers[back_buffer_idx]; } +struct wined3d_texture * CDECL wined3d_swapchain_get_front_buffer(const struct wined3d_swapchain *swapchain) +{ + TRACE("swapchain %p.\n", swapchain); + + return swapchain->front_buffer; +} + struct wined3d_output * wined3d_swapchain_get_output(const struct wined3d_swapchain *swapchain) { TRACE("swapchain %p.\n", swapchain); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 5a406377bf5..e905684ce23 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -270,6 +270,7 @@ @ cdecl wined3d_swapchain_get_desc(ptr ptr) @ cdecl wined3d_swapchain_get_device(ptr) @ cdecl wined3d_swapchain_get_display_mode(ptr ptr ptr) +@ cdecl wined3d_swapchain_get_front_buffer(ptr) @ cdecl wined3d_swapchain_get_front_buffer_data(ptr ptr long) @ cdecl wined3d_swapchain_get_gamma_ramp(ptr ptr) @ cdecl wined3d_swapchain_get_parent(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0e921a9a6ad..32a1a70b040 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2809,6 +2809,7 @@ struct wined3d_texture * __cdecl wined3d_swapchain_get_back_buffer(const struct struct wined3d_device * __cdecl wined3d_swapchain_get_device(const struct wined3d_swapchain *swapchain); HRESULT __cdecl wined3d_swapchain_get_display_mode(const struct wined3d_swapchain *swapchain, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); +struct wined3d_texture * __cdecl wined3d_swapchain_get_front_buffer(const struct wined3d_swapchain *swapchain); HRESULT __cdecl wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapchain *swapchain, struct wined3d_texture *dst_texture, unsigned int sub_resource_idx); HRESULT __cdecl wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *swapchain,

1 0

Zebediah Figura : ddraw: Retrieve the frontbuffer directly from wined3d.
by Alexandre Julliard 18 Apr '23

18 Apr '23

Module: wine Branch: master Commit: f74de8e0ab15a9bdefd3aac3568ced27454ffb2f URL: https://gitlab.winehq.org/wine/wine/-/commit/f74de8e0ab15a9bdefd3aac3568ced… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 27 12:28:45 2022 -0600 ddraw: Retrieve the frontbuffer directly from wined3d. --- dlls/ddraw/ddraw.c | 24 ++---------------------- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/surface.c | 2 +- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d6570739a51..c56226fb71d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -938,7 +938,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, } rtv = wined3d_device_context_get_rendertarget_view(ddraw->immediate_context, 0); - /* Rendering to ddraw->wined3d_frontbuffer. */ + /* Rendering to the wined3d frontbuffer. */ if (rtv && !wined3d_rendertarget_view_get_sub_resource_parent(rtv)) rtv = NULL; else if (rtv) @@ -5042,43 +5042,23 @@ static HRESULT CDECL device_parent_texture_sub_resource_created(struct wined3d_d return DD_OK; } -static void STDMETHODCALLTYPE ddraw_frontbuffer_destroyed(void *parent) -{ - struct ddraw *ddraw = parent; - ddraw->wined3d_frontbuffer = NULL; -} - -static const struct wined3d_parent_ops ddraw_frontbuffer_parent_ops = -{ - ddraw_frontbuffer_destroyed, -}; - static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_device_parent *device_parent, void *container_parent, const struct wined3d_resource_desc *desc, DWORD texture_flags, struct wined3d_texture **texture) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); - const struct wined3d_parent_ops *parent_ops; HRESULT hr; TRACE("device_parent %p, container_parent %p, desc %p, texture flags %#lx, texture %p.\n", device_parent, container_parent, desc, texture_flags, texture); - if (!ddraw->wined3d_frontbuffer) - parent_ops = &ddraw_frontbuffer_parent_ops; - else - parent_ops = &ddraw_null_wined3d_parent_ops; - if (FAILED(hr = wined3d_texture_create(ddraw->wined3d_device, desc, 1, 1, - texture_flags, NULL, ddraw, parent_ops, texture))) + texture_flags, NULL, ddraw, &ddraw_null_wined3d_parent_ops, texture))) { WARN("Failed to create texture, hr %#lx.\n", hr); return hr; } - if (!ddraw->wined3d_frontbuffer) - ddraw->wined3d_frontbuffer = *texture; - return hr; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1be3df5f2c9..a3f309f89f0 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -103,7 +103,6 @@ struct ddraw struct ddraw_surface *primary; RECT primary_lock; - struct wined3d_texture *wined3d_frontbuffer; struct wined3d_texture *gdi_surface; struct wined3d_swapchain *wined3d_swapchain; struct wined3d_swapchain_state_parent state_parent; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index b601104049f..52ca900441c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -133,7 +133,7 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, if (swap_interval) dst_texture = wined3d_swapchain_get_back_buffer(ddraw->wined3d_swapchain, 0); else - dst_texture = ddraw->wined3d_frontbuffer; + dst_texture = wined3d_swapchain_get_front_buffer(ddraw->wined3d_swapchain); if (SUCCEEDED(hr = wined3d_device_context_blt(ddraw->immediate_context, dst_texture, 0, rect, ddraw_surface_get_any_texture(surface, DDRAW_SURFACE_READ), surface->sub_resource_idx, rect, 0,

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_if().
by Alexandre Julliard 18 Apr '23

18 Apr '23

Module: vkd3d Branch: master Commit: 7ee66351c8e4cdf52f6c5e803d7584d270cb68e7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7ee66351c8e4cdf52f6c5e803d758… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 10 20:05:53 2022 -0600 vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_if(). --- libs/vkd3d-shader/hlsl.c | 8 ++++---- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 11 +++++------ libs/vkd3d-shader/hlsl_codegen.c | 13 ++++++------- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 9eccdd0e..5f683767 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1208,7 +1208,7 @@ struct hlsl_ir_node *hlsl_new_binary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_exp return hlsl_new_expr(ctx, op, operands, arg1->data_type, &arg1->loc); } -struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition, +struct hlsl_ir_node *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition, struct hlsl_block *then_block, struct hlsl_block *else_block, const struct vkd3d_shader_location *loc) { struct hlsl_ir_if *iff; @@ -1222,7 +1222,7 @@ struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condit hlsl_block_init(&iff->else_block); if (else_block) hlsl_block_add_block(&iff->else_block, else_block); - return iff; + return &iff->node; } struct hlsl_ir_load *hlsl_new_load_index(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, @@ -1521,7 +1521,7 @@ static struct hlsl_ir_node *clone_expr(struct hlsl_ctx *ctx, struct clone_instr_ static struct hlsl_ir_node *clone_if(struct hlsl_ctx *ctx, struct clone_instr_map *map, struct hlsl_ir_if *src) { struct hlsl_block then_block, else_block; - struct hlsl_ir_if *dst; + struct hlsl_ir_node *dst; if (!clone_block(ctx, &then_block, &src->then_block, map)) return NULL; @@ -1538,7 +1538,7 @@ static struct hlsl_ir_node *clone_if(struct hlsl_ctx *ctx, struct clone_instr_ma return NULL; } - return &dst->node; + return dst; } static struct hlsl_ir_node *clone_jump(struct hlsl_ctx *ctx, struct hlsl_ir_jump *src) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 16dcdb29..7a13c46f 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1067,7 +1067,7 @@ struct hlsl_ir_node *hlsl_new_float_constant(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type, const struct hlsl_func_parameters *parameters, const struct hlsl_semantic *semantic, const struct vkd3d_shader_location *loc); -struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition, +struct hlsl_ir_node *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition, struct hlsl_block *then_block, struct hlsl_block *else_block, const struct vkd3d_shader_location *loc); struct hlsl_ir_constant *hlsl_new_int_constant(struct hlsl_ctx *ctx, int n, const struct vkd3d_shader_location *loc); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4e7a4baa..45bc545f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -406,10 +406,9 @@ static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod, con static bool append_conditional_break(struct hlsl_ctx *ctx, struct list *cond_list) { - struct hlsl_ir_node *condition, *not; + struct hlsl_ir_node *condition, *not, *iff; struct hlsl_block then_block; struct hlsl_ir_jump *jump; - struct hlsl_ir_if *iff; /* E.g. "for (i = 0; ; ++i)". */ if (list_empty(cond_list)) @@ -428,7 +427,7 @@ static bool append_conditional_break(struct hlsl_ctx *ctx, struct list *cond_lis if (!(iff = hlsl_new_if(ctx, not, &then_block, NULL, &condition->loc))) return false; - list_add_tail(cond_list, &iff->node.entry); + list_add_tail(cond_list, &iff->entry); return true; } @@ -5245,7 +5244,7 @@ selection_statement: { struct hlsl_ir_node *condition = node_from_list($3); struct hlsl_block then_block, else_block; - struct hlsl_ir_if *instr; + struct hlsl_ir_node *instr; hlsl_block_init(&then_block); list_move_tail(&then_block.instrs, $5.then_block); @@ -5262,12 +5261,12 @@ selection_statement: struct vkd3d_string_buffer *string; if ((string = hlsl_type_to_string(ctx, condition->data_type))) - hlsl_error(ctx, &instr->node.loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "if condition type %s is not scalar.", string->buffer); hlsl_release_string_buffer(ctx, string); } $$ = $3; - list_add_tail($$, &instr->node.entry); + list_add_tail($$, &instr->entry); } if_body: diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index e20abf83..d63bccdf 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -519,7 +519,7 @@ static void insert_early_return_break(struct hlsl_ctx *ctx, struct hlsl_block then_block; struct hlsl_ir_jump *jump; struct hlsl_ir_load *load; - struct hlsl_ir_if *iff; + struct hlsl_ir_node *iff; hlsl_block_init(&then_block); @@ -533,7 +533,7 @@ static void insert_early_return_break(struct hlsl_ctx *ctx, if (!(iff = hlsl_new_if(ctx, &load->node, &then_block, NULL, &cf_instr->loc))) return; - list_add_after(&load->node.entry, &iff->node.entry); + list_add_after(&load->node.entry, &iff->entry); } /* Remove HLSL_IR_JUMP_RETURN calls by altering subsequent control flow. */ @@ -678,10 +678,9 @@ static bool lower_return(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *fun else if (cf_instr) { struct list *tail = list_tail(&block->instrs); + struct hlsl_ir_node *not, *iff; struct hlsl_block then_block; struct hlsl_ir_load *load; - struct hlsl_ir_node *not; - struct hlsl_ir_if *iff; /* If we're in a loop, we should have used "break" instead. */ assert(!in_loop); @@ -703,7 +702,7 @@ static bool lower_return(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *fun if (!(iff = hlsl_new_if(ctx, not, &then_block, NULL, &cf_instr->loc))) return false; - list_add_tail(&block->instrs, &iff->node.entry); + list_add_tail(&block->instrs, &iff->entry); } return has_early_return; @@ -2006,8 +2005,8 @@ struct hlsl_ir_load *hlsl_add_conditional(struct hlsl_ctx *ctx, struct list *ins struct hlsl_block then_block, else_block; struct hlsl_ir_store *store; struct hlsl_ir_load *load; + struct hlsl_ir_node *iff; struct hlsl_ir_var *var; - struct hlsl_ir_if *iff; assert(hlsl_types_are_equal(if_true->data_type, if_false->data_type)); @@ -2027,7 +2026,7 @@ struct hlsl_ir_load *hlsl_add_conditional(struct hlsl_ctx *ctx, struct list *ins if (!(iff = hlsl_new_if(ctx, condition, &then_block, &else_block, &condition->loc))) return NULL; - list_add_tail(instrs, &iff->node.entry); + list_add_tail(instrs, &iff->entry); if (!(load = hlsl_new_var_load(ctx, var, condition->loc))) return NULL;

1 0

Conor McCarthy : tests: Test 1D UAV clear.
by Alexandre Julliard 18 Apr '23

18 Apr '23

Module: vkd3d Branch: master Commit: 7d0aaea4f85c6e41940489767805cce4e65fcff3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7d0aaea4f85c6e41940489767805c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 17 13:57:14 2023 +1000 tests: Test 1D UAV clear. --- tests/d3d12.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 8a7e6b30..a5f11291 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5013,6 +5013,7 @@ static void test_clear_unordered_access_view_image(void) ID3D12Device *device; UINT clear_value[4]; HRESULT hr; + bool is_1d; #define IMAGE_SIZE 16 static const struct @@ -5087,6 +5088,7 @@ static void test_clear_unordered_access_view_image(void) } uav_dimensions[] = { + {D3D12_RESOURCE_DIMENSION_TEXTURE1D, D3D12_UAV_DIMENSION_TEXTURE1D, false}, {D3D12_RESOURCE_DIMENSION_TEXTURE2D, D3D12_UAV_DIMENSION_TEXTURE2D, false}, {D3D12_RESOURCE_DIMENSION_TEXTURE2D, D3D12_UAV_DIMENSION_TEXTURE2DARRAY, true }, /* Expected behaviour with partial layer coverage is unclear. */ @@ -5116,12 +5118,12 @@ static void test_clear_unordered_access_view_image(void) vkd3d_test_push_context("Dim %u, Test %u", d, i); + is_1d = uav_dimensions[d].resource_dim == D3D12_RESOURCE_DIMENSION_TEXTURE1D; + resource_desc.Dimension = uav_dimensions[d].resource_dim; resource_desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; resource_desc.Width = IMAGE_SIZE; - resource_desc.Height = IMAGE_SIZE; - if (uav_dimensions[d].resource_dim == D3D12_RESOURCE_DIMENSION_TEXTURE1D) - resource_desc.Height = 1; + resource_desc.Height = is_1d ? 1 : IMAGE_SIZE; resource_desc.DepthOrArraySize = tests[i].image_layers; resource_desc.MipLevels = tests[i].image_mips; resource_desc.Format = tests[i].format; @@ -5223,7 +5225,7 @@ static void test_clear_unordered_access_view_image(void) tests[i].mip_level + (layer * tests[i].image_mips), &rb, queue, command_list); - for (p = 0; p < image_depth * image_size * image_size; ++p) + for (p = 0; p < image_depth * (is_1d ? 1 : image_size) * image_size; ++p) { x = p % image_size; y = (p / image_size) % image_size; @@ -5252,7 +5254,7 @@ static void test_clear_unordered_access_view_image(void) actual_colour = get_readback_uint(&rb.rb, x, y, z); success = compare_color(actual_colour, expected_colour, tests[i].is_float ? 1 : 0); - todo_if(tests[i].is_todo && expected_colour) + todo_if((tests[i].is_todo || (is_1d && tests[i].mip_level)) && expected_colour) ok(success, "At layer %u, (%u,%u,%u), expected %#x, got %#x.\n", layer, x, y, z, expected_colour, actual_colour);

1 0

Conor McCarthy : vkd3d: Support 1D UAV.
by Alexandre Julliard 18 Apr '23

18 Apr '23

Module: vkd3d Branch: master Commit: 6db9ed14dcc3b39e1a2ae4903849a6b02525b1e9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6db9ed14dcc3b39e1a2ae4903849a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 17 13:59:25 2023 +1000 vkd3d: Support 1D UAV. --- libs/vkd3d/resource.c | 3 +++ tests/d3d12.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index c282f116..86b82b81 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -3210,6 +3210,9 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, { switch (desc->ViewDimension) { + case D3D12_UAV_DIMENSION_TEXTURE1D: + vkd3d_desc.miplevel_idx = desc->u.Texture1D.MipSlice; + break; case D3D12_UAV_DIMENSION_TEXTURE2D: vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; if (desc->u.Texture2D.PlaneSlice) diff --git a/tests/d3d12.c b/tests/d3d12.c index a5f11291..ae16fddf 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5254,7 +5254,7 @@ static void test_clear_unordered_access_view_image(void) actual_colour = get_readback_uint(&rb.rb, x, y, z); success = compare_color(actual_colour, expected_colour, tests[i].is_float ? 1 : 0); - todo_if((tests[i].is_todo || (is_1d && tests[i].mip_level)) && expected_colour) + todo_if(tests[i].is_todo && expected_colour) ok(success, "At layer %u, (%u,%u,%u), expected %#x, got %#x.\n", layer, x, y, z, expected_colour, actual_colour);

1 0