- Wine-Commits - list.winehq.org

Alexandre Julliard : msvcrt: Use the hypot()/hypotf() implementation from the bundled musl library.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 15b50e98a43d5b2709ddd94f60f7a56b0ee19fee URL: https://gitlab.winehq.org/wine/wine/-/commit/15b50e98a43d5b2709ddd94f60f7a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 15:34:30 2023 +0200 msvcrt: Use the hypot()/hypotf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 101 ----------------------------------------------------- 1 file changed, 101 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ef5d194eab8..9b5f628fbec 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4599,107 +4599,6 @@ double CDECL _logb(double x) return __ilogb(x); } -static void sq(double *hi, double *lo, double x) -{ - double xh, xl, xc; - - xc = x * (0x1p27 + 1); - xh = x - xc + xc; - xl = x - xh; - *hi = x * x; - *lo = xh * xh - *hi + 2 * xh * xl + xl * xl; -} - -/********************************************************************* - * _hypot (MSVCRT.@) - * - * Copied from musl: src/math/hypot.c - */ -double CDECL _hypot(double x, double y) -{ - UINT64 ux = *(UINT64*)&x, uy = *(UINT64*)&y, ut; - double hx, lx, hy, ly, z; - int ex, ey; - - /* arrange |x| >= |y| */ - ux &= -1ULL >> 1; - uy &= -1ULL >> 1; - if (ux < uy) { - ut = ux; - ux = uy; - uy = ut; - } - - /* special cases */ - ex = ux >> 52; - ey = uy >> 52; - x = *(double*)&ux; - y = *(double*)&uy; - /* note: hypot(inf,nan) == inf */ - if (ey == 0x7ff) - return y; - if (ex == 0x7ff || uy == 0) - return x; - /* note: hypot(x,y) ~= x + y*y/x/2 with inexact for small y/x */ - /* 64 difference is enough for ld80 double_t */ - if (ex - ey > 64) - return x + y; - - /* precise sqrt argument in nearest rounding mode without overflow */ - /* xh*xh must not overflow and xl*xl must not underflow in sq */ - z = 1; - if (ex > 0x3ff + 510) { - z = 0x1p700; - x *= 0x1p-700; - y *= 0x1p-700; - } else if (ey < 0x3ff - 450) { - z = 0x1p-700; - x *= 0x1p700; - y *= 0x1p700; - } - sq(&hx, &lx, x); - sq(&hy, &ly, y); - return z * sqrt(ly + lx + hy + hx); -} - -/********************************************************************* - * _hypotf (MSVCRT.@) - * - * Copied from musl: src/math/hypotf.c - */ -float CDECL _hypotf(float x, float y) -{ - UINT32 ux = *(UINT32*)&x, uy = *(UINT32*)&y, ut; - float z; - - ux &= -1U >> 1; - uy &= -1U >> 1; - if (ux < uy) { - ut = ux; - ux = uy; - uy = ut; - } - - x = *(float*)&ux; - y = *(float*)&uy; - if (uy == 0xff << 23) - return y; - if (ux >= 0xff << 23 || uy == 0 || ux - uy >= 25 << 23) - return x + y; - - z = 1; - if (ux >= (0x7f + 60) << 23) { - z = 0x1p90f; - x *= 0x1p-90f; - y *= 0x1p-90f; - } else if (uy < (0x7f - 60) << 23) { - z = 0x1p-90f; - x *= 0x1p90f; - y *= 0x1p90f; - } - return z * sqrtf((double)x * x + (double)y * y); -} - /********************************************************************* * ceil (MSVCRT.@) *

1 0

Alexandre Julliard : libs: Import the math library from upstream musl 1.2.3.
by Alexandre Julliard April 4, 2023

April 4, 2023

1 0

Alexandre Julliard : msvcrt: Use the fabs()/fabsf() implementation from the bundled musl library.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: b7228259f839881799cadbab8a6c80f5cf7ac12c URL: https://gitlab.winehq.org/wine/wine/-/commit/b7228259f839881799cadbab8a6c80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 14:35:11 2023 +0200 msvcrt: Use the fabs()/fabsf() implementation from the bundled musl library. --- dlls/crtdll/Makefile.in | 2 +- dlls/msvcr100/Makefile.in | 2 +- dlls/msvcr110/Makefile.in | 2 +- dlls/msvcr120/Makefile.in | 2 +- dlls/msvcr70/Makefile.in | 2 +- dlls/msvcr71/Makefile.in | 2 +- dlls/msvcr80/Makefile.in | 2 +- dlls/msvcr90/Makefile.in | 2 +- dlls/msvcrt/Makefile.in | 2 +- dlls/msvcrt/math.c | 28 ---------------------------- dlls/msvcrtd/Makefile.in | 2 +- dlls/ucrtbase/Makefile.in | 2 +- 12 files changed, 11 insertions(+), 39 deletions(-) diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in index d54e8d49964..efb835749b6 100644 --- a/dlls/crtdll/Makefile.in +++ b/dlls/crtdll/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -D_CRTDLL -D_CRTIMP= MODULE = crtdll.dll -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index d17aa79b3d7..b7ed6c9cf87 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr100.dll IMPORTLIB = msvcr100 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in index 0bc15e27d94..1337b52224a 100644 --- a/dlls/msvcr110/Makefile.in +++ b/dlls/msvcr110/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr110.dll IMPORTLIB = msvcr110 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index cc3d5b2bdff..f854f0d5417 100644 --- a/dlls/msvcr120/Makefile.in +++ b/dlls/msvcr120/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr120.dll IMPORTLIB = msvcr120 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr70/Makefile.in b/dlls/msvcr70/Makefile.in index 5782a64bf03..9415d5b5b66 100644 --- a/dlls/msvcr70/Makefile.in +++ b/dlls/msvcr70/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr70.dll IMPORTLIB = msvcr70 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr71/Makefile.in b/dlls/msvcr71/Makefile.in index f849158e2ee..6079e87841f 100644 --- a/dlls/msvcr71/Makefile.in +++ b/dlls/msvcr71/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr71.dll IMPORTLIB = msvcr71 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index b3c44b3a530..2bf999f37f1 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr80.dll IMPORTLIB = msvcr80 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in index 1f7ba4cdcde..0faac8f4150 100644 --- a/dlls/msvcr90/Makefile.in +++ b/dlls/msvcr90/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr90.dll IMPORTLIB = msvcr90 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in index 63e6630d7bd..ad42e217d56 100644 --- a/dlls/msvcrt/Makefile.in +++ b/dlls/msvcrt/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcrt.dll IMPORTLIB = msvcrt -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 C_SRCS = \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 854403a71bf..2bbdcdcc7d3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2075,22 +2075,6 @@ float CDECL modff( float x, float *iptr ) #endif -#if !defined(__i386__) && !defined(__x86_64__) && (_MSVCR_VER == 0 || _MSVCR_VER >= 110) - -/********************************************************************* - * fabsf (MSVCRT.@) - * - * Copied from musl: src/math/fabsf.c - */ -float CDECL fabsf( float x ) -{ - union { float f; UINT32 i; } u = { x }; - u.i &= 0x7fffffff; - return u.f; -} - -#endif - /********************************************************************* * acos (MSVCRT.@) * @@ -5095,18 +5079,6 @@ float CDECL fmaf( float x, float y, float z ) return u.f; } -/********************************************************************* - * fabs (MSVCRT.@) - * - * 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; -} - /********************************************************************* * frexp (MSVCRT.@) * diff --git a/dlls/msvcrtd/Makefile.in b/dlls/msvcrtd/Makefile.in index 95f0bca93b4..994195eebc6 100644 --- a/dlls/msvcrtd/Makefile.in +++ b/dlls/msvcrtd/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= -D_DEBUG= MODULE = msvcrtd.dll IMPORTLIB = msvcrtd -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll PARENTSRC = ../msvcrt DELAYIMPORTS = advapi32 user32 diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index abab9d4f02c..e9cdf6127a0 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = ucrtbase.dll IMPORTLIB = ucrtbase -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt

1 0

Alexandre Julliard : msvcrt: Use the frexp()/frexpf() implementation from the bundled musl library.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: be147a806b80c005ed29decab9d4060dfd0d543b URL: https://gitlab.winehq.org/wine/wine/-/commit/be147a806b80c005ed29decab9d406… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 14:38:27 2023 +0200 msvcrt: Use the frexp()/frexpf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 52 ---------------------------------------------------- 1 file changed, 52 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2bbdcdcc7d3..f32e85a26a8 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2009,32 +2009,6 @@ float CDECL floorf( float x ) return u.f; } -/********************************************************************* - * frexpf (MSVCRT.@) - * - * Copied from musl: src/math/frexpf.c - */ -float CDECL frexpf( float x, int *e ) -{ - UINT32 ux = *(UINT32*)&x; - int ee = ux >> 23 & 0xff; - - if (!ee) { - if (x) { - x = frexpf(x * 0x1p64, e); - *e -= 64; - } else *e = 0; - return x; - } else if (ee == 0xff) { - return x; - } - - *e = ee - 0x7e; - ux &= 0x807ffffful; - ux |= 0x3f000000ul; - return *(float*)&ux; -} - /********************************************************************* * modff (MSVCRT.@) * @@ -5079,32 +5053,6 @@ float CDECL fmaf( float x, float y, float z ) return u.f; } -/********************************************************************* - * frexp (MSVCRT.@) - * - * Copied from musl: src/math/frexp.c - */ -double CDECL frexp( double x, int *e ) -{ - UINT64 ux = *(UINT64*)&x; - int ee = ux >> 52 & 0x7ff; - - if (!ee) { - if (x) { - x = frexp(x * 0x1p64, e); - *e -= 64; - } else *e = 0; - return x; - } else if (ee == 0x7ff) { - return x; - } - - *e = ee - 0x3fe; - ux &= 0x800fffffffffffffull; - ux |= 0x3fe0000000000000ull; - return *(double*)&ux; -} - /********************************************************************* * modf (MSVCRT.@) *

1 0

Alexandre Julliard : msvcrt: Use the fmax()/fmaxf() implementation from the bundled musl library.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 4a9258ee97182947dac772ec67e8975dc67ec063 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a9258ee97182947dac772ec67e897… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 15:36:22 2023 +0200 msvcrt: Use the fmax()/fmaxf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 1e1bece23f1..aa33f03106a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -8857,34 +8857,6 @@ float CDECL erfcf(float x) return FLT_MIN * FLT_MIN; } -/********************************************************************* - * fmaxf (MSVCR120.@) - */ -float CDECL fmaxf(float x, float y) -{ - if(isnan(x)) - return y; - if(isnan(y)) - return x; - if(x==0 && y==0) - return signbit(x) ? y : x; - return x<y ? y : x; -} - -/********************************************************************* - * fmax (MSVCR120.@) - */ -double CDECL fmax(double x, double y) -{ - if(isnan(x)) - return y; - if(isnan(y)) - return x; - if(x==0 && y==0) - return signbit(x) ? y : x; - return x<y ? y : x; -} - /********************************************************************* * fdimf (MSVCR120.@) */

1 0

Alexandre Julliard : msvcrt: Use the trunc()/truncf() implementation from the bundled musl library.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 09006678768ab92694521a1b6ee461ea9c85ed71 URL: https://gitlab.winehq.org/wine/wine/-/commit/09006678768ab92694521a1b6ee461… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 15:35:27 2023 +0200 msvcrt: Use the trunc()/truncf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 9b5f628fbec..1e1bece23f1 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -8482,50 +8482,6 @@ __int64 CDECL llroundf(float x) return f; } -/********************************************************************* - * trunc (MSVCR120.@) - * - * Copied from musl: src/math/trunc.c - */ -double CDECL trunc(double x) -{ - union {double f; UINT64 i;} u = {x}; - int e = (u.i >> 52 & 0x7ff) - 0x3ff + 12; - UINT64 m; - - if (e >= 52 + 12) - return x; - if (e < 12) - e = 1; - m = -1ULL >> e; - if ((u.i & m) == 0) - return x; - u.i &= ~m; - return u.f; -} - -/********************************************************************* - * truncf (MSVCR120.@) - * - * Copied from musl: src/math/truncf.c - */ -float CDECL truncf(float x) -{ - union {float f; UINT32 i;} u = {x}; - int e = (u.i >> 23 & 0xff) - 0x7f + 9; - UINT32 m; - - if (e >= 23 + 9) - return x; - if (e < 9) - e = 1; - m = -1U >> e; - if ((u.i & m) == 0) - return x; - u.i &= ~m; - return u.f; -} - /********************************************************************* * _dtest (MSVCR120.@) */

1 0

Alexandre Julliard : msvcrt: Use the modf()/modff() implementation from the bundled musl library.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: e5808e203628416bd884720b3c91fc9d73706fe8 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5808e203628416bd884720b3c91fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 15:30:58 2023 +0200 msvcrt: Use the modf()/modff() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 76 ------------------------------------------------------ 1 file changed, 76 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f32e85a26a8..4d8e0e17b6f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2009,44 +2009,6 @@ float CDECL floorf( float x ) return u.f; } -/********************************************************************* - * modff (MSVCRT.@) - * - * Copied from musl: src/math/modff.c - */ -float CDECL modff( float x, float *iptr ) -{ - union {float f; UINT32 i;} u = {x}; - UINT32 mask; - int e = (u.i >> 23 & 0xff) - 0x7f; - - /* no fractional part */ - if (e >= 23) { - *iptr = x; - if (e == 0x80 && u.i << 9 != 0) { /* nan */ - return x; - } - u.i &= 0x80000000; - return u.f; - } - /* no integral part */ - if (e < 0) { - u.i &= 0x80000000; - *iptr = u.f; - return x; - } - - mask = 0x007fffff >> e; - if ((u.i & mask) == 0) { - *iptr = x; - u.i &= 0x80000000; - return u.f; - } - u.i &= ~mask; - *iptr = u.f; - return x - u.f; -} - #endif /********************************************************************* @@ -5053,44 +5015,6 @@ float CDECL fmaf( float x, float y, float z ) return u.f; } -/********************************************************************* - * modf (MSVCRT.@) - * - * Copied from musl: src/math/modf.c - */ -double CDECL modf( double x, double *iptr ) -{ - union {double f; UINT64 i;} u = {x}; - UINT64 mask; - int e = (u.i >> 52 & 0x7ff) - 0x3ff; - - /* no fractional part */ - if (e >= 52) { - *iptr = x; - if (e == 0x400 && u.i << 12 != 0) /* nan */ - return x; - u.i &= 1ULL << 63; - return u.f; - } - - /* no integral part*/ - if (e < 0) { - u.i &= 1ULL << 63; - *iptr = u.f; - return x; - } - - mask = -1ULL >> 12 >> e; - if ((u.i & mask) == 0) { - *iptr = x; - u.i &= 1ULL << 63; - return u.f; - } - u.i &= ~mask; - *iptr = u.f; - return x - u.f; -} - #if defined(__i386__) || defined(__x86_64__) static void _setfp_sse( unsigned int *cw, unsigned int cw_mask, unsigned int *sw, unsigned int sw_mask )

1 0

Paul Gofman : winegstreamer: Fix check for non-zero padding in h264 transform.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 35f9091beee52cbd7cde0b5e7c2c8bec5b1259dd URL: https://gitlab.winehq.org/wine/wine/-/commit/35f9091beee52cbd7cde0b5e7c2c8b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 3 17:23:43 2023 -0600 winegstreamer: Fix check for non-zero padding in h264 transform. --- dlls/winegstreamer/h264_decoder.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 439701098ad..7d9c38837d3 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -183,7 +183,8 @@ static HRESULT fill_output_media_type(struct h264_decoder *decoder, IMFMediaType } if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, NULL)) - && !IsRectEmpty(&wg_format->u.video.padding)) + && (wg_format->u.video.padding.left || wg_format->u.video.padding.right || wg_format->u.video.padding.top + || wg_format->u.video.padding.bottom)) { MFVideoArea aperture = {

1 0

Francisco Casas : vkd3d-shader/hlsl: Consider register() as manual packing for resource fields.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: vkd3d Branch: master Commit: f3e81327dc775e4e794618558696971ee1741fdc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f3e81327dc775e4e7946185586969… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Mar 1 15:57:31 2023 -0300 vkd3d-shader/hlsl: Consider register() as manual packing for resource fields. --- libs/vkd3d-shader/hlsl_codegen.c | 5 +++-- tests/cbuffer.shader_test | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 610b576c..5d7e426f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2994,10 +2994,11 @@ static void validate_buffer_offsets(struct hlsl_ctx *ctx) LIST_FOR_EACH_ENTRY(var1, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { buffer = var1->buffer; - if (!buffer) + if (!buffer || buffer == ctx->globals_buffer) continue; - if (var1->reg_reservation.offset_type == 'c') + if (var1->reg_reservation.offset_type + || (var1->data_type->class == HLSL_CLASS_OBJECT && var1->reg_reservation.reg_type)) buffer->manually_packed_elements = true; else buffer->automatically_packed_elements = true; diff --git a/tests/cbuffer.shader_test b/tests/cbuffer.shader_test index e95a5235..9cf42d9d 100644 --- a/tests/cbuffer.shader_test +++ b/tests/cbuffer.shader_test @@ -607,7 +607,7 @@ float4 main() : sv_target } % register() can be used instead of packoffset(). -[pixel shader todo] +[pixel shader] cbuffer buffer { float4 foo : packoffset(c0); @@ -619,7 +619,7 @@ float4 main() : sv_target return 0; } -[pixel shader todo] +[pixel shader] cbuffer buffer { float4 foo : packoffset(c0); @@ -632,7 +632,7 @@ float4 main() : sv_target } % Using register() alone is considered manual packing for resources, so the other fields expect packoffset(). -[pixel shader fail todo] +[pixel shader fail] cbuffer buffer { float4 foo; @@ -644,7 +644,7 @@ float4 main() : sv_target return 0; } -[pixel shader fail todo] +[pixel shader fail] cbuffer buffer { float4 foo;

1 0

Francisco Casas : vkd3d-shader/hlsl: Ignore packoffset() contents for SM1.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: vkd3d Branch: master Commit: bf4a125087c378ad9e1727bf28723c126545f3a6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bf4a125087c378ad9e1727bf28723… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Feb 28 19:03:04 2023 -0300 vkd3d-shader/hlsl: Ignore packoffset() contents for SM1. --- libs/vkd3d-shader/hlsl.y | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index f3196b5b..79ec970a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1107,6 +1107,9 @@ static struct hlsl_reg_reservation parse_packoffset(struct hlsl_ctx *ctx, const struct hlsl_reg_reservation reservation = {0}; char *endptr; + if (ctx->profile->major_version < 4) + return reservation; + reservation.offset_index = strtoul(reg_string + 1, &endptr, 10); if (*endptr) {

1 0