wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Derek Lesho : ntoskrnl.exe: Implement ObOpenObjectByName.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: 65df36c1151306db5a8fb86623b74c49d33a3649 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65df36c1151306db5a8fb866… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Jul 16 10:17:08 2020 -0500 ntoskrnl.exe: Implement ObOpenObjectByName. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 32 ++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index fa85979d0b..e94feabc82 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2806,6 +2806,38 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, } +/******************************************************************** + * ObOpenObjectByName (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ObOpenObjectByName(POBJECT_ATTRIBUTES attr, POBJECT_TYPE type, + KPROCESSOR_MODE mode, ACCESS_STATE *access_state, + ACCESS_MASK access, PVOID ctx, HANDLE *handle) +{ + NTSTATUS status; + void *object; + + TRACE( "attr(%p %s %x) %p %u %p %u %p %p\n", attr->RootDirectory, debugstr_us(attr->ObjectName), + attr->Attributes, type, mode, access_state, access, ctx, handle ); + + if (mode != KernelMode) + { + FIXME( "UserMode access not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; + } + + if (attr->RootDirectory) FIXME( "RootDirectory unhandled\n" ); + + status = ObReferenceObjectByName(attr->ObjectName, attr->Attributes, access_state, access, type, mode, ctx, &object ); + if (status != STATUS_SUCCESS) + return status; + + status = ObOpenObjectByPointer(object, attr->Attributes, access_state, access, type, mode, handle); + + ObDereferenceObject(object); + return status; +} + + /*********************************************************************** * ObReferenceObjectByPointer (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0f65490b48..030bdbcedf 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -835,7 +835,7 @@ @ stub ObInsertObject @ stub ObLogSecurityDescriptor @ stub ObMakeTemporaryObject -@ stub ObOpenObjectByName +@ stdcall ObOpenObjectByName(ptr ptr long ptr long ptr ptr) @ stdcall ObOpenObjectByPointer(ptr long ptr long ptr long ptr) @ stdcall ObQueryNameString(ptr ptr long ptr) @ stub ObQueryObjectAuditingByHandle

1 0

Jacek Caban : ntdll: Move InterlockedCompareExchange128 support to winnt.h.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: b59bf31f61ed93a0c2f166af0af0c0d557d7466b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b59bf31f61ed93a0c2f166af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 31 15:37:39 2020 +0200 ntdll: Move InterlockedCompareExchange128 support to winnt.h. Also properly declare intrinsic on msvc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtl.c | 26 ++++---------------------- include/winnt.h | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index c32c63a880..ca4fea8420 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -98,24 +98,6 @@ static const int hex_table[] = { -1, 10, 11, 12, 13, 14, 15 /* 0x60-0x66 */ }; -#if defined(_WIN64) && !defined(_MSC_VER) -static inline unsigned char _InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare) -{ - unsigned char ret; -#ifdef __x86_64__ - __asm__ __volatile__( "lock cmpxchg16b %0; setz %b2" - : "=m" (dest[0]), "=m" (dest[1]), "=r" (ret), - "=a" (compare[0]), "=d" (compare[1]) - : "m" (dest[0]), "m" (dest[1]), "3" (compare[0]), "4" (compare[1]), - "c" (xchg_high), "b" (xchg_low) ); -#else - ret = __sync_bool_compare_and_swap( (__int128 *)dest, *(__int128 *)compare, - ((__int128)xchg_high << 64) | xchg_low ); -#endif - return ret; -} -#endif - /* * resource functions */ @@ -1627,7 +1609,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedFlushSList(PSLIST_HEADER list) { old = *list; new.Header16.Sequence = old.Header16.Sequence + 1; - } while (!_InterlockedCompareExchange128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); + } while (!InterlockedCompareExchange128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); return (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); #else if (!list->s.Next.Next) return NULL; @@ -1657,7 +1639,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedPushEntrySList(PSLIST_HEADER list, PSLIST_ENTR entry->Next = (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); new.Header16.Depth = old.Header16.Depth + 1; new.Header16.Sequence = old.Header16.Sequence + 1; - } while (!_InterlockedCompareExchange128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); + } while (!InterlockedCompareExchange128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); return (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); #else new.s.Next.Next = entry; @@ -1697,7 +1679,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedPopEntrySList(PSLIST_HEADER list) { } __ENDTRY - } while (!_InterlockedCompareExchange128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); + } while (!InterlockedCompareExchange128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); #else do { @@ -1736,7 +1718,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedPushListSListEx(PSLIST_HEADER list, PSLIST_ENT new.Header16.Depth = old.Header16.Depth + count; new.Header16.Sequence = old.Header16.Sequence + 1; last->Next = (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); - } while (!_InterlockedCompareExchange128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); + } while (!InterlockedCompareExchange128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); return (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); #else new.s.Next.Next = first; diff --git a/include/winnt.h b/include/winnt.h index e1cf78420a..6aef97595d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6769,6 +6769,38 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #endif +#ifdef _WIN64 + +#if defined(_MSC_VER) + +#define InterlockedCompareExchange128 _InterlockedCompareExchange128 +static inline unsigned char _InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare); +#pragma intrinsic(_InterlockedCompareExchange128) + +#elif defined(__x86_64__) + +static inline unsigned char InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare) +{ + unsigned char ret; + __asm__ __volatile__( "lock cmpxchg16b %0; setz %b2" + : "=m" (dest[0]), "=m" (dest[1]), "=r" (ret), + "=a" (compare[0]), "=d" (compare[1]) + : "m" (dest[0]), "m" (dest[1]), "3" (compare[0]), "4" (compare[1]), + "c" (xchg_high), "b" (xchg_low) ); + return ret; +} + +#elif defined(__GNUC__) + +static inline unsigned char InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare) +{ + return __sync_bool_compare_and_swap( (__int128 *)dest, *(__int128 *)compare, ((__int128)xchg_high << 64) | xchg_low ); +} + +#endif + +#endif /* _WIN64 */ + #ifdef __cplusplus } #endif

