- Wine-Commits - list.winehq.org

Francisco Casas : tests: Add failing test for clip.shader_test in SM1.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: vkd3d Branch: master Commit: 808ec288cfa95d3c4cdfad6082693d7044bfe794 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/808ec288cfa95d3c4cdfad6082693… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Mar 4 12:53:30 2024 -0300 tests: Add failing test for clip.shader_test in SM1. We are not properly translating texkill to spir-v since it is only considering the first component. --- tests/hlsl/clip.shader_test | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/hlsl/clip.shader_test b/tests/hlsl/clip.shader_test index 1ebc0687..64ccb6b1 100644 --- a/tests/hlsl/clip.shader_test +++ b/tests/hlsl/clip.shader_test @@ -20,3 +20,9 @@ probe all rgba (9, 8, 7, 6) uniform 0 float4 9 0 7 6 todo(glsl) draw quad probe all rgba (9, 0, 7, 6) +uniform 0 float4 3 -8 3 0 +todo(glsl) draw quad +todo(sm<4) probe all rgba (9, 0, 7, 6) +uniform 0 float4 3 3 3 -1 +todo(glsl) draw quad +todo(sm<4) probe all rgba (9, 0, 7, 6)

1 0

Francisco Casas : vkd3d-shader/hlsl: Merge HLSL_OP3_MOVC into HLSL_OP3_TERNARY.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: vkd3d Branch: master Commit: 3a0a4b625f533cce9323da0910c41381e6676373 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3a0a4b625f533cce9323da0910c41… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Apr 5 16:34:32 2024 -0300 vkd3d-shader/hlsl: Merge HLSL_OP3_MOVC into HLSL_OP3_TERNARY. --- libs/vkd3d-shader/hlsl.c | 1 - libs/vkd3d-shader/hlsl.h | 5 +---- libs/vkd3d-shader/hlsl_codegen.c | 45 +++++++++++++++------------------------- libs/vkd3d-shader/tpf.c | 2 +- tests/hlsl/ternary.shader_test | 2 +- 5 files changed, 20 insertions(+), 35 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 5638a03a..62467c68 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2631,7 +2631,6 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP3_CMP] = "cmp", [HLSL_OP3_DP2ADD] = "dp2add", - [HLSL_OP3_MOVC] = "movc", [HLSL_OP3_TERNARY] = "ternary", }; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3f8eeb57..9882caf7 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -602,11 +602,8 @@ enum hlsl_ir_expr_op * then adds c. */ HLSL_OP3_DP2ADD, /* TERNARY(a, b, c) returns 'b' if 'a' is true and 'c' otherwise. 'a' must always be boolean. - * MOVC(a, b, c) returns 'c' if 'a' is bitwise zero and 'b' otherwise. - * CMP(a, b, c) returns 'b' if 'a' >= 0, and 'c' otherwise. It's used only for SM1-SM3 targets, - while SM4+ is using MOVC in such cases. */ + * CMP(a, b, c) returns 'b' if 'a' >= 0, and 'c' otherwise. It's used only for SM1-SM3 targets. */ HLSL_OP3_CMP, - HLSL_OP3_MOVC, HLSL_OP3_TERNARY, }; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index ef3ef919..3bb90c98 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2954,7 +2954,7 @@ static bool lower_logic_not(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, st return true; } -/* Use movc/cmp for the ternary operator. */ +/* Lower TERNARY to CMP for SM1. */ static bool lower_ternary(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) { struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS] = { 0 }, *replacement; @@ -2981,35 +2981,23 @@ static bool lower_ternary(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, stru assert(cond->data_type->base_type == HLSL_TYPE_BOOL); - if (ctx->profile->major_version < 4) - { - type = hlsl_get_numeric_type(ctx, instr->data_type->class, HLSL_TYPE_FLOAT, - instr->data_type->dimx, instr->data_type->dimy); + type = hlsl_get_numeric_type(ctx, instr->data_type->class, HLSL_TYPE_FLOAT, + instr->data_type->dimx, instr->data_type->dimy); - if (!(float_cond = hlsl_new_cast(ctx, cond, type, &instr->loc))) - return false; - hlsl_block_add_instr(block, float_cond); + if (!(float_cond = hlsl_new_cast(ctx, cond, type, &instr->loc))) + return false; + hlsl_block_add_instr(block, float_cond); - if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, float_cond, &instr->loc))) - return false; - hlsl_block_add_instr(block, neg); + if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, float_cond, &instr->loc))) + return false; + hlsl_block_add_instr(block, neg); - memset(operands, 0, sizeof(operands)); - operands[0] = neg; - operands[1] = second; - operands[2] = first; - if (!(replacement = hlsl_new_expr(ctx, HLSL_OP3_CMP, operands, first->data_type, &instr->loc))) - return false; - } - else - { - memset(operands, 0, sizeof(operands)); - operands[0] = cond; - operands[1] = first; - operands[2] = second; - if (!(replacement = hlsl_new_expr(ctx, HLSL_OP3_MOVC, operands, first->data_type, &instr->loc))) - return false; - } + memset(operands, 0, sizeof(operands)); + operands[0] = neg; + operands[1] = second; + operands[2] = first; + if (!(replacement = hlsl_new_expr(ctx, HLSL_OP3_CMP, operands, first->data_type, &instr->loc))) + return false; hlsl_block_add_instr(block, replacement); return true; @@ -5429,9 +5417,10 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry hlsl_transform_ir(ctx, track_object_components_usage, body, NULL); sort_synthetic_separated_samplers_first(ctx); - lower_ir(ctx, lower_ternary, body); if (profile->major_version < 4) { + lower_ir(ctx, lower_ternary, body); + lower_ir(ctx, lower_nonfloat_exprs, body); /* Constants casted to float must be folded, and new casts to bool also need to be lowered. */ hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL); diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 4d065831..23cde7ca 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -5343,7 +5343,7 @@ static void write_sm4_expr(const struct tpf_writer *tpf, const struct hlsl_ir_ex &expr->node, arg1, arg2); break; - case HLSL_OP3_MOVC: + case HLSL_OP3_TERNARY: write_sm4_ternary_op(tpf, VKD3D_SM4_OP_MOVC, &expr->node, arg1, arg2, arg3); break; diff --git a/tests/hlsl/ternary.shader_test b/tests/hlsl/ternary.shader_test index 91802afd..0ac78914 100644 --- a/tests/hlsl/ternary.shader_test +++ b/tests/hlsl/ternary.shader_test @@ -318,7 +318,7 @@ probe all rgba (2.0, 3.0, 3.0, 2.0) % Objects can be used, but their types have to be identical. -[pixel shader todo] +[pixel shader todo(sm<4)] Texture2D t; float4 main() : sv_target

1 0

Francisco Casas : vkd3d-shader/tpf: Use the extra_bits field for _nz on discard.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: vkd3d Branch: master Commit: 8fca80159140c7f61b1a6d4a0feee5e2eafa397b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8fca80159140c7f61b1a6d4a0feee… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Mar 1 22:50:08 2024 -0300 vkd3d-shader/tpf: Use the extra_bits field for _nz on discard. --- libs/vkd3d-shader/tpf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 23cde7ca..e7dec567 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -5399,7 +5399,8 @@ static void write_sm4_jump(const struct tpf_writer *tpf, const struct hlsl_ir_ju case HLSL_IR_JUMP_DISCARD_NZ: { - instr.opcode = VKD3D_SM4_OP_DISCARD | VKD3D_SM4_CONDITIONAL_NZ; + instr.opcode = VKD3D_SM4_OP_DISCARD; + instr.extra_bits = VKD3D_SM4_CONDITIONAL_NZ; memset(&instr.srcs[0], 0, sizeof(*instr.srcs)); instr.src_count = 1;

1 0

Francisco Casas : vkd3d-shader/hlsl: Ensure that TERNARY condition is always bool.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: vkd3d Branch: master Commit: 19fd43214bf2ae4a69e240e658b47800e194124e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/19fd43214bf2ae4a69e240e658b47… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Mar 1 16:01:03 2024 -0300 vkd3d-shader/hlsl: Ensure that TERNARY condition is always bool. Also, properly casting it to float in lower_ternary() for SM1 avoids creating ABS and NEG on bool types. --- libs/vkd3d-shader/hlsl.h | 10 ++--- libs/vkd3d-shader/hlsl.y | 51 ++++++++++++++++--------- libs/vkd3d-shader/hlsl_codegen.c | 42 ++++++++++---------- libs/vkd3d-shader/hlsl_constant_ops.c | 23 +---------- tests/hlsl/arithmetic-float-uniform.shader_test | 16 ++++---- tests/hlsl/float-comparison.shader_test | 4 +- tests/hlsl/fmod.shader_test | 12 +++--- tests/hlsl/inverse-trig.shader_test | 44 ++++++++++----------- tests/hlsl/lit.shader_test | 12 +++--- tests/hlsl/ternary.shader_test | 18 ++++----- tests/hlsl/vertex-shader-ops.shader_test | 6 +-- 11 files changed, 115 insertions(+), 123 deletions(-)

1 0

Francisco Casas : vkd3d-shader/hlsl: Move lower of non-float expressions with the other SM1 passes.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: vkd3d Branch: master Commit: 8f6f875a5929a10974f4bba8761c4bf0c8a58bb2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8f6f875a5929a10974f4bba8761c4… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Apr 2 19:47:51 2024 -0300 vkd3d-shader/hlsl: Move lower of non-float expressions with the other SM1 passes. --- libs/vkd3d-shader/hlsl_codegen.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 711766e2..ef3ef919 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -5418,13 +5418,6 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry remove_unreachable_code(ctx, body); hlsl_transform_ir(ctx, normalize_switch_cases, body, NULL); - if (profile-> major_version < 4) - { - lower_ir(ctx, lower_nonfloat_exprs, body); - /* Constants casted to float must be folded. */ - hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL); - } - lower_ir(ctx, lower_nonconstant_vector_derefs, body); lower_ir(ctx, lower_casts_to_bool, body); lower_ir(ctx, lower_int_dot, body); @@ -5439,6 +5432,11 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry lower_ir(ctx, lower_ternary, body); if (profile->major_version < 4) { + lower_ir(ctx, lower_nonfloat_exprs, body); + /* Constants casted to float must be folded, and new casts to bool also need to be lowered. */ + hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL); + lower_ir(ctx, lower_casts_to_bool, body); + lower_ir(ctx, lower_casts_to_int, body); lower_ir(ctx, lower_division, body); lower_ir(ctx, lower_sqrt, body);

1 0

Francisco Casas : tests: Report missing signature element in openGL runner.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: vkd3d Branch: master Commit: 3503145cedf90d368e3745ff1abd7cc21a2f60f8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3503145cedf90d368e3745ff1abd7… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Feb 22 17:46:38 2024 -0300 tests: Report missing signature element in openGL runner. --- tests/shader_runner_gl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/shader_runner_gl.c b/tests/shader_runner_gl.c index e56eccab..2045950e 100644 --- a/tests/shader_runner_gl.c +++ b/tests/shader_runner_gl.c @@ -1046,6 +1046,7 @@ static bool gl_runner_draw(struct shader_runner *r, signature_element = vkd3d_shader_find_signature_element(&vs_input_signature, element->name, element->index, 0); + ok(signature_element, "Cannot find signature element %s%u.\n", element->name, element->index); attribute_idx = signature_element->register_index; format = get_format_info(element->format, false);

1 0

Jacek Caban : winegcc: Add -marm64x option for linking ARM64X images.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 00198c4084a61f65f18574d16833d945e50c0614 URL: https://gitlab.winehq.org/wine/wine/-/commit/00198c4084a61f65f18574d16833d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 8 23:35:25 2024 +0200 winegcc: Add -marm64x option for linking ARM64X images. --- tools/winegcc/winegcc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 694242542ad..fb759063da9 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -191,6 +191,7 @@ struct options const char* entry_point; const char* debug_file; const char* out_implib; + const char* native_arch; struct strarray prefix; struct strarray lib_dirs; struct strarray args; @@ -1232,6 +1233,13 @@ static void build(struct options* opts) build_spec_obj( opts, spec_file, output_file, opts->target_alias, files, resources, lib_dirs, entry_point, &spec_objs ); + if (opts->native_arch) + { + const char *suffix = strchr( opts->target_alias, '-' ); + if (!suffix) suffix = ""; + build_spec_obj( opts, spec_file, output_file, strmake( "%s%s", opts->native_arch, suffix ), + files, empty_strarray, lib_dirs, entry_point, &spec_objs ); + } if (opts->fake_module) return; /* nothing else to do */ @@ -1707,6 +1715,11 @@ int main(int argc, char **argv) { raw_linker_arg = 1; } + else if (!strcmp("-marm64x", opts.args.str[i] )) + { + raw_linker_arg = 1; + opts.native_arch = "aarch64"; + } else if (!strncmp("-mcpu=", opts.args.str[i], 6) || !strncmp("-mfpu=", opts.args.str[i], 6) || !strncmp("-march=", opts.args.str[i], 7))

1 0

Jacek Caban : winegcc: Pass target and resources as arguments to build_spec_obj.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 753f405536eb97b6fe06348a9d89d9a312a7c652 URL: https://gitlab.winehq.org/wine/wine/-/commit/753f405536eb97b6fe06348a9d89d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Feb 17 01:49:18 2024 +0100 winegcc: Pass target and resources as arguments to build_spec_obj. --- tools/winegcc/winegcc.c | 76 ++++++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 35 deletions(-)

1 0

Sam Joan Roque-Worcel : win32u: Make SCROLL_MIN_THUMB larger.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 939b3d19318a2d8947997e80767659fd00f67e43 URL: https://gitlab.winehq.org/wine/wine/-/commit/939b3d19318a2d8947997e80767659… Author: Sam Joan Roque-Worcel <sam(a)roque-worcel.com> Date: Fri Apr 5 21:35:51 2024 +0100 win32u: Make SCROLL_MIN_THUMB larger. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54759 --- dlls/win32u/scroll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index 19a9a1379f4..f72ef0c2929 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(scroll); #define SCROLL_MIN_RECT 4 /* Minimum size of the thumb in pixels */ -#define SCROLL_MIN_THUMB 8 +#define SCROLL_MIN_THUMB 17 /* Overlap between arrows and thumb */ #define SCROLL_ARROW_THUMB_OVERLAP 0

1 0

Paul Gofman : winegstreamer: Try to handle broken IStream_Stat implementation in WM reader OpenStream().
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 6ad606483959dbacf3179b277983b5b0404423fe URL: https://gitlab.winehq.org/wine/wine/-/commit/6ad606483959dbacf3179b277983b5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 3 15:02:49 2024 -0600 winegstreamer: Try to handle broken IStream_Stat implementation in WM reader OpenStream(). --- dlls/winegstreamer/wm_reader.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 18910f87d40..c96d053ccae 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -2224,18 +2224,36 @@ static HRESULT WINAPI reader_Open(IWMSyncReader2 *iface, const WCHAR *filename) static HRESULT WINAPI reader_OpenStream(IWMSyncReader2 *iface, IStream *stream) { + static const ULONG64 canary_size = 0xdeadbeeffeedcafe; struct wm_reader *reader = impl_from_IWMSyncReader2(iface); STATSTG stat; HRESULT hr; TRACE("reader %p, stream %p.\n", reader, stream); + stat.cbSize.QuadPart = canary_size; if (FAILED(hr = IStream_Stat(stream, &stat, STATFLAG_NONAME))) { ERR("Failed to stat stream, hr %#lx.\n", hr); return hr; } + if (stat.cbSize.QuadPart == canary_size) + { + /* Call of Juarez: Gunslinger implements IStream_Stat as an empty function returning S_OK, leaving + * the output stat unchanged. Windows doesn't call IStream_Seek(_SEEK_END) and probably validates + * the size against WMV file headers so the bigger cbSize doesn't change anything. + * Such streams work as soon as the uninitialized cbSize is big enough which is usually the case + * (if that is not the case Windows will favour shorter cbSize). */ + static const LARGE_INTEGER zero = { 0 }; + ULARGE_INTEGER pos = { .QuadPart = canary_size }; + + if (SUCCEEDED(hr = IStream_Seek(stream, zero, STREAM_SEEK_END, &pos))) + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + stat.cbSize.QuadPart = pos.QuadPart == canary_size ? 0 : pos.QuadPart; + ERR("IStream_Stat did not fill the stream size, size from _Seek %I64u.\n", stat.cbSize.QuadPart); + } + EnterCriticalSection(&reader->cs); if (reader->wg_parser)

1 0