July 2021 - Wine-commits - list.winehq.org

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_parameters().
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: vkd3d Branch: master Commit: bd88613c3e3c2d57cbaf5a584338cff8ebb6c744 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bd88613c3e3c2d57cbaf5a5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 18:59:11 2021 -0500 vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_parameters(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 67844d5..8cd6e56 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3075,12 +3075,9 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co parameters_position = bytecode_get_size(buffer); for (i = 0; i < parameter_count; ++i) { - if (!write_dword(context, versioned_root_signature_get_parameter_type(desc, i))) - goto fail; - if (!write_dword(context, versioned_root_signature_get_parameter_shader_visibility(desc, i))) - goto fail; - if (!write_dword(context, 0xffffffff)) /* offset */ - goto fail; + put_u32(buffer, versioned_root_signature_get_parameter_type(desc, i)); + put_u32(buffer, versioned_root_signature_get_parameter_shader_visibility(desc, i)); + put_u32(buffer, 0xffffffff); /* offset */ } for (i = 0; i < parameter_count; ++i) @@ -3116,11 +3113,6 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co } return VKD3D_OK; - -fail: - vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, - "Out of memory while writing root signature root parameters."); - return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_static_samplers(struct root_signature_writer_context *context,

1 0

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_static_samplers().
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: vkd3d Branch: master Commit: dda2c4839db68c621e94503aec7c7818b34542db URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dda2c4839db68c621e94503… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 18:59:12 2021 -0500 vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_static_samplers(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 57 ++++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 41 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 8cd6e56..ed84e26 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2956,12 +2956,6 @@ static bool write_dword(struct root_signature_writer_context *context, DWORD d) return write_dwords(context, 1, d); } -static bool write_float(struct root_signature_writer_context *context, float f) -{ - put_f32(&context->buffer, f); - return !context->buffer.status; -} - static size_t get_chunk_offset(struct root_signature_writer_context *context) { return bytecode_get_size(&context->buffer) - context->chunk_position; @@ -3115,7 +3109,7 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co return VKD3D_OK; } -static int shader_write_static_samplers(struct root_signature_writer_context *context, +static void shader_write_static_samplers(struct vkd3d_bytecode_buffer *buffer, const struct vkd3d_shader_versioned_root_signature_desc *desc) { const struct vkd3d_shader_static_sampler_desc *samplers = versioned_root_signature_get_static_samplers(desc); @@ -3123,40 +3117,20 @@ static int shader_write_static_samplers(struct root_signature_writer_context *co for (i = 0; i < versioned_root_signature_get_static_sampler_count(desc); ++i) { - if (!write_dword(context, samplers[i].filter)) - goto fail; - if (!write_dword(context, samplers[i].address_u)) - goto fail; - if (!write_dword(context, samplers[i].address_v)) - goto fail; - if (!write_dword(context, samplers[i].address_w)) - goto fail; - if (!write_float(context, samplers[i].mip_lod_bias)) - goto fail; - if (!write_dword(context, samplers[i].max_anisotropy)) - goto fail; - if (!write_dword(context, samplers[i].comparison_func)) - goto fail; - if (!write_dword(context, samplers[i].border_colour)) - goto fail; - if (!write_float(context, samplers[i].min_lod)) - goto fail; - if (!write_float(context, samplers[i].max_lod)) - goto fail; - if (!write_dword(context, samplers[i].shader_register)) - goto fail; - if (!write_dword(context, samplers[i].register_space)) - goto fail; - if (!write_dword(context, samplers[i].shader_visibility)) - goto fail; + put_u32(buffer, samplers[i].filter); + put_u32(buffer, samplers[i].address_u); + put_u32(buffer, samplers[i].address_v); + put_u32(buffer, samplers[i].address_w); + put_f32(buffer, samplers[i].mip_lod_bias); + put_u32(buffer, samplers[i].max_anisotropy); + put_u32(buffer, samplers[i].comparison_func); + put_u32(buffer, samplers[i].border_colour); + put_f32(buffer, samplers[i].min_lod); + put_f32(buffer, samplers[i].max_lod); + put_u32(buffer, samplers[i].shader_register); + put_u32(buffer, samplers[i].register_space); + put_u32(buffer, samplers[i].shader_visibility); } - - return VKD3D_OK; - -fail: - vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, - "Out of memory while writing root signature static samplers."); - return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_root_signature(struct root_signature_writer_context *context, @@ -3187,7 +3161,8 @@ static int shader_write_root_signature(struct root_signature_writer_context *con return ret; set_u32(buffer, samplers_offset_position, get_chunk_offset(context)); - return shader_write_static_samplers(context, desc); + shader_write_static_samplers(buffer, desc); + return 0; fail: vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY,

1 0

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_signature().
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: vkd3d Branch: master Commit: 26caa7136adb3e93512d8341b4df45d3cf9cce18 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=26caa7136adb3e93512d834… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 18:59:13 2021 -0500 vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_signature(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 43 ++++++------------------------------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index ed84e26..6e7c174 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2940,22 +2940,6 @@ struct root_signature_writer_context size_t chunk_position; }; -static bool write_dwords(struct root_signature_writer_context *context, - unsigned int count, DWORD d) -{ - unsigned int i; - - for (i = 0; i < count; ++i) - put_u32(&context->buffer, d); - - return !context->buffer.status; -} - -static bool write_dword(struct root_signature_writer_context *context, DWORD d) -{ - return write_dwords(context, 1, d); -} - static size_t get_chunk_offset(struct root_signature_writer_context *context) { return bytecode_get_size(&context->buffer) - context->chunk_position; @@ -3140,22 +3124,12 @@ static int shader_write_root_signature(struct root_signature_writer_context *con size_t samplers_offset_position; int ret; - if (!write_dword(context, desc->version)) - goto fail; - - if (!write_dword(context, versioned_root_signature_get_parameter_count(desc))) - goto fail; - if (!write_dword(context, get_chunk_offset(context) + 4 * sizeof(DWORD))) /* offset */ - goto fail; - - if (!write_dword(context, versioned_root_signature_get_static_sampler_count(desc))) - goto fail; - samplers_offset_position = bytecode_get_size(buffer); - if (!write_dword(context, 0xffffffff)) /* offset */ - goto fail; - - if (!write_dword(context, versioned_root_signature_get_flags(desc))) - goto fail; + put_u32(buffer, desc->version); + put_u32(buffer, versioned_root_signature_get_parameter_count(desc)); + put_u32(buffer, get_chunk_offset(context) + 4 * sizeof(uint32_t)); /* offset */ + put_u32(buffer, versioned_root_signature_get_static_sampler_count(desc)); + samplers_offset_position = put_u32(buffer, 0xffffffff); + put_u32(buffer, versioned_root_signature_get_flags(desc)); if ((ret = shader_write_root_parameters(context, desc)) < 0) return ret; @@ -3163,11 +3137,6 @@ static int shader_write_root_signature(struct root_signature_writer_context *con set_u32(buffer, samplers_offset_position, get_chunk_offset(context)); shader_write_static_samplers(buffer, desc); return 0; - -fail: - vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, - "Out of memory while writing root signature."); - return VKD3D_ERROR_OUT_OF_MEMORY; } static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descriptor_table *descriptor_table,

1 0

Chip Davis : tests: Do not use llabs(3) on an unsigned difference.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: vkd3d Branch: master Commit: d44c8e9feb0ad75429874c316f5ca62c34de8468 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d44c8e9feb0ad75429874c3… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Jul 28 21:43:41 2021 -0500 tests: Do not use llabs(3) on an unsigned difference. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index b10f24b..a43a7f2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -63,7 +63,9 @@ static bool compare_uint16(uint16_t a, uint16_t b, unsigned int max_diff) static bool compare_uint64(uint64_t a, uint64_t b, unsigned int max_diff) { - return llabs(a - b) <= max_diff; + uint64_t diff = a > b ? a - b : b - a; + + return diff <= max_diff; } static ULONG get_refcount(void *iface)

1 0

Martin Storsjo : msvcrt: Make the sinhf function NAN preserving.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 4fd9daea4a79d0826c9e5ab6466291043e40d579 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fd9daea4a79d0826c9e5ab6… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 14:41:57 2021 +0200 msvcrt: Make the sinhf function NAN preserving. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 92bf12b4d54..29912431bcd 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1699,7 +1699,10 @@ float CDECL sinhf( float x ) } /* |x| > logf(FLT_MAX) or nan */ - t = __expo2f(absx, 2 * h); + if (ui > 0x7f800000) + *(DWORD*)&t = *(DWORD*)&x | 0x400000; + else + t = __expo2f(absx, 2 * h); return t; }

1 0

Martin Storsjo : msvcrt: Make the tanhf function NAN preserving.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: e93e2467195c4cc363d567f1be2ab87b61988b26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e93e2467195c4cc363d567f1… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 14:42:03 2021 +0200 msvcrt: Make the tanhf function NAN preserving. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 29912431bcd..a902d4f04b9 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1881,21 +1881,24 @@ float CDECL tanf( float x ) float CDECL tanhf( float x ) { UINT32 ui = *(UINT32*)&x; - int sign; + UINT32 sign = ui & 0x80000000; float t; /* x = |x| */ - sign = ui >> 31; ui &= 0x7fffffff; x = *(float*)&ui; if (ui > 0x3f0c9f54) { /* |x| > log(3)/2 ~= 0.5493 or nan */ if (ui > 0x41200000) { + if (ui > 0x7f800000) { + *(UINT32*)&x = ui | sign | 0x400000; #if _MSVCR_VER < 140 - if (isnan(x)) return math_error(_DOMAIN, "tanhf", x, 0, x); +#else + return x; #endif + } /* |x| > 10 */ fp_barrierf(x + 0x1p120f); t = 1 + 0 / x;

1 0

Martin Storsjo : msvcrt: Make the cosh function NAN preserving.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 60d178b410ba943c6c39b2ccf1deaec264d7d21a URL: https://source.winehq.org/git/wine.git/?a=commit;h=60d178b410ba943c6c39b2cc… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 14:42:09 2021 +0200 msvcrt: Make the cosh function NAN preserving. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a902d4f04b9..2bd4206359b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2776,6 +2776,7 @@ static double __expo2(double x, double sign) double CDECL cosh( double x ) { UINT64 ux = *(UINT64*)&x; + UINT64 sign = ux & 0x8000000000000000ULL; UINT32 w; double t; @@ -2803,7 +2804,10 @@ double CDECL cosh( double x ) /* |x| > log(DBL_MAX) or nan */ /* note: the result is stored to handle overflow */ - t = __expo2(x, 1.0); + if (ux > 0x7ff0000000000000ULL) + *(UINT64*)&t = ux | sign | 0x0008000000000000ULL; + else + t = __expo2(x, 1.0); return t; }

1 0

Martin Storsjo : msvcrt: Make the sinh function NAN preserving.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 11166aa01e7d17f8535977f648c0b5e098d43bd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11166aa01e7d17f8535977f6… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 14:42:14 2021 +0200 msvcrt: Make the sinh function NAN preserving. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2bd4206359b..a2b03110cf0 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4046,6 +4046,7 @@ double CDECL sin( double x ) double CDECL sinh( double x ) { UINT64 ux = *(UINT64*)&x; + UINT64 sign = ux & 0x8000000000000000ULL; UINT32 w; double t, h, absx; @@ -4070,7 +4071,10 @@ double CDECL sinh( double x ) /* |x| > log(DBL_MAX) or nan */ /* note: the result is stored to handle overflow */ - t = __expo2(absx, 2 * h); + if (ux > 0x7ff0000000000000ULL) + *(UINT64*)&t = ux | sign | 0x0008000000000000ULL; + else + t = __expo2(absx, 2 * h); return t; }

1 0

Martin Storsjo : msvcrt: Make the tanh function NAN preserving.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 07ec052e5423f6bbacc2bac0c5684211cecca04f URL: https://source.winehq.org/git/wine.git/?a=commit;h=07ec052e5423f6bbacc2bac0… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 14:42:19 2021 +0200 msvcrt: Make the tanh function NAN preserving. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a2b03110cf0..69b807f722c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4336,12 +4336,11 @@ double CDECL tan( double x ) double CDECL tanh( double x ) { UINT64 ui = *(UINT64*)&x; + UINT64 sign = ui & 0x8000000000000000ULL; UINT32 w; - int sign; double t; /* x = |x| */ - sign = ui >> 63; ui &= (UINT64)-1 / 2; x = *(double*)&ui; w = ui >> 32; @@ -4349,11 +4348,15 @@ double CDECL tanh( double x ) if (w > 0x3fe193ea) { /* |x| > log(3)/2 ~= 0.5493 or nan */ if (w > 0x40340000) { + if (ui > 0x7ff0000000000000ULL) { + *(UINT64*)&x = ui | sign | 0x0008000000000000ULL; #if _MSVCR_VER < 140 - if (isnan(x)) return math_error(_DOMAIN, "tanh", x, 0, x); +#else + return x; #endif - /* |x| > 20 or nan */ + } + /* |x| > 20 */ /* note: this branch avoids raising overflow */ fp_barrier(x + 0x1p120f); t = 1 - 0 / x;

1 0

Martin Storsjo : msvcrt: Add hyperbolic functions NAN tests.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 868c9ee7c92a528461fc1d00d30e75dbb85958bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=868c9ee7c92a528461fc1d00… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 14:42:24 2021 +0200 msvcrt: Add hyperbolic functions NAN tests. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/misc.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index b38915596df..81c23dd23f2 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -491,8 +491,35 @@ static void test_qsort_s(void) ok(tab[i] == i, "data sorted incorrectly on position %d: %d\n", i, tab[i]); } +static int eq_nan(UINT64 ai, double b) +{ + UINT64 bi = *(UINT64*)&b; + UINT64 mask; + +#if defined(__i386__) + mask = 0xFFFFFFFF00000000ULL; +#else + mask = ~0; +#endif + + ok((ai & mask) == (bi & mask), "comparing %s and %s\n", + wine_dbgstr_longlong(ai), wine_dbgstr_longlong(bi)); + return (ai & mask) == (bi & mask); +} + +static int eq_nanf(DWORD ai, float b) +{ + DWORD bi = *(DWORD*)&b; + ok(ai == bi, "comparing %08x and %08x\n", ai, bi); + return ai == bi; +} + static void test_math_functions(void) { + static const UINT64 test_nan_i = 0xFFF0000123456780ULL; + static const DWORD test_nanf_i = 0xFF801234; + double test_nan = *(double*)&test_nan_i; + float test_nanf = *(float*)&test_nanf_i; double ret; errno = 0xdeadbeef; @@ -525,6 +552,13 @@ static void test_math_functions(void) errno = 0xdeadbeef; p_exp(INFINITY); ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + ok(eq_nan(test_nan_i | (1ULL << 51), cosh(test_nan)), "cosh not preserving nan\n"); + ok(eq_nan(test_nan_i | (1ULL << 51), sinh(test_nan)), "sinh not preserving nan\n"); + ok(eq_nan(test_nan_i | (1ULL << 51), tanh(test_nan)), "tanh not preserving nan\n"); + ok(eq_nanf(test_nanf_i | (1 << 22), coshf(test_nanf)), "coshf not preserving nan\n"); + ok(eq_nanf(test_nanf_i | (1 << 22), sinhf(test_nanf)), "sinhf not preserving nan\n"); + ok(eq_nanf(test_nanf_i | (1 << 22), tanhf(test_nanf)), "tanhf not preserving nan\n"); } static void __cdecl test_thread_func(void *end_thread_type)

1 0