1 0

Piotr Caban : msvcrt: Import sqrt from musl.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: a6ae2b5c1101d37f06c4118a6e4045dca7dfdc65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6ae2b5c1101d37f06c4118a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 4 15:17:33 2020 +0200 msvcrt: Import sqrt from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 108 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index bbb5a9194e..59b6a98487 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -645,12 +645,117 @@ double CDECL MSVCRT_sinh( double x ) /********************************************************************* * MSVCRT_sqrt (MSVCRT.@) + * + * Copied from musl: src/math/sqrt.c */ double CDECL MSVCRT_sqrt( double x ) { - double ret = sqrt(x); - if (x < 0.0) return math_error(_DOMAIN, "sqrt", x, 0, ret); - return ret; + 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; + + ix = *(ULONGLONG*)&x; + ix0 = ix >> 32; + ix1 = ix; + + /* take care of Inf and NaN */ + if (isnan(x) || (isinf(x) && x > 0)) + return x; + + /* take care of zero */ + if (ix0 <= 0) { + if (((ix0 & ~sign) | ix1) == 0) + return x; /* sqrt(+-0) = +-0 */ + if (ix0 < 0) + return math_error(_DOMAIN, "sqrt", x, 0, (x - x) / (x - x)); + } + /* 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; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Import sqrtf from musl.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: bfc23bbd5fd169c73da57305c1453ab02368c0a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfc23bbd5fd169c73da57305… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 4 15:17:04 2020 +0200 msvcrt: Import sqrtf from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f3cf633f25..bbb5a9194e 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -16,7 +16,19 @@ * 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 (http://www.musl-libc.org/): + * ==================================================== + * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * + * Developed at SunPro, a Sun Microsystems, Inc. business. + * Permission to use, copy, modify, and distribute this + * software is freely granted, provided that this notice + * is preserved. + * ==================================================== */ + #include "config.h" #include "wine/port.h" @@ -351,12 +363,74 @@ float CDECL MSVCRT_sinhf( float x ) /********************************************************************* * MSVCRT_sqrtf (MSVCRT.@) + * + * Copied from musl: src/math/sqrtf.c */ float CDECL MSVCRT_sqrtf( float x ) { - float ret = sqrtf(x); - if (x < 0.0) return math_error(_DOMAIN, "sqrtf", x, 0, ret); - return ret; + static const float tiny = 1.0e-30; + + float z; + int sign = 0x80000000; + int ix,s,q,m,t,i; + unsigned int r; + + ix = *(int*)&x; + + /* take care of Inf and NaN */ + if ((ix & 0x7f800000) == 0x7f800000 && (ix == 0x7f800000 || ix & 0x7fffff)) + return x; + + /* take care of zero */ + if (ix <= 0) { + if ((ix & ~sign) == 0) + return x; /* sqrt(+-0) = +-0 */ + return math_error(_DOMAIN, "sqrtf", x, 0, (x - x) / (x - x)); /* sqrt(-ve) = sNaN */ + } + /* normalize x */ + m = ix >> 23; + if (m == 0) { /* subnormal x */ + for (i = 0; (ix & 0x00800000) == 0; i++) + ix <<= 1; + m -= i - 1; + } + m -= 127; /* unbias exponent */ + ix = (ix & 0x007fffff) | 0x00800000; + if (m & 1) /* odd m, double x to make it even */ + ix += ix; + m >>= 1; /* m = [m/2] */ + + /* generate sqrt(x) bit by bit */ + ix += ix; + q = s = 0; /* q = sqrt(x) */ + r = 0x01000000; /* r = moving bit from right to left */ + + while (r != 0) { + t = s + r; + if (t <= ix) { + s = t + r; + ix -= t; + q += r; + } + ix += ix; + r >>= 1; + } + + /* use floating add to find out rounding direction */ + if (ix != 0) { + z = 1.0f - tiny; /* raise inexact flag */ + if (z >= 1.0f) { + z = 1.0f + tiny; + if (z > 1.0f) + q += 2; + else + q += q & 1; + } + } + ix = (q >> 1) + 0x3f000000; + r = ix + ((unsigned int)m << 23); + z = *(float*)&r; + return z; } /*********************************************************************

1 0

Piotr Caban : ucrtbase: Support overriding return value in _matherr.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: 2833a10ba1deb8e9c8b80991d04aad9676d17ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2833a10ba1deb8e9c8b80991… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 4 15:16:49 2020 +0200 ucrtbase: Support overriding return value in _matherr. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 130 ++++++++++++++++++++++++--------------------- dlls/ucrtbase/tests/misc.c | 7 +++ 2 files changed, 76 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2833a10ba1deb8e9c8b8…

1 0

Alistair Leslie-Hughes : xactengine3_7: Return valid HRESULT from IXACT3Engine Initialize.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: 47a5de3438a30dbcc5a729e3442103015b99be34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47a5de3438a30dbcc5a729e3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 4 11:30:33 2020 +1000 xactengine3_7: Return valid HRESULT from IXACT3Engine Initialize. FAudio doesn't always return a valid HRESULT, ensure a valid code is passed back to the application. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 3a14db7460..69570e8cef 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -157,6 +157,7 @@ static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); FACTRuntimeParameters params; + UINT ret; TRACE("(%p)->(%p)\n", This, pParams); @@ -195,7 +196,11 @@ static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, params.fileIOCallbacks.readFileCallback = wrap_readfile; params.fileIOCallbacks.getOverlappedResultCallback = wrap_getoverlappedresult; - return FACTAudioEngine_Initialize(This->fact_engine, &params); + ret = FACTAudioEngine_Initialize(This->fact_engine, &params); + if (ret != 0) + WARN("FACTAudioEngine_Initialize returned %d\n", ret); + + return !ret ? S_OK : E_FAIL; } static HRESULT WINAPI IXACT3EngineImpl_ShutDown(IXACT3Engine *iface)

1 0

Henri Verbeet : vkd3d-shader: Merge the vkd3d_shader_descriptor_type and vkd3d_shader_descriptor_range_type enumerations.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: vkd3d Branch: master Commit: dae87cc1c0b856c7758a6fcd6f5bd6c5a0474a16 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dae87cc1c0b856c7758a6fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 15:01:33 2020 +0430 vkd3d-shader: Merge the vkd3d_shader_descriptor_type and vkd3d_shader_descriptor_range_type enumerations. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 23 ++++++----------------- libs/vkd3d-shader/dxbc.c | 16 ++++++++-------- libs/vkd3d-shader/spirv.c | 5 +++-- 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 26a2110..de2c0c7 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -88,11 +88,10 @@ struct vkd3d_shader_code enum vkd3d_shader_descriptor_type { - VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN, - VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, /* cb# */ - VKD3D_SHADER_DESCRIPTOR_TYPE_SRV, /* t# */ - VKD3D_SHADER_DESCRIPTOR_TYPE_UAV, /* u# */ - VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, /* s# */ + VKD3D_SHADER_DESCRIPTOR_TYPE_SRV = 0x0, /* t# */ + VKD3D_SHADER_DESCRIPTOR_TYPE_UAV = 0x1, /* u# */ + VKD3D_SHADER_DESCRIPTOR_TYPE_CBV = 0x2, /* cb# */ + VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER = 0x3, /* s# */ VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_TYPE), }; @@ -450,19 +449,9 @@ struct vkd3d_shader_static_sampler_desc enum vkd3d_shader_visibility shader_visibility; }; -enum vkd3d_shader_descriptor_range_type -{ - VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV = 0x0, - VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV = 0x1, - VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_CBV = 0x2, - VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SAMPLER = 0x3, - - VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE), -}; - struct vkd3d_shader_descriptor_range { - enum vkd3d_shader_descriptor_range_type range_type; + enum vkd3d_shader_descriptor_type range_type; unsigned int descriptor_count; unsigned int base_shader_register; unsigned int register_space; @@ -558,7 +547,7 @@ enum vkd3d_shader_descriptor_range_flags struct vkd3d_shader_descriptor_range1 { - enum vkd3d_shader_descriptor_range_type range_type; + enum vkd3d_shader_descriptor_type range_type; unsigned int descriptor_count; unsigned int base_shader_register; unsigned int register_space; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index df5f6a2..1aa8a5c 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3143,13 +3143,13 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descri { const struct vkd3d_shader_descriptor_range *r = &descriptor_table->descriptor_ranges[i]; - if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV - || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV - || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_CBV) + if (r->range_type == VKD3D_SHADER_DESCRIPTOR_TYPE_SRV + || r->range_type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV + || r->range_type == VKD3D_SHADER_DESCRIPTOR_TYPE_CBV) { have_srv_uav_cbv = true; } - else if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SAMPLER) + else if (r->range_type == VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER) { have_sampler = true; } @@ -3184,13 +3184,13 @@ static int validate_descriptor_table_v_1_1(const struct vkd3d_shader_root_descri { const struct vkd3d_shader_descriptor_range1 *r = &descriptor_table->descriptor_ranges[i]; - if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV - || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV - || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_CBV) + if (r->range_type == VKD3D_SHADER_DESCRIPTOR_TYPE_SRV + || r->range_type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV + || r->range_type == VKD3D_SHADER_DESCRIPTOR_TYPE_CBV) { have_srv_uav_cbv = true; } - else if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SAMPLER) + else if (r->range_type == VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER) { have_sampler = true; } diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4d1826f..9ef0430 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2364,7 +2364,6 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor struct vkd3d_shader_descriptor_binding binding; unsigned int i; - descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN; if (reg->type == VKD3DSPR_CONSTBUFFER) descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_CBV; else if (reg->type == VKD3DSPR_RESOURCE) @@ -2378,6 +2377,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor FIXME("Unhandled register type %#x.\n", reg->type); vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE, "Encountered invalid/unhandled register type %#x.", reg->type); + goto done; } resource_type_flag = resource_type == VKD3D_SHADER_RESOURCE_BUFFER @@ -2406,7 +2406,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor "Could not find descriptor binding for UAV counter %u, space %u.", reg_idx, register_space); } } - else if (descriptor_type != VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN) + else { for (i = 0; i < shader_interface->binding_count; ++i) { @@ -2432,6 +2432,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor } } +done: binding.set = 0; binding.binding = compiler->binding_idx++; return binding;

1 0

Henri Verbeet : vkd3d-compiler: Add an option to specify the buffer type to use for buffer UAV bindings.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: vkd3d Branch: master Commit: b2dcff0ecf0cd0dc4e1b7cfca4db872a2a364ef6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b2dcff0ecf0cd0dc4e1b7cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 15:01:32 2020 +0430 vkd3d-compiler: Add an option to specify the buffer type to use for buffer UAV bindings. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index be8a99d..9b50c10 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -27,11 +27,12 @@ #include "vkd3d_common.h" #include "vkd3d_shader.h" -#define MAX_COMPILE_OPTIONS 1 +#define MAX_COMPILE_OPTIONS 2 enum { OPTION_HELP = CHAR_MAX + 1, + OPTION_BUFFER_UAV, OPTION_OUTPUT, OPTION_STRIP_DEBUG, OPTION_VERSION, @@ -101,6 +102,9 @@ static void print_usage(const char *program_name) "[options...] file\n" "Options:\n" " -h, --help Display this information and exit.\n" + " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" + " Valid values are 'buffer-texture' (default) and\n" + " 'storage-buffer'.\n" " -o, --output=<file> Write the output to <file>.\n" " --strip-debug Strip debug information from the output.\n" " -V, --version Display version information and exit.\n" @@ -151,6 +155,23 @@ static void add_compile_option(struct options *options, o->value = value; } +static bool parse_buffer_uav(enum vkd3d_shader_compile_option_buffer_uav *buffer_uav, const char *arg) +{ + if (!strcmp(arg, "buffer-texture")) + { + *buffer_uav = VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV_STORAGE_TEXEL_BUFFER; + return true; + } + + if (!strcmp(arg, "storage-buffer")) + { + *buffer_uav = VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV_STORAGE_BUFFER; + return true; + } + + return false; +} + static enum vkd3d_shader_source_type parse_source_type(const char *source) { if (!strcmp(source, "dxbc-tpf") || !strcmp(source, "none")) @@ -161,11 +182,13 @@ static enum vkd3d_shader_source_type parse_source_type(const char *source) static bool parse_command_line(int argc, char **argv, struct options *options) { + enum vkd3d_shader_compile_option_buffer_uav buffer_uav; int option; static struct option long_options[] = { {"help", no_argument, NULL, OPTION_HELP}, + {"buffer-uav", required_argument, NULL, OPTION_BUFFER_UAV}, {"output", required_argument, NULL, OPTION_OUTPUT}, {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, {"version", no_argument, NULL, OPTION_VERSION}, @@ -182,6 +205,15 @@ static bool parse_command_line(int argc, char **argv, struct options *options) switch (option) { + case OPTION_BUFFER_UAV: + if (!parse_buffer_uav(&buffer_uav, optarg)) + { + fprintf(stderr, "Invalid buffer UAV type '%s' specified.\n", optarg); + return false; + } + add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV, buffer_uav); + break; + case OPTION_OUTPUT: case 'o': options->output_filename = optarg;

1 0

Henri Verbeet : vkd3d-shader: Allow plain storage buffers to be used for buffer UAVs.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: vkd3d Branch: master Commit: ffe0dca779dd8c4dbc7eb414647f6375301588c4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ffe0dca779dd8c4dbc7eb41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 15:01:31 2020 +0430 vkd3d-shader: Allow plain storage buffers to be used for buffer UAVs. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 13 ++ libs/vkd3d-shader/spirv.c | 387 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 321 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=ffe0dca779dd8c4dbc7…

1 0

Henri Verbeet : vkd3d-shader: Add a compiler message for unhandled register types in vkd3d_dxbc_compiler_get_descriptor_binding().
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: vkd3d Branch: master Commit: 1496dc054e5c1bb752703790cbcf27adb5c3b5ac URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1496dc054e5c1bb75270379… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 15:01:30 2020 +0430 vkd3d-shader: Add a compiler message for unhandled register types in vkd3d_dxbc_compiler_get_descriptor_binding(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6341370..9af672b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2340,7 +2340,11 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor else if (reg->type == VKD3DSPR_SAMPLER) descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER; else + { FIXME("Unhandled register type %#x.\n", reg->type); + vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE, + "Encountered invalid/unhandled register type %#x.", reg->type); + } resource_type_flag = resource_type == VKD3D_SHADER_RESOURCE_BUFFER ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 16df8a5..21e37da 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -71,6 +71,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF = 1000, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND = 2000, + VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE = 2001, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY = 3000, VKD3D_SHADER_ERROR_RS_INVALID_VERSION = 3001,

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
70
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2020