- Wine-Commits - list.winehq.org

Gabriel Ivăncescu : notepad: Fix uninitialized upper 64-bits of `pos` in DoFind.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 929fdbbf5541d0139492b6e5072e0cb410073776 URL: https://gitlab.winehq.org/wine/wine/-/commit/929fdbbf5541d0139492b6e5072e0c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jan 18 18:30:14 2023 +0200 notepad: Fix uninitialized upper 64-bits of `pos` in DoFind. And get rid of the hacky casts. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- programs/notepad/main.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 930884d144f..829cd7af33b 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -441,10 +441,10 @@ static LPWSTR NOTEPAD_StrRStr(LPWSTR pszSource, LPWSTR pszLast, LPWSTR pszSrch) */ void NOTEPAD_DoFind(FINDREPLACEW *fr) { - LPWSTR content; + LPWSTR content, found; int len = lstrlenW(fr->lpstrFindWhat); int fileLen; - SIZE_T pos; + DWORD pos; fileLen = GetWindowTextLengthW(Globals.hEdit) + 1; content = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(WCHAR)); @@ -455,27 +455,24 @@ void NOTEPAD_DoFind(FINDREPLACEW *fr) switch (fr->Flags & (FR_DOWN|FR_MATCHCASE)) { case 0: - pos = StrRStrIW(content, content+pos-len, fr->lpstrFindWhat) - content; - if (pos == -(SIZE_T)content) pos = ~(SIZE_T)0; + found = StrRStrIW(content, content+pos-len, fr->lpstrFindWhat); break; case FR_DOWN: - pos = StrStrIW(content+pos, fr->lpstrFindWhat) - content; - if (pos == -(SIZE_T)content) pos = ~(SIZE_T)0; + found = StrStrIW(content+pos, fr->lpstrFindWhat); break; case FR_MATCHCASE: - pos = NOTEPAD_StrRStr(content, content+pos-len, fr->lpstrFindWhat) - content; - if (pos == -(SIZE_T)content) pos = ~(SIZE_T)0; + found = NOTEPAD_StrRStr(content, content+pos-len, fr->lpstrFindWhat); break; case FR_DOWN|FR_MATCHCASE: - pos = StrStrW(content+pos, fr->lpstrFindWhat) - content; - if (pos == -(SIZE_T)content) pos = ~(SIZE_T)0; + found = StrStrW(content+pos, fr->lpstrFindWhat); break; default: /* shouldn't happen */ return; } + pos = found - content; HeapFree(GetProcessHeap(), 0, content); - if (pos == ~(SIZE_T)0) + if (!found) { DIALOG_StringMsgBox(Globals.hFindReplaceDlg, STRING_NOTFOUND, fr->lpstrFindWhat, MB_ICONINFORMATION|MB_OK);

1 0

