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

Alexandre Julliard : ntdll: Use the atan() implementation from the bundled musl library.
by Alexandre Julliard 12 Apr '23

12 Apr '23

Module: wine Branch: master Commit: 50c1ec60605d059ade63c89e7f09e4413f6a2e52 URL: https://gitlab.winehq.org/wine/wine/-/commit/50c1ec60605d059ade63c89e7f09e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 18:40:06 2023 +0200 ntdll: Use the atan() implementation from the bundled musl library. --- dlls/ntdll/math.c | 92 ------------------------------------------------------- 1 file changed, 92 deletions(-) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index 30c1723c939..4544908f4c4 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -48,12 +48,6 @@ double math_error( int type, const char *name, double arg1, double arg2, double } /* Copied from musl: src/internal/libm.h */ -static inline float fp_barrierf(float x) -{ - volatile float y = x; - return y; -} - static inline double fp_barrier(double x) { volatile double y = x; @@ -582,92 +576,6 @@ int CDECL abs( int i ) return i >= 0 ? i : -i; } -/********************************************************************* - * atan (NTDLL.@) - * - * Copied from musl: src/math/atan.c - */ -double CDECL atan( double x ) -{ - static const double atanhi[] = { - 4.63647609000806093515e-01, - 7.85398163397448278999e-01, - 9.82793723247329054082e-01, - 1.57079632679489655800e+00, - }; - static const double atanlo[] = { - 2.26987774529616870924e-17, - 3.06161699786838301793e-17, - 1.39033110312309984516e-17, - 6.12323399573676603587e-17, - }; - static const double aT[] = { - 3.33333333333329318027e-01, - -1.99999999998764832476e-01, - 1.42857142725034663711e-01, - -1.11111104054623557880e-01, - 9.09088713343650656196e-02, - -7.69187620504482999495e-02, - 6.66107313738753120669e-02, - -5.83357013379057348645e-02, - 4.97687799461593236017e-02, - -3.65315727442169155270e-02, - 1.62858201153657823623e-02, - }; - - double w, s1, s2, z; - unsigned int ix, sign; - int id; - - ix = *(ULONGLONG*)&x >> 32; - sign = ix >> 31; - ix &= 0x7fffffff; - if (ix >= 0x44100000) { /* if |x| >= 2^66 */ - if (isnan(x)) - return x; - z = atanhi[3] + 7.5231638452626401e-37; - return sign ? -z : z; - } - if (ix < 0x3fdc0000) { /* |x| < 0.4375 */ - if (ix < 0x3e400000) { /* |x| < 2^-27 */ - if (ix < 0x00100000) - /* raise underflow for subnormal x */ - fp_barrierf((float)x); - return x; - } - id = -1; - } else { - x = fabs(x); - if (ix < 0x3ff30000) { /* |x| < 1.1875 */ - if (ix < 0x3fe60000) { /* 7/16 <= |x| < 11/16 */ - id = 0; - x = (2.0 * x - 1.0) / (2.0 + x); - } else { /* 11/16 <= |x| < 19/16 */ - id = 1; - x = (x - 1.0) / (x + 1.0); - } - } else { - if (ix < 0x40038000) { /* |x| < 2.4375 */ - id = 2; - x = (x - 1.5) / (1.0 + 1.5 * x); - } else { /* 2.4375 <= |x| < 2^66 */ - id = 3; - x = -1.0 / x; - } - } - } - /* end of argument reduction */ - z = x * x; - w = z * z; - /* break sum from i=0 to 10 aT[i]z**(i+1) into odd and even poly */ - s1 = z * (aT[0] + w * (aT[2] + w * (aT[4] + w * (aT[6] + w * (aT[8] + w * aT[10]))))); - s2 = w * (aT[1] + w * (aT[3] + w * (aT[5] + w * (aT[7] + w * aT[9])))); - if (id < 0) - return x - x * (s1 + s2); - z = atanhi[id] - (x * (s1 + s2) - atanlo[id] - x); - return sign ? -z : z; -} - /********************************************************************* * atan2 (NTDLL.@) *

1 0

Alexandre Julliard : ntdll: Use the atan2() implementation from the bundled musl library.
by Alexandre Julliard 12 Apr '23

12 Apr '23

Module: wine Branch: master Commit: 91faba4d9a31b93ccbf3644f8a81f35b07833194 URL: https://gitlab.winehq.org/wine/wine/-/commit/91faba4d9a31b93ccbf3644f8a81f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 18:41:31 2023 +0200 ntdll: Use the atan2() implementation from the bundled musl library. --- dlls/ntdll/math.c | 73 ------------------------------------------------------- 1 file changed, 73 deletions(-) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index 4544908f4c4..e2fa16ff53c 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -576,79 +576,6 @@ int CDECL abs( int i ) return i >= 0 ? i : -i; } -/********************************************************************* - * atan2 (NTDLL.@) - * - * Copied from musl: src/math/atan2.c - */ -double CDECL atan2( double y, double x ) -{ - static const double pi = 3.1415926535897931160E+00, - pi_lo = 1.2246467991473531772E-16; - - double z; - unsigned int m, lx, ly, ix, iy; - - if (isnan(x) || isnan(y)) - return x+y; - ix = *(ULONGLONG*)&x >> 32; - lx = *(ULONGLONG*)&x; - iy = *(ULONGLONG*)&y >> 32; - ly = *(ULONGLONG*)&y; - if (((ix - 0x3ff00000) | lx) == 0) /* x = 1.0 */ - return atan(y); - m = ((iy >> 31) & 1) | ((ix >> 30) & 2); /* 2*sign(x)+sign(y) */ - ix = ix & 0x7fffffff; - iy = iy & 0x7fffffff; - - /* when y = 0 */ - if ((iy | ly) == 0) { - switch(m) { - case 0: - case 1: return y; /* atan(+-0,+anything)=+-0 */ - case 2: return pi; /* atan(+0,-anything) = pi */ - case 3: return -pi; /* atan(-0,-anything) =-pi */ - } - } - /* when x = 0 */ - if ((ix | lx) == 0) - return m & 1 ? -pi / 2 : pi / 2; - /* when x is INF */ - if (ix == 0x7ff00000) { - if (iy == 0x7ff00000) { - switch(m) { - case 0: return pi / 4; /* atan(+INF,+INF) */ - case 1: return -pi / 4; /* atan(-INF,+INF) */ - case 2: return 3 * pi / 4; /* atan(+INF,-INF) */ - case 3: return -3 * pi / 4; /* atan(-INF,-INF) */ - } - } else { - switch(m) { - case 0: return 0.0; /* atan(+...,+INF) */ - case 1: return -0.0; /* atan(-...,+INF) */ - case 2: return pi; /* atan(+...,-INF) */ - case 3: return -pi; /* atan(-...,-INF) */ - } - } - } - /* |y/x| > 0x1p64 */ - if (ix + (64 << 20) < iy || iy == 0x7ff00000) - return m & 1 ? -pi / 2 : pi / 2; - - /* z = atan(|y/x|) without spurious underflow */ - if ((m & 2) && iy + (64 << 20) < ix) /* |y/x| < 0x1p-64, x<0 */ - z = 0; - else - z = atan(fabs(y / x)); - switch (m) { - case 0: return z; /* atan(+,+) */ - case 1: return -z; /* atan(-,+) */ - case 2: return pi - (z - pi_lo); /* atan(+,-) */ - default: /* case 3 */ - return (z - pi_lo) - pi; /* atan(-,-) */ - } -} - /********************************************************************* * ceil (NTDLL.@) *

1 0

Alexandre Julliard : ntdll: Use the log() implementation from the bundled musl library.
by Alexandre Julliard 12 Apr '23

12 Apr '23

Module: wine Branch: master Commit: 9de6d202e6c538c4cdc8d957d09f15f96486b748 URL: https://gitlab.winehq.org/wine/wine/-/commit/9de6d202e6c538c4cdc8d957d09f15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 18:42:17 2023 +0200 ntdll: Use the log() implementation from the bundled musl library. --- dlls/ntdll/math.c | 373 ------------------------------------------------------ 1 file changed, 373 deletions(-)

1 0

Alexandre Julliard : ntdll: Use the pow() implementation from the bundled musl library.
by Alexandre Julliard 12 Apr '23

12 Apr '23

Module: wine Branch: master Commit: 913d6abc50228ca4809095631f57860a22ec4004 URL: https://gitlab.winehq.org/wine/wine/-/commit/913d6abc50228ca4809095631f5786… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 18:43:24 2023 +0200 ntdll: Use the pow() implementation from the bundled musl library. --- dlls/ntdll/math.c | 578 ------------------------------------------------------ 1 file changed, 578 deletions(-)

1 0

Alexandre Julliard : ntdll: Use the sqrt() implementation from the bundled musl library.
by Alexandre Julliard 12 Apr '23

12 Apr '23

Module: wine Branch: master Commit: 4371d5a9dcd841cee668a04742e6135c594be806 URL: https://gitlab.winehq.org/wine/wine/-/commit/4371d5a9dcd841cee668a04742e613… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 18:44:07 2023 +0200 ntdll: Use the sqrt() implementation from the bundled musl library. --- dlls/ntdll/math.c | 139 ------------------------------------------------------ 1 file changed, 139 deletions(-) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index f06dbbac06b..c30fc2de61e 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -47,38 +47,6 @@ double math_error( int type, const char *name, double arg1, double arg2, double return retval; } -/* Copied from musl: src/math/__fpclassify.c */ -static short _dclass(double x) -{ - union { double f; UINT64 i; } u = { x }; - int e = u.i >> 52 & 0x7ff; - - if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; - if (e == 0x7ff) return (u.i << 12) ? FP_NAN : FP_INFINITE; - return FP_NORMAL; -} - -static BOOL sqrt_validate( double *x, BOOL update_sw ) -{ - short c = _dclass(*x); - - if (c == FP_ZERO) return FALSE; - if (c == FP_NAN) - { - /* set signaling bit */ - *(ULONGLONG*)x |= 0x8000000000000ULL; - return FALSE; - } - if (signbit(*x)) - { - *x = -NAN; - return FALSE; - } - if (c == FP_INFINITE) return FALSE; - return TRUE; -} - - /********************************************************************* * abs (NTDLL.@) */ @@ -157,113 +125,6 @@ double CDECL floor( double x ) return u.f; } -/********************************************************************* - * sqrt (NTDLL.@) - * - * Copied from musl: src/math/sqrt.c - */ -double CDECL sqrt( double x ) -{ - static const double tiny = 1.0e-300; - - double z; - int sign = 0x80000000; - int ix0,s0,q,m,t,i; - unsigned int r,t1,s1,ix1,q1; - ULONGLONG ix; - - if (!sqrt_validate(&x, TRUE)) - return x; - - ix = *(ULONGLONG*)&x; - ix0 = ix >> 32; - ix1 = ix; - - /* normalize x */ - m = ix0 >> 20; - if (m == 0) { /* subnormal x */ - while (ix0 == 0) { - m -= 21; - ix0 |= (ix1 >> 11); - ix1 <<= 21; - } - for (i=0; (ix0 & 0x00100000) == 0; i++) - ix0 <<= 1; - m -= i - 1; - ix0 |= ix1 >> (32 - i); - ix1 <<= i; - } - m -= 1023; /* unbias exponent */ - ix0 = (ix0 & 0x000fffff) | 0x00100000; - if (m & 1) { /* odd m, double x to make it even */ - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - } - m >>= 1; /* m = [m/2] */ - - /* generate sqrt(x) bit by bit */ - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - q = q1 = s0 = s1 = 0; /* [q,q1] = sqrt(x) */ - r = 0x00200000; /* r = moving bit from right to left */ - - while (r != 0) { - t = s0 + r; - if (t <= ix0) { - s0 = t + r; - ix0 -= t; - q += r; - } - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - r >>= 1; - } - - r = sign; - while (r != 0) { - t1 = s1 + r; - t = s0; - if (t < ix0 || (t == ix0 && t1 <= ix1)) { - s1 = t1 + r; - if ((t1&sign) == sign && (s1 & sign) == 0) - s0++; - ix0 -= t; - if (ix1 < t1) - ix0--; - ix1 -= t1; - q1 += r; - } - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - r >>= 1; - } - - /* use floating add to find out rounding direction */ - if ((ix0 | ix1) != 0) { - z = 1.0 - tiny; /* raise inexact flag */ - if (z >= 1.0) { - z = 1.0 + tiny; - if (q1 == (unsigned int)0xffffffff) { - q1 = 0; - q++; - } else if (z > 1.0) { - if (q1 == (unsigned int)0xfffffffe) - q++; - q1 += 2; - } else - q1 += q1 & 1; - } - } - ix0 = (q >> 1) + 0x3fe00000; - ix1 = q1 >> 1; - if (q & 1) - ix1 |= sign; - ix = ix0 + ((unsigned int)m << 20); - ix <<= 32; - ix |= ix1; - return *(double*)&ix; -} - #if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) #define FPU_DOUBLE(var) double var; \

1 0

Alexandre Julliard : ntdll: Use the ceil() implementation from the bundled musl library.
by Alexandre Julliard 12 Apr '23

12 Apr '23

Module: wine Branch: master Commit: ef4cefe8fb6cb5a76f6f7f8afadd19b3f6fdaaed URL: https://gitlab.winehq.org/wine/wine/-/commit/ef4cefe8fb6cb5a76f6f7f8afadd19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 18:45:47 2023 +0200 ntdll: Use the ceil() implementation from the bundled musl library. --- dlls/ntdll/math.c | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index c30fc2de61e..31be13db4ae 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -55,35 +55,6 @@ int CDECL abs( int i ) return i >= 0 ? i : -i; } -/********************************************************************* - * ceil (NTDLL.@) - * - * Based on musl: src/math/ceilf.c - */ -double CDECL ceil( double x ) -{ - union {double f; UINT64 i;} u = {x}; - int e = (u.i >> 52 & 0x7ff) - 0x3ff; - UINT64 m; - - if (e >= 52) - return x; - if (e >= 0) { - m = 0x000fffffffffffffULL >> e; - if ((u.i & m) == 0) - return x; - if (u.i >> 63 == 0) - u.i += m; - u.i &= ~m; - } else { - if (u.i >> 63) - return -0.0; - else if (u.i << 1) - return 1.0; - } - return u.f; -} - /********************************************************************* * fabs (NTDLL.@) *

1 0

Alexandre Julliard : ntdll: Use the floor() implementation from the bundled musl library.
by Alexandre Julliard 12 Apr '23

12 Apr '23

Module: wine Branch: master Commit: 0aa71bdec46f6fcdd52b4843fff1db0976f7890d URL: https://gitlab.winehq.org/wine/wine/-/commit/0aa71bdec46f6fcdd52b4843fff1db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 18:46:05 2023 +0200 ntdll: Use the floor() implementation from the bundled musl library. --- dlls/ntdll/math.c | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index 31be13db4ae..18369c9896b 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -67,35 +67,6 @@ double CDECL fabs( double x ) return u.f; } -/********************************************************************* - * floor (NTDLL.@) - * - * Based on musl: src/math/floorf.c - */ -double CDECL floor( double x ) -{ - union {double f; UINT64 i;} u = {x}; - int e = (int)(u.i >> 52 & 0x7ff) - 0x3ff; - UINT64 m; - - if (e >= 52) - return x; - if (e >= 0) { - m = 0x000fffffffffffffULL >> e; - if ((u.i & m) == 0) - return x; - if (u.i >> 63) - u.i += m; - u.i &= ~m; - } else { - if (u.i >> 63 == 0) - return 0; - else if (u.i << 1) - return -1; - } - return u.f; -} - #if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) #define FPU_DOUBLE(var) double var; \

1 0

Alexandre Julliard : ntdll: Use the fabs() implementation from the bundled musl library.
by Alexandre Julliard 12 Apr '23

12 Apr '23

Module: wine Branch: master Commit: f78a604f9bfa6cf0da57a3d0805b7bfae65223e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/f78a604f9bfa6cf0da57a3d0805b7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 18:46:28 2023 +0200 ntdll: Use the fabs() implementation from the bundled musl library. --- dlls/ntdll/math.c | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index 18369c9896b..73a5bb8cd33 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -16,23 +16,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * - * For functions copied from musl libc (http://musl.libc.org/) - * ==================================================== - * Copyright 2005-2020 Rich Felker, et al. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * ==================================================== */ #include <math.h> @@ -55,18 +38,6 @@ int CDECL abs( int i ) return i >= 0 ? i : -i; } -/********************************************************************* - * fabs (NTDLL.@) - * - * Copied from musl: src/math/fabsf.c - */ -double CDECL fabs( double x ) -{ - union { double f; UINT64 i; } u = { x }; - u.i &= ~0ull >> 1; - return u.f; -} - #if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) #define FPU_DOUBLE(var) double var; \

1 0

Conor McCarthy : vkd3d-shader/ir: Normalise control point phase output registers to include the control point id.
by Alexandre Julliard 12 Apr '23

12 Apr '23

Module: vkd3d Branch: master Commit: 14295a224d9fe2e487bf3a67f4f2fc5218e1b17c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/14295a224d9fe2e487bf3a67f4f2f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 4 17:55:05 2023 +1000 vkd3d-shader/ir: Normalise control point phase output registers to include the control point id. In SPIR-V the address must include the invocation id, but in TPF it is implicit. Move the register index up one slot and insert an OUTPOINTID relative address. --- libs/vkd3d-shader/ir.c | 101 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/spirv.c | 32 +++------- libs/vkd3d-shader/vkd3d_shader_private.h | 3 + 3 files changed, 111 insertions(+), 25 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/ir: Insert hull shader control point input declarations if no control point phase is defined.
by Alexandre Julliard 12 Apr '23

12 Apr '23

Module: vkd3d Branch: master Commit: 98b5e2c6e01199d714d18fccfe54826a680aecbf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/98b5e2c6e01199d714d18fccfe548… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 4 17:28:48 2023 +1000 vkd3d-shader/ir: Insert hull shader control point input declarations if no control point phase is defined. The SPIR-V backend will emit a default control point phase. Inserting inputs into the IR allows handling of declarations via the usual path instead of an ad hoc implementation which may not match later changes to input handling. --- libs/vkd3d-shader/ir.c | 86 ++++++++++++++- libs/vkd3d-shader/spirv.c | 178 +++---------------------------- libs/vkd3d-shader/vkd3d_shader_private.h | 11 +- 3 files changed, 112 insertions(+), 163 deletions(-)

1 0