November 2021 - Wine-commits

Jan Sikorski : d3d9: Don't grab wined3d lock for wined3d incref/decref functions.
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 08c9b7c9ce5de5a38181d2e3a7c7587b57eb7f49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08c9b7c9ce5de5a38181d2e3… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:28 2021 +0200 d3d9: Don't grab wined3d lock for wined3d incref/decref functions. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ---- dlls/d3d9/directx.c | 2 -- dlls/d3d9/query.c | 3 --- dlls/d3d9/shader.c | 12 ------------ dlls/d3d9/stateblock.c | 2 -- dlls/d3d9/vertexdeclaration.c | 4 ---- 6 files changed, 27 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1a1bc5ddb6c..ac6a7054838 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2553,9 +2553,7 @@ static HRESULT WINAPI d3d9_device_EndStateBlock(IDirect3DDevice9Ex *iface, IDire if (!(object = heap_alloc_zero(sizeof(*object)))) { - wined3d_mutex_lock(); wined3d_stateblock_decref(wined3d_stateblock); - wined3d_mutex_unlock(); return E_OUTOFMEMORY; } @@ -2563,9 +2561,7 @@ static HRESULT WINAPI d3d9_device_EndStateBlock(IDirect3DDevice9Ex *iface, IDire if (FAILED(hr)) { WARN("Failed to initialize stateblock, hr %#x.\n", hr); - wined3d_mutex_lock(); wined3d_stateblock_decref(wined3d_stateblock); - wined3d_mutex_unlock(); heap_free(object); return hr; } diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index e176483f43e..a1ebc986226 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -81,9 +81,7 @@ static ULONG WINAPI d3d9_Release(IDirect3D9Ex *iface) if (!refcount) { - wined3d_mutex_lock(); wined3d_decref(d3d9->wined3d); - wined3d_mutex_unlock(); heap_free(d3d9->wined3d_outputs); heap_free(d3d9); diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 207ad55e5a1..450a58091fa 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -76,10 +76,7 @@ static ULONG WINAPI d3d9_query_Release(IDirect3DQuery9 *iface) if (!refcount) { - wined3d_mutex_lock(); wined3d_query_decref(query->wined3d_query); - wined3d_mutex_unlock(); - IDirect3DDevice9Ex_Release(query->parent_device); heap_free(query); } diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index 838c7de2cf0..042f8498321 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -54,9 +54,7 @@ static ULONG WINAPI d3d9_vertexshader_AddRef(IDirect3DVertexShader9 *iface) if (refcount == 1) { IDirect3DDevice9Ex_AddRef(shader->parent_device); - wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); - wined3d_mutex_unlock(); } return refcount; @@ -72,11 +70,7 @@ static ULONG WINAPI d3d9_vertexshader_Release(IDirect3DVertexShader9 *iface) if (!refcount) { IDirect3DDevice9Ex *device = shader->parent_device; - - wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); - wined3d_mutex_unlock(); - /* Release the device last, as it may cause the device to be destroyed. */ IDirect3DDevice9Ex_Release(device); } @@ -203,9 +197,7 @@ static ULONG WINAPI d3d9_pixelshader_AddRef(IDirect3DPixelShader9 *iface) if (refcount == 1) { IDirect3DDevice9Ex_AddRef(shader->parent_device); - wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); - wined3d_mutex_unlock(); } return refcount; @@ -221,11 +213,7 @@ static ULONG WINAPI d3d9_pixelshader_Release(IDirect3DPixelShader9 *iface) if (!refcount) { IDirect3DDevice9Ex *device = shader->parent_device; - - wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); - wined3d_mutex_unlock(); - /* Release the device last, as it may cause the device to be destroyed. */ IDirect3DDevice9Ex_Release(device); } diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 3c1e3230095..c797ce54b49 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -66,9 +66,7 @@ static ULONG WINAPI d3d9_stateblock_Release(IDirect3DStateBlock9 *iface) if (!refcount) { - wined3d_mutex_lock(); wined3d_stateblock_decref(stateblock->wined3d_stateblock); - wined3d_mutex_unlock(); IDirect3DDevice9Ex_Release(stateblock->parent_device); heap_free(stateblock); diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 60701a9a910..1ddc0cbc1ca 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -225,9 +225,7 @@ static ULONG WINAPI d3d9_vertex_declaration_AddRef(IDirect3DVertexDeclaration9 * if (refcount == 1) { IDirect3DDevice9Ex_AddRef(declaration->parent_device); - wined3d_mutex_lock(); wined3d_vertex_declaration_incref(declaration->wined3d_declaration); - wined3d_mutex_unlock(); } return refcount; @@ -243,9 +241,7 @@ static ULONG WINAPI d3d9_vertex_declaration_Release(IDirect3DVertexDeclaration9 if (!refcount) { IDirect3DDevice9Ex *parent_device = declaration->parent_device; - wined3d_mutex_lock(); wined3d_vertex_declaration_decref(declaration->wined3d_declaration); - wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ IDirect3DDevice9Ex_Release(parent_device);

1 0

Jan Sikorski : d3d9: Don't grab wined3d lock in index/vertexbuffer AddRef/Release().
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 6b866b93e0fe528eef13f2d1937f3fa66790ec34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b866b93e0fe528eef13f2d1… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:29 2021 +0200 d3d9: Don't grab wined3d lock in index/vertexbuffer AddRef/Release(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 901557c288f..bcb97011fe5 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -56,12 +56,10 @@ static ULONG WINAPI d3d9_vertexbuffer_AddRef(IDirect3DVertexBuffer9 *iface) if (refcount == 1) { IDirect3DDevice9Ex_AddRef(buffer->parent_device); - wined3d_mutex_lock(); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); else wined3d_buffer_incref(buffer->wined3d_buffer); - wined3d_mutex_unlock(); } return refcount; @@ -79,12 +77,10 @@ static ULONG WINAPI d3d9_vertexbuffer_Release(IDirect3DVertexBuffer9 *iface) struct wined3d_buffer *draw_buffer = buffer->draw_buffer; IDirect3DDevice9Ex *device = buffer->parent_device; - wined3d_mutex_lock(); if (draw_buffer) wined3d_buffer_decref(draw_buffer); else wined3d_buffer_decref(buffer->wined3d_buffer); - wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ IDirect3DDevice9Ex_Release(device); @@ -388,12 +384,10 @@ static ULONG WINAPI d3d9_indexbuffer_AddRef(IDirect3DIndexBuffer9 *iface) if (refcount == 1) { IDirect3DDevice9Ex_AddRef(buffer->parent_device); - wined3d_mutex_lock(); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); else wined3d_buffer_incref(buffer->wined3d_buffer); - wined3d_mutex_unlock(); } return refcount; @@ -411,12 +405,10 @@ static ULONG WINAPI d3d9_indexbuffer_Release(IDirect3DIndexBuffer9 *iface) struct wined3d_buffer *draw_buffer = buffer->draw_buffer; IDirect3DDevice9Ex *device = buffer->parent_device; - wined3d_mutex_lock(); if (draw_buffer) wined3d_buffer_decref(draw_buffer); else wined3d_buffer_decref(buffer->wined3d_buffer); - wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ IDirect3DDevice9Ex_Release(device);

1 0

Jan Sikorski : d3d9: Don't grab wined3d lock for wined3d_query_issue().
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 64b7ba3d653f2ed2d51b55c1909724ae63134c01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64b7ba3d653f2ed2d51b55c1… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:30 2021 +0200 d3d9: Don't grab wined3d lock for wined3d_query_issue(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/query.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 450a58091fa..b539e22b957 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -123,15 +123,8 @@ static DWORD WINAPI d3d9_query_GetDataSize(IDirect3DQuery9 *iface) static HRESULT WINAPI d3d9_query_Issue(IDirect3DQuery9 *iface, DWORD flags) { struct d3d9_query *query = impl_from_IDirect3DQuery9(iface); - HRESULT hr; - TRACE("iface %p, flags %#x.\n", iface, flags); - - wined3d_mutex_lock(); - hr = wined3d_query_issue(query->wined3d_query, flags); - wined3d_mutex_unlock(); - - return hr; + return wined3d_query_issue(query->wined3d_query, flags); } static HRESULT WINAPI d3d9_query_GetData(IDirect3DQuery9 *iface, void *data, DWORD size, DWORD flags)

1 0

Alexandre Julliard : include: Don't include sys/stat.h in wine/port.h.
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: c27832d717e413d14aa3cb41e02fa3339c298e3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c27832d717e413d14aa3cb41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 30 22:34:28 2021 +0200 include: Don't include sys/stat.h in wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 1 + include/wine/port.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 04e8fe3c0f5..aa6db175e69 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -28,6 +28,7 @@ #include <fcntl.h> #include <unistd.h> #include <sys/time.h> +#include <sys/stat.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif diff --git a/include/wine/port.h b/include/wine/port.h index fda19f0ad4b..35ffb9d6aba 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -31,7 +31,6 @@ #include <fcntl.h> #include <sys/types.h> -#include <sys/stat.h> #include <string.h> #include <stdlib.h> #ifdef HAVE_UNISTD_H

1 0

Alexandre Julliard : include: Don't include fcntl.h in wine/port.h.
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 341cb1a933aec7b2858414f571ea98ba29caa72a URL: https://source.winehq.org/git/wine.git/?a=commit;h=341cb1a933aec7b2858414f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 30 22:36:22 2021 +0200 include: Don't include fcntl.h in wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/diskarb.c | 1 + dlls/win32u/freetype.c | 1 + include/wine/port.h | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index e33365f6301..fa8550cee9f 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -23,6 +23,7 @@ #include <assert.h> #include <errno.h> +#include <fcntl.h> #include <stdarg.h> #include <stdio.h> #include <unistd.h> diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 76afc8e8ead..6e573b23cdf 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -30,6 +30,7 @@ #include <stdarg.h> #include <stdlib.h> +#include <fcntl.h> #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif diff --git a/include/wine/port.h b/include/wine/port.h index 35ffb9d6aba..0e9911af9ad 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -29,7 +29,6 @@ # error You must include port.h before all other headers #endif -#include <fcntl.h> #include <sys/types.h> #include <string.h> #include <stdlib.h>

1 0

Alexandre Julliard : configure: Fix the libsane notice check.
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 677107378ee979f33d88f02a828e2c0576e33281 URL: https://source.winehq.org/git/wine.git/?a=commit;h=677107378ee979f33d88f02a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Oct 31 10:02:20 2021 +0100 configure: Fix the libsane notice check. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51951 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 0156a507439..167d5f161cd 100755 --- a/configure +++ b/configure @@ -13345,7 +13345,7 @@ fi CPPFLAGS=$ac_save_CPPFLAGS fi -if test "x$ac_cv_lib_soname_sane" = "x"; then : +if test "$ac_cv_lib_sane_sane_init" != "yes"; then : case "x$with_sane" in x) as_fn_append wine_notices "|libsane ${notice_platform}development files not found, scanners won't be supported." ;; xno) ;; diff --git a/configure.ac b/configure.ac index ab55c72a238..c8c09d834f1 100644 --- a/configure.ac +++ b/configure.ac @@ -1348,7 +1348,7 @@ then [AC_CHECK_HEADER(sane/sane.h, [AC_CHECK_LIB(sane,sane_init,[:],,[$SANE_LIBS])])]) fi -WINE_NOTICE_WITH(sane,[test "x$ac_cv_lib_soname_sane" = "x"], +WINE_NOTICE_WITH(sane,[test "$ac_cv_lib_sane_sane_init" != "yes"], [libsane ${notice_platform}development files not found, scanners won't be supported.], [enable_sane_ds])

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Add a helper for comparison operations.
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: vkd3d Branch: master Commit: ed0223e62927e1ddfb5a85d819cb12c362713e92 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ed0223e62927e1ddfb5a85d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Oct 15 10:37:04 2021 +0200 vkd3d-shader/hlsl: Add a helper for comparison operations. The only difference from arithmetic operations is that the result has always base type bool. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 48 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 528a122..e591af9 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1056,6 +1056,42 @@ static struct list *add_binary_arithmetic_expr_merge(struct hlsl_ctx *ctx, struc return list1; } +static struct hlsl_ir_expr *add_binary_comparison_expr(struct hlsl_ctx *ctx, struct list *instrs, + enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, + struct vkd3d_shader_location *loc) +{ + struct hlsl_type *common_type, *return_type; + enum hlsl_base_type base = expr_common_base_type(arg1->data_type->base_type, arg2->data_type->base_type); + enum hlsl_type_class type; + unsigned int dimx, dimy; + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; + + if (!expr_common_shape(ctx, arg1->data_type, arg2->data_type, loc, &type, &dimx, &dimy)) + return NULL; + + common_type = hlsl_get_numeric_type(ctx, type, base, dimx, dimy); + return_type = hlsl_get_numeric_type(ctx, type, HLSL_TYPE_BOOL, dimx, dimy); + + if (!(args[0] = add_implicit_conversion(ctx, instrs, arg1, common_type, loc))) + return NULL; + + if (!(args[1] = add_implicit_conversion(ctx, instrs, arg2, common_type, loc))) + return NULL; + + return add_expr(ctx, instrs, op, args, return_type, loc); +} + +static struct list *add_binary_comparison_expr_merge(struct hlsl_ctx *ctx, struct list *list1, struct list *list2, + enum hlsl_ir_expr_op op, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_node *arg1 = node_from_list(list1), *arg2 = node_from_list(list2); + + list_move_tail(list1, list2); + vkd3d_free(list2); + add_binary_comparison_expr(ctx, list1, op, arg1, arg2, &loc); + return list1; +} + static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) { static const enum hlsl_ir_expr_op ops[] = @@ -3256,30 +3292,30 @@ relational_expr: shift_expr | relational_expr '<' shift_expr { - $$ = add_binary_arithmetic_expr_merge(ctx, $1, $3, HLSL_OP2_LESS, @2); + $$ = add_binary_comparison_expr_merge(ctx, $1, $3, HLSL_OP2_LESS, @2); } | relational_expr '>' shift_expr { - $$ = add_binary_arithmetic_expr_merge(ctx, $1, $3, HLSL_OP2_GREATER, @2); + $$ = add_binary_comparison_expr_merge(ctx, $1, $3, HLSL_OP2_GREATER, @2); } | relational_expr OP_LE shift_expr { - $$ = add_binary_arithmetic_expr_merge(ctx, $1, $3, HLSL_OP2_LEQUAL, @2); + $$ = add_binary_comparison_expr_merge(ctx, $1, $3, HLSL_OP2_LEQUAL, @2); } | relational_expr OP_GE shift_expr { - $$ = add_binary_arithmetic_expr_merge(ctx, $1, $3, HLSL_OP2_GEQUAL, @2); + $$ = add_binary_comparison_expr_merge(ctx, $1, $3, HLSL_OP2_GEQUAL, @2); } equality_expr: relational_expr | equality_expr OP_EQ relational_expr { - $$ = add_binary_arithmetic_expr_merge(ctx, $1, $3, HLSL_OP2_EQUAL, @2); + $$ = add_binary_comparison_expr_merge(ctx, $1, $3, HLSL_OP2_EQUAL, @2); } | equality_expr OP_NE relational_expr { - $$ = add_binary_arithmetic_expr_merge(ctx, $1, $3, HLSL_OP2_NEQUAL, @2); + $$ = add_binary_comparison_expr_merge(ctx, $1, $3, HLSL_OP2_NEQUAL, @2); } bitand_expr:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use last_read for resource loads.
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: vkd3d Branch: master Commit: 5e3b8b70fce316716a99574eca5a8fb9ebdb7770 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5e3b8b70fce316716a99574… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 15 16:54:07 2021 -0500 vkd3d-shader/hlsl: Use last_read for resource loads. This fixes DCE. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.h | 1 - libs/vkd3d-shader/hlsl_codegen.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 31b7ddb..93191e5 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -240,7 +240,6 @@ struct hlsl_ir_var uint32_t is_output_semantic : 1; uint32_t is_uniform : 1; uint32_t is_param : 1; - uint32_t has_resource_access : 1; }; struct hlsl_ir_function diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index bf93a03..b7b0cd1 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -591,6 +591,8 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs LIST_FOR_EACH_ENTRY(instr, instrs, struct hlsl_ir_node, entry) { + const unsigned int var_last_read = loop_last ? max(instr->index, loop_last) : instr->index; + switch (instr->type) { case HLSL_IR_STORE: @@ -628,7 +630,7 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs struct hlsl_ir_load *load = hlsl_ir_load(instr); var = load->src.var; - var->last_read = max(var->last_read, loop_last ? max(instr->index, loop_last) : instr->index); + var->last_read = max(var->last_read, var_last_read); if (load->src.offset.node) load->src.offset.node->last_read = instr->index; break; @@ -645,7 +647,8 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs { struct hlsl_ir_resource_load *load = hlsl_ir_resource_load(instr); - load->resource.var->has_resource_access = 1; + var = load->resource.var; + var->last_read = max(var->last_read, var_last_read); if (load->resource.offset.node) load->resource.offset.node->last_read = instr->index; load->coords.node->last_read = instr->index; @@ -676,10 +679,7 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl LIST_FOR_EACH_ENTRY(scope, &ctx->scopes, struct hlsl_scope, entry) { LIST_FOR_EACH_ENTRY(var, &scope->vars, struct hlsl_ir_var, scope_entry) - { var->first_write = var->last_read = 0; - var->has_resource_access = 0; - } } LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) @@ -1203,7 +1203,7 @@ static const struct hlsl_ir_var *get_reserved_texture(struct hlsl_ctx *ctx, uint LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, const struct hlsl_ir_var, extern_entry) { - if (var->has_resource_access && var->reg_reservation.type == 't' && var->reg_reservation.index == index) + if (var->last_read && var->reg_reservation.type == 't' && var->reg_reservation.index == index) return var; } return NULL; @@ -1216,7 +1216,7 @@ static void allocate_textures(struct hlsl_ctx *ctx) LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - if (!var->has_resource_access || var->data_type->type != HLSL_CLASS_OBJECT + if (!var->last_read || var->data_type->type != HLSL_CLASS_OBJECT || var->data_type->base_type != HLSL_TYPE_TEXTURE) continue;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Generate synthetic temps for object uniforms as well.
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: vkd3d Branch: master Commit: 423213fb0509423b51c6f59d01c7f1a1e7a8b1c2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=423213fb0509423b51c6f59… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 15 16:54:08 2021 -0500 vkd3d-shader/hlsl: Generate synthetic temps for object uniforms as well. These can be assigned to when compatibility mode is used. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index b7b0cd1..03c098f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1310,35 +1310,26 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) { - if (var->data_type->type == HLSL_CLASS_OBJECT) - list_add_tail(&ctx->extern_vars, &var->extern_entry); - else if (var->modifiers & HLSL_STORAGE_UNIFORM) + if (var->modifiers & HLSL_STORAGE_UNIFORM) prepend_uniform_copy(ctx, entry_func->body, var); } LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) { - if (var->data_type->type == HLSL_CLASS_OBJECT) + if (var->data_type->type == HLSL_CLASS_OBJECT || (var->modifiers & HLSL_STORAGE_UNIFORM)) { - list_add_tail(&ctx->extern_vars, &var->extern_entry); + prepend_uniform_copy(ctx, entry_func->body, var); } else { - if (var->modifiers & HLSL_STORAGE_UNIFORM) - { - prepend_uniform_copy(ctx, entry_func->body, var); - } - else - { - if (var->data_type->type != HLSL_CLASS_STRUCT && !var->semantic.name) - hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, - "Parameter \"%s\" is missing a semantic.", var->name); - - if (var->modifiers & HLSL_STORAGE_IN) - prepend_input_var_copy(ctx, entry_func->body, var); - if (var->modifiers & HLSL_STORAGE_OUT) - append_output_var_copy(ctx, entry_func->body, var); - } + if (var->data_type->type != HLSL_CLASS_STRUCT && !var->semantic.name) + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, + "Parameter \"%s\" is missing a semantic.", var->name); + + if (var->modifiers & HLSL_STORAGE_IN) + prepend_input_var_copy(ctx, entry_func->body, var); + if (var->modifiers & HLSL_STORAGE_OUT) + append_output_var_copy(ctx, entry_func->body, var); } } if (entry_func->return_var)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Store the function body directly in the hlsl_ir_function_decl structure.
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: vkd3d Branch: master Commit: 8485a7c450839fabbf55cf3515a505ae9002d05e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8485a7c450839fabbf55cf3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 15 16:54:09 2021 -0500 vkd3d-shader/hlsl: Store the function body directly in the hlsl_ir_function_decl structure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 10 +++++----- libs/vkd3d-shader/hlsl.h | 3 ++- libs/vkd3d-shader/hlsl.y | 6 ++++-- libs/vkd3d-shader/hlsl_codegen.c | 35 ++++++++++++++++++----------------- libs/vkd3d-shader/hlsl_sm1.c | 2 +- libs/vkd3d-shader/hlsl_sm4.c | 2 +- 6 files changed, 31 insertions(+), 27 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 8a56025..641e054 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -685,6 +685,7 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hl if (!(decl = hlsl_alloc(ctx, sizeof(*decl)))) return NULL; + list_init(&decl->body); decl->return_type = return_type; decl->parameters = parameters; decl->loc = loc; @@ -1340,8 +1341,8 @@ void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl dump_ir_var(ctx, &buffer, param); vkd3d_string_buffer_printf(&buffer, "\n"); } - if (func->body) - dump_instr_list(ctx, &buffer, func->body); + if (func->has_body) + dump_instr_list(ctx, &buffer, &func->body); vkd3d_string_buffer_trace(&buffer); vkd3d_string_buffer_cleanup(&buffer); @@ -1482,8 +1483,7 @@ void hlsl_free_instr(struct hlsl_ir_node *node) static void free_function_decl(struct hlsl_ir_function_decl *decl) { vkd3d_free(decl->parameters); - hlsl_free_instr_list(decl->body); - vkd3d_free(decl->body); + hlsl_free_instr_list(&decl->body); vkd3d_free(decl); } @@ -1530,7 +1530,7 @@ void hlsl_add_function(struct hlsl_ctx *ctx, char *name, struct hlsl_ir_function struct hlsl_ir_function_decl *old_decl = RB_ENTRY_VALUE(old_entry, struct hlsl_ir_function_decl, entry); - if (!decl->body) + if (!decl->has_body) { free_function_decl(decl); vkd3d_free(name); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 93191e5..99e00b0 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -258,7 +258,8 @@ struct hlsl_ir_function_decl struct rb_entry entry; struct hlsl_ir_function *func; struct list *parameters; - struct list *body; + struct list body; + bool has_body; }; struct hlsl_ir_if diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index e591af9..27ebf07 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2053,7 +2053,7 @@ hlsl_prog: decl = get_func_decl(&ctx->functions, $2.name, $2.decl->parameters); if (decl && !decl->func->intrinsic) { - if (decl->body && $2.decl->body) + if (decl->has_body && $2.decl->has_body) { hlsl_error(ctx, $2.decl->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Function \"%s\" is already defined.", $2.name); @@ -2247,7 +2247,9 @@ func_declaration: func_prototype compound_statement { $$ = $1; - $$.decl->body = $2; + $$.decl->has_body = true; + list_move_tail(&$$.decl->body, $2); + vkd3d_free($2); hlsl_pop_scope(ctx); } | func_prototype ';' diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 03c098f..a96c701 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -567,7 +567,7 @@ static void dump_function_decl(struct rb_entry *entry, void *context) struct hlsl_ir_function_decl *func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function_decl, entry); struct hlsl_ctx *ctx = context; - if (func->body) + if (func->has_body) hlsl_dump_function(ctx, func); } @@ -674,7 +674,7 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl struct hlsl_ir_var *var; /* Index 0 means unused; index 1 means function entry, so start at 2. */ - index_instructions(entry_func->body, 2); + index_instructions(&entry_func->body, 2); LIST_FOR_EACH_ENTRY(scope, &ctx->scopes, struct hlsl_scope, entry) { @@ -693,7 +693,7 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl if (entry_func->return_var) entry_func->return_var->last_read = UINT_MAX; - compute_liveness_recurse(entry_func->body, 0, 0); + compute_liveness_recurse(&entry_func->body, 0, 0); } struct liveness @@ -1001,7 +1001,7 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi struct liveness liveness = {0}; struct hlsl_ir_var *var; - allocate_const_registers_recurse(ctx, entry_func->body, &liveness); + allocate_const_registers_recurse(ctx, &entry_func->body, &liveness); LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { @@ -1026,7 +1026,7 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi static void allocate_temp_registers(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func) { struct liveness liveness = {0}; - allocate_temp_registers_recurse(ctx, entry_func->body, &liveness); + allocate_temp_registers_recurse(ctx, &entry_func->body, &liveness); ctx->temp_count = liveness.reg_count; vkd3d_free(liveness.regs); } @@ -1303,22 +1303,23 @@ struct hlsl_reg hlsl_reg_from_deref(const struct hlsl_deref *deref, const struct int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out) { + struct list *const body = &entry_func->body; struct hlsl_ir_var *var; bool progress; - list_move_head(entry_func->body, &ctx->static_initializers); + list_move_head(body, &ctx->static_initializers); LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) { if (var->modifiers & HLSL_STORAGE_UNIFORM) - prepend_uniform_copy(ctx, entry_func->body, var); + prepend_uniform_copy(ctx, body, var); } LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) { if (var->data_type->type == HLSL_CLASS_OBJECT || (var->modifiers & HLSL_STORAGE_UNIFORM)) { - prepend_uniform_copy(ctx, entry_func->body, var); + prepend_uniform_copy(ctx, body, var); } else { @@ -1327,9 +1328,9 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun "Parameter \"%s\" is missing a semantic.", var->name); if (var->modifiers & HLSL_STORAGE_IN) - prepend_input_var_copy(ctx, entry_func->body, var); + prepend_input_var_copy(ctx, body, var); if (var->modifiers & HLSL_STORAGE_OUT) - append_output_var_copy(ctx, entry_func->body, var); + append_output_var_copy(ctx, body, var); } } if (entry_func->return_var) @@ -1338,24 +1339,24 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun hlsl_error(ctx, entry_func->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, "Entry point \"%s\" is missing a return value semantic.", entry_func->func->name); - append_output_var_copy(ctx, entry_func->body, entry_func->return_var); + append_output_var_copy(ctx, body, entry_func->return_var); } - while (transform_ir(ctx, fold_redundant_casts, entry_func->body, NULL)); + while (transform_ir(ctx, fold_redundant_casts, body, NULL)); do { - progress = transform_ir(ctx, split_array_copies, entry_func->body, NULL); - progress |= transform_ir(ctx, split_struct_copies, entry_func->body, NULL); + progress = transform_ir(ctx, split_array_copies, body, NULL); + progress |= transform_ir(ctx, split_struct_copies, body, NULL); } while (progress); - while (transform_ir(ctx, fold_constants, entry_func->body, NULL)); + while (transform_ir(ctx, fold_constants, body, NULL)); if (ctx->profile->major_version < 4) - transform_ir(ctx, lower_division, entry_func->body, NULL); + transform_ir(ctx, lower_division, body, NULL); do compute_liveness(ctx, entry_func); - while (transform_ir(ctx, dce, entry_func->body, NULL)); + while (transform_ir(ctx, dce, body, NULL)); compute_liveness(ctx, entry_func); diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 9fc1b22..f7ccf74 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -768,7 +768,7 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b { const struct hlsl_ir_node *instr; - LIST_FOR_EACH_ENTRY(instr, entry_func->body, struct hlsl_ir_node, entry) + LIST_FOR_EACH_ENTRY(instr, &entry_func->body, struct hlsl_ir_node, entry) { if (instr->data_type) { diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index c979e14..aee06b0 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1472,7 +1472,7 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, if (ctx->temp_count) write_sm4_dcl_temps(&buffer, ctx->temp_count); - LIST_FOR_EACH_ENTRY(instr, entry_func->body, struct hlsl_ir_node, entry) + LIST_FOR_EACH_ENTRY(instr, &entry_func->body, struct hlsl_ir_node, entry) { if (instr->data_type) {

1 0