Eric Pouech : kernel32/tests: Extend share right for debugger's black box tests.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: ce083b37f9a67a7d15902268f554e572a8d6045f URL: https://gitlab.winehq.org/wine/wine/-/commit/ce083b37f9a67a7d15902268f554e5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jan 17 18:10:05 2023 +0100 kernel32/tests: Extend share right for debugger's black box tests. Trying to improve upon previous attempt: 2486f5a0028de8bfd23c46e8f1d95064cf994be5 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53456 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/debugger.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index a3f09abaa70..a190fc6f3f3 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -134,7 +134,7 @@ static void save_blackbox(const char* logfile, void* blackbox, int size, const c DWORD written; BOOL ret; - hFile = CreateFileA(logfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, 0); + hFile = CreateFileA(logfile, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, 0); ok(hFile != INVALID_HANDLE_VALUE, "Couldn't create %s: %lu\n", logfile, GetLastError()); if (hFile == INVALID_HANDLE_VALUE) return; @@ -156,7 +156,7 @@ static int _load_blackbox(unsigned int line, const char* logfile, void* blackbox BOOL ret; char buf[4096]; - hFile = CreateFileA(logfile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + hFile = CreateFileA(logfile, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); if (hFile == INVALID_HANDLE_VALUE) { ok_(__FILE__, line)(0, "unable to open '%s': %#lx\n", logfile, GetLastError());

1 0

Francisco Casas : vkd3d-shader/hlsl: Reinterpret minimum precision types as their regular counterparts.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: 404a2d6a3d1ad99cce27d19952f8ccfc28785fa6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/404a2d6a3d1ad99cce27d19952f8c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Dec 7 18:06:06 2022 -0300 vkd3d-shader/hlsl: Reinterpret minimum precision types as their regular counterparts. Reinterpret min16float, min10float, min16int, min12int, and min16uint as their regular counterparts: float, float, int, int, uint, respectively. A proper implementation would require adding minimum precision indicators to all the dxbc-tpf instructions that use these types. Consider the output of fxc 10.1 with the following shader: uniform int i; float4 main() : sv_target { min16float4 a = {0, 1, 2, i}; min16int2 b = {4, i}; min10float3 c = {6.4, 7, i}; min12int d = 9.4; min16uint4x2 e = {14.4, 15, 16, 17, 18, 19, 20, i}; return mul(e, b) + a + c.xyzx + d; } However, if the graphics driver doesn't have minimum precision support, it ignores the minimum precision indicators and runs at 32-bit precision, which is equivalent as working with regular types. --- libs/vkd3d-shader/hlsl.c | 66 +++++++++++++++++++++++++++++++++++-- libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl.y | 18 ++++++++-- tests/minimum-precision.shader_test | 6 ++-- 4 files changed, 85 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 2b41d4d1..01172efd 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -680,6 +680,7 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, if (!(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK)) type->modifiers |= default_majority; type->sampler_dim = old->sampler_dim; + type->is_minimum_precision = old->is_minimum_precision; switch (old->type) { case HLSL_CLASS_ARRAY: @@ -2392,7 +2393,7 @@ static int compare_function_rb(const void *key, const struct rb_entry *entry) static void declare_predefined_types(struct hlsl_ctx *ctx) { - unsigned int x, y, bt, i; + unsigned int x, y, bt, i, v; struct hlsl_type *type; static const char * const names[] = @@ -2404,7 +2405,11 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) "uint", "bool", }; - char name[10]; + char name[15]; + + static const char *const variants_float[] = {"min10float", "min16float"}; + static const char *const variants_int[] = {"min12int", "min16int"}; + static const char *const variants_uint[] = {"min16uint"}; static const char *const sampler_names[] = { @@ -2464,6 +2469,63 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) } } + for (bt = 0; bt <= HLSL_TYPE_LAST_SCALAR; ++bt) + { + unsigned int n_variants = 0; + const char *const *variants; + + switch (bt) + { + case HLSL_TYPE_FLOAT: + variants = variants_float; + n_variants = ARRAY_SIZE(variants_float); + break; + + case HLSL_TYPE_INT: + variants = variants_int; + n_variants = ARRAY_SIZE(variants_int); + break; + + case HLSL_TYPE_UINT: + variants = variants_uint; + n_variants = ARRAY_SIZE(variants_uint); + break; + + default: + break; + } + + for (v = 0; v < n_variants; ++v) + { + for (y = 1; y <= 4; ++y) + { + for (x = 1; x <= 4; ++x) + { + sprintf(name, "%s%ux%u", variants[v], y, x); + type = hlsl_new_type(ctx, name, HLSL_CLASS_MATRIX, bt, x, y); + type->is_minimum_precision = 1; + hlsl_scope_add_type(ctx->globals, type); + + if (y == 1) + { + sprintf(name, "%s%u", variants[v], x); + type = hlsl_new_type(ctx, name, HLSL_CLASS_VECTOR, bt, x, y); + type->is_minimum_precision = 1; + hlsl_scope_add_type(ctx->globals, type); + + if (x == 1) + { + sprintf(name, "%s", variants[v]); + type = hlsl_new_type(ctx, name, HLSL_CLASS_SCALAR, bt, x, y); + type->is_minimum_precision = 1; + hlsl_scope_add_type(ctx->globals, type); + } + } + } + } + } + } + for (bt = 0; bt <= HLSL_SAMPLER_DIM_LAST_SAMPLER; ++bt) { type = hlsl_new_type(ctx, sampler_names[bt], HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index f9526d9f..bb63f827 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -191,6 +191,8 @@ struct hlsl_type unsigned int reg_size; /* Offset where the type's description starts in the output bytecode, in bytes. */ size_t bytecode_offset; + + uint32_t is_minimum_precision : 1; }; /* In HLSL, a semantic is a string linked to a variable (or a field) to be recognized across diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 93d4ca7d..bca49ee6 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4197,7 +4197,8 @@ type: YYABORT; } - $$ = hlsl_get_vector_type(ctx, $3->base_type, $5); + $$ = hlsl_type_clone(ctx, hlsl_get_vector_type(ctx, $3->base_type, $5), 0, 0); + $$->is_minimum_precision = $3->is_minimum_precision; } | KW_VECTOR { @@ -4229,7 +4230,8 @@ type: YYABORT; } - $$ = hlsl_get_matrix_type(ctx, $3->base_type, $7, $5); + $$ = hlsl_type_clone(ctx, hlsl_get_matrix_type(ctx, $3->base_type, $7, $5), 0, 0); + $$->is_minimum_precision = $3->is_minimum_precision; } | KW_MATRIX { @@ -4298,6 +4300,18 @@ type: | TYPE_IDENTIFIER { $$ = hlsl_get_type(ctx->cur_scope, $1, true); + if ($$->is_minimum_precision) + { + if (ctx->profile->major_version < 4) + { + hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Target profile doesn't support minimum-precision types."); + } + else + { + FIXME("Reinterpreting type %s.\n", $$->name); + } + } vkd3d_free($1); } | KW_STRUCT TYPE_IDENTIFIER diff --git a/tests/minimum-precision.shader_test b/tests/minimum-precision.shader_test index a9b43d74..e5053e3d 100644 --- a/tests/minimum-precision.shader_test +++ b/tests/minimum-precision.shader_test @@ -2,7 +2,7 @@ shader model >= 4.0 -[pixel shader todo] +[pixel shader] float4 main() : sv_target { min16float4 a = {0, 1, 2, 3}; @@ -17,5 +17,5 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (197.0, 218.0, 238.0, 257.0) +draw quad +probe all rgba (197.0, 218.0, 238.0, 257.0)

1 0

Zebediah Figura : tests: Add a test for compute thread IDs.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: 809a43f06b56f146e71783420a752ce651f47ebf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/809a43f06b56f146e71783420a752… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 16 18:55:56 2021 -0500 tests: Add a test for compute thread IDs. --- tests/d3d12.c | 39 ------------ tests/d3d12_test_utils.h | 29 +++++++++ tests/hlsl_d3d12.c | 161 +++++++++++++++++++++++++++++++++++++++++++++++ tests/utils.h | 10 +++ 4 files changed, 200 insertions(+), 39 deletions(-)

1 0

Alexandre Julliard : fixup! tests: Add a test for compute thread IDs.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: ef413356e25e38b997e7c69eef951c245b17ed7b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ef413356e25e38b997e7c69eef951… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 22:10:30 2023 +0100 fixup! tests: Add a test for compute thread IDs. --- tests/d3d12.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index ea569bc3..56d8aa39 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -11692,7 +11692,7 @@ static void test_root_signature_byte_code(void) HRESULT hr; #if 0 - #define RS "" +#define RS "" #endif /* /T rootsig_1_0 /E RS */ static const DWORD empty_rootsig[] = @@ -11718,7 +11718,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "RootFlags(ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT)" +#define RS "RootFlags(ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT)" #endif static const DWORD ia_rootsig[] = { @@ -11742,7 +11742,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "RootFlags(DENY_PIXEL_SHADER_ROOT_ACCESS)" +#define RS "RootFlags(DENY_PIXEL_SHADER_ROOT_ACCESS)" #endif static const DWORD deny_ps_rootsig[] = { @@ -11766,7 +11766,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "CBV(b3, space = 0)" +#define RS "CBV(b3, space = 0)" #endif static const DWORD cbv_rootsig[] = { @@ -11801,7 +11801,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "CBV(b4, space = 1, visibility = SHADER_VISIBILITY_GEOMETRY)" +#define RS "CBV(b4, space = 1, visibility = SHADER_VISIBILITY_GEOMETRY)" #endif static const DWORD cbv2_rootsig[] = { @@ -11835,7 +11835,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "RootFlags(DENY_VERTEX_SHADER_ROOT_ACCESS), SRV(t13)" +#define RS "RootFlags(DENY_VERTEX_SHADER_ROOT_ACCESS), SRV(t13)" #endif static const DWORD srv_rootsig[] = { @@ -11871,7 +11871,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "UAV(u6)" +#define RS "UAV(u6)" #endif static const DWORD uav_rootsig[] = { @@ -11905,7 +11905,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "CBV(b4, space = 1, visibility = SHADER_VISIBILITY_VERTEX), " \ +#define RS "CBV(b4, space = 1, visibility = SHADER_VISIBILITY_VERTEX), " \ "SRV(t13, flags = DATA_STATIC), " \ "UAV(u6, flags = DATA_STATIC_WHILE_SET_AT_EXECUTE)" #endif @@ -11941,7 +11941,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "RootConstants(num32BitConstants=3, b4), " \ +#define RS "RootConstants(num32BitConstants=3, b4), " \ "RootConstants(num32BitConstants=4, b5, space = 3)" #endif static const DWORD constants_rootsig[] = @@ -11980,7 +11980,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "DescriptorTable(CBV(b1, space = 7), " \ +#define RS "DescriptorTable(CBV(b1, space = 7), " \ "SRV(t16, numDescriptors = 8), " \ "UAV(u3, numDescriptors = unbounded, offset = 44))" #endif @@ -12034,7 +12034,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "DescriptorTable(CBV(b1, space = 7, flags = DESCRIPTORS_VOLATILE), " \ +#define RS "DescriptorTable(CBV(b1, space = 7, flags = DESCRIPTORS_VOLATILE), " \ "SRV(t16, numDescriptors = 8, flags = DESCRIPTORS_VOLATILE | DATA_VOLATILE), " \ "UAV(u3, numDescriptors = unbounded, offset = 44, flags = DATA_STATIC))" #endif @@ -12068,7 +12068,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "StaticSampler(s4)" +#define RS "StaticSampler(s4)" #endif static const DWORD default_static_sampler_rootsig[] = { @@ -12108,7 +12108,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "StaticSampler(s0, filter = FILTER_MIN_MAG_MIP_POINT, " \ +#define RS "StaticSampler(s0, filter = FILTER_MIN_MAG_MIP_POINT, " \ "addressV = TEXTURE_ADDRESS_CLAMP, visibility = SHADER_VISIBILITY_PIXEL), " \ "StaticSampler(s0, filter = FILTER_MIN_MAG_POINT_MIP_LINEAR, " \ "AddressW = TEXTURE_ADDRESS_BORDER, MipLODBias = 1, maxLod = 10, " \ @@ -21426,7 +21426,7 @@ static void test_tgsm(void) static const DWORD structured_tgsm_code[] = { #if 0 - #define GROUP_SIZE 32 +#define GROUP_SIZE 32 RWByteAddressBuffer u; RWByteAddressBuffer u2; @@ -21477,7 +21477,7 @@ static void test_tgsm(void) static const DWORD structured_tgsm_float_code[] = { #if 0 - #define GROUP_SIZE 32 +#define GROUP_SIZE 32 struct data {

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Support frac() intrinsic.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: 3e6fccdbf96802f62b001cd2461af2c6a58b85a4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3e6fccdbf96802f62b001cd2461af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 24 10:57:18 2023 +0300 vkd3d-shader/hlsl: Support frac() intrinsic. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34242 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.y | 12 ++++++++++++ libs/vkd3d-shader/hlsl_sm1.c | 4 ++++ tests/frac.shader_test | 12 ++++++++++++ 4 files changed, 29 insertions(+) diff --git a/Makefile.am b/Makefile.am index 0536c53b..be84e829 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,6 +60,7 @@ vkd3d_shader_tests = \ tests/compute.shader_test \ tests/conditional.shader_test \ tests/floor.shader_test \ + tests/frac.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-attributes.shader_test \ tests/hlsl-bool-cast.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b3e38d1f..93d4ca7d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2502,6 +2502,17 @@ static bool intrinsic_floor(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_FLOOR, arg, loc); } +static bool intrinsic_frac(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_FRACT, arg, loc); +} + static bool intrinsic_ldexp(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2922,6 +2933,7 @@ intrinsic_functions[] = {"cross", 2, true, intrinsic_cross}, {"dot", 2, true, intrinsic_dot}, {"floor", 1, true, intrinsic_floor}, + {"frac", 1, true, intrinsic_frac}, {"ldexp", 2, true, intrinsic_ldexp}, {"length", 1, true, intrinsic_length}, {"lerp", 3, true, intrinsic_lerp}, diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index ba22925e..fb505473 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -658,6 +658,10 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b write_sm1_binary_op(ctx, buffer, D3DSIO_MUL, &instr->reg, &arg1->reg, &arg2->reg); break; + case HLSL_OP1_FRACT: + write_sm1_unary_op(ctx, buffer, D3DSIO_FRC, &instr->reg, &arg1->reg, D3DSPSM_NONE); + break; + default: hlsl_fixme(ctx, &instr->loc, "SM1 \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break; diff --git a/tests/frac.shader_test b/tests/frac.shader_test new file mode 100644 index 00000000..f54f3fe8 --- /dev/null +++ b/tests/frac.shader_test @@ -0,0 +1,12 @@ +[pixel shader] +uniform float4 f; + +float4 main() : sv_target +{ + return frac(f); +} + +[test] +uniform 0 float4 -1.1 1.6 1.3 0.5 +draw quad +probe all rgba (0.9, 0.6, 0.3, 0.5) 2

1 0

Francisco Casas : tests: Test minimum-precision numeric types.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: 4ce6a170539228471a60a1660242c2cf7b6d40a8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4ce6a170539228471a60a1660242c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Dec 14 16:42:35 2022 -0300 tests: Test minimum-precision numeric types. --- Makefile.am | 1 + tests/minimum-precision.shader_test | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/Makefile.am b/Makefile.am index be84e829..b237b4af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -117,6 +117,7 @@ vkd3d_shader_tests = \ tests/math.shader_test \ tests/matrix-semantics.shader_test \ tests/max.shader_test \ + tests/minimum-precision.shader_test \ tests/multiple-rt.shader_test \ tests/nointerpolation.shader_test \ tests/object-references.shader_test \ diff --git a/tests/minimum-precision.shader_test b/tests/minimum-precision.shader_test new file mode 100644 index 00000000..a9b43d74 --- /dev/null +++ b/tests/minimum-precision.shader_test @@ -0,0 +1,21 @@ +[require] +shader model >= 4.0 + + +[pixel shader todo] +float4 main() : sv_target +{ + min16float4 a = {0, 1, 2, 3}; + min10float2 b = {4, 5}; + min16int3 c = {6.4, 7, 8}; + min12int d = 9.4; + min16uint4x2 e = {14.4, 15, 16, 17, 18, 19, 20, 21}; + vector<min10float, 3> g = {22, 23, 24}; + matrix<min16uint, 3, 2> h = {25.4, 26, 27, 28, 29, 30}; + + return mul(e, b) + a + c.xyzx + d + g.xxyz + h[2].xyxy; +} + +[test] +todo draw quad +todo probe all rgba (197.0, 218.0, 238.0, 257.0)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Implement sqrt() for SM1.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: 3c23e1713c5199855cdeaf678875eab81a151861 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3c23e1713c5199855cdeaf678875e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 24 15:44:39 2023 +0300 vkd3d-shader/hlsl: Implement sqrt() for SM1. --- libs/vkd3d-shader/hlsl_codegen.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 5e7cfff4..63002a5c 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1494,6 +1494,27 @@ static bool lower_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi return true; } +/* Lower SQRT to RSQ + RCP. */ +static bool lower_sqrt(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_expr *expr; + struct hlsl_ir_node *rsq; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + if (expr->op != HLSL_OP1_SQRT) + return false; + + if (!(rsq = hlsl_new_unary_expr(ctx, HLSL_OP1_RSQ, expr->operands[0].node, instr->loc))) + return false; + list_add_before(&expr->node.entry, &rsq->entry); + expr->op = HLSL_OP1_RCP; + hlsl_src_remove(&expr->operands[0]); + hlsl_src_from_node(&expr->operands[0], rsq); + return true; +} + static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_type *type = instr->data_type, *arg_type; @@ -2905,7 +2926,10 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry while (progress); if (profile->major_version < 4) + { transform_ir(ctx, lower_division, body, NULL); + transform_ir(ctx, lower_sqrt, body, NULL); + } transform_ir(ctx, validate_static_object_references, body, NULL);

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Handle RSQ output for SM1.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: b84b9349bfe547ee8fb49a94a90f7c2348b1b3ed URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b84b9349bfe547ee8fb49a94a90f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 24 15:44:09 2023 +0300 vkd3d-shader/hlsl: Handle RSQ output for SM1. --- libs/vkd3d-shader/hlsl_sm1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index fb505473..5050b7a9 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -632,13 +632,14 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b break; case HLSL_OP1_RCP: + case HLSL_OP1_RSQ: for (i = 0; i < instr->data_type->dimx; ++i) { struct hlsl_reg src = arg1->reg, dst = instr->reg; src.writemask = hlsl_combine_writemasks(src.writemask, 1u << i); dst.writemask = hlsl_combine_writemasks(dst.writemask, 1u << i); - write_sm1_unary_op(ctx, buffer, D3DSIO_RCP, &dst, &src, 0); + write_sm1_unary_op(ctx, buffer, expr->op == HLSL_OP1_RCP ? D3DSIO_RCP : D3DSIO_RSQ, &dst, &src, 0); } break;

1 0

Conor McCarthy : vkd3d: Store a heap array index in each CBV/SRV/UAV descriptor.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: 3db509383b9f5a0963e76c08dcb2fe903a6ed560 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3db509383b9f5a0963e76c08dcb2f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 25 15:25:48 2023 +1000 vkd3d: Store a heap array index in each CBV/SRV/UAV descriptor. A pointer to the containing descriptor heap can be derived from this information. PE build of vkd3d uses Windows critical sections for synchronisation, and these slow down on the very high lock/unlock rate during multithreaded descriptor copying in Shadow of the Tomb Raider. This patch speeds up the demo by about 8%. By comparison, using SRW locks in the allocators and locking them for read only where applicable is about 4% faster. --- libs/vkd3d/command.c | 57 +++++-------- libs/vkd3d/device.c | 195 +++------------------------------------------ libs/vkd3d/resource.c | 174 +++++++++++++++++++++------------------- libs/vkd3d/vkd3d_private.h | 57 ++++++------- 4 files changed, 149 insertions(+), 334 deletions(-)

1 0