August 2020 - Wine-Commits - list.winehq.org

Derek Lesho : ntoskrnl.exe: Implement KeReadStateEvent.
by Alexandre Julliard Aug. 4, 2020

Aug. 4, 2020

Module: wine Branch: master Commit: 72540c93014c0e3b83799e51b351b969d1205953 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72540c93014c0e3b83799e51… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Jul 16 10:17:09 2020 -0500 ntoskrnl.exe: Implement KeReadStateEvent. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 22 ++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.c | 11 +++++++++++ include/ddk/wdm.h | 1 + 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 030bdbcedf..584a8283ea 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -599,7 +599,7 @@ @ stdcall KeQueryTickCount(ptr) @ stdcall KeQueryTimeIncrement() @ stub KeRaiseUserException -@ stub KeReadStateEvent +@ stdcall KeReadStateEvent(ptr) @ stub KeReadStateMutant @ stub KeReadStateMutex @ stub KeReadStateQueue diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 5e06ab2f2b..7f19ce7571 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -311,6 +311,28 @@ void WINAPI KeClearEvent( PRKEVENT event ) KeResetEvent( event ); } +/*********************************************************************** + * KeReadStateEvent (NTOSKRNL.EXE.@) + */ +LONG WINAPI KeReadStateEvent( PRKEVENT event ) +{ + HANDLE handle; + + TRACE("event %p.\n", event); + + if (event->Header.WaitListHead.Blink == INVALID_HANDLE_VALUE) + { + if (!(ObOpenObjectByPointer( event, OBJ_KERNEL_HANDLE, NULL, EVENT_QUERY_STATE, NULL, KernelMode, &handle ))) + { + EVENT_BASIC_INFORMATION event_info; + if (!(NtQueryEvent( handle, EventBasicInformation, &event_info, sizeof(event_info), NULL))) + event->Header.SignalState = event_info.EventState; + NtClose( handle ); + } + } + return event->Header.SignalState; +} + /*********************************************************************** * KeInitializeSemaphore (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 7a325753d4..dfc742eec3 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -467,8 +467,14 @@ static void test_sync(void) ret = wait_single(&manual_event, 0); ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + ret = KeReadStateEvent(&manual_event); + ok(ret == 0, "got %d\n", ret); + KeSetEvent(&manual_event, 0, FALSE); + ret = KeReadStateEvent(&manual_event); + ok(ret == 1, "got %d\n", ret); + ret = wait_single(&manual_event, 0); ok(ret == 0, "got %#x\n", ret); @@ -561,9 +567,14 @@ static void test_sync(void) ret = ObReferenceObjectByHandle(handle, SYNCHRONIZE, *pExEventObjectType, KernelMode, (void **)&event, NULL); ok(!ret, "ObReferenceObjectByHandle failed: %#x\n", ret); + ret = wait_single(event, 0); ok(ret == 0, "got %#x\n", ret); + ret = KeReadStateEvent(event); + ok(ret == 1, "got %d\n", ret); KeResetEvent(event); + ret = KeReadStateEvent(event); + ok(ret == 0, "got %d\n", ret); ret = wait_single(event, 0); ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); ret = wait_single_handle(handle, 0); diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 59af860708..176b432644 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1759,6 +1759,7 @@ KAFFINITY WINAPI KeQueryActiveProcessors(void); void WINAPI KeQuerySystemTime(LARGE_INTEGER*); void WINAPI KeQueryTickCount(LARGE_INTEGER*); ULONG WINAPI KeQueryTimeIncrement(void); +LONG WINAPI KeReadStateEvent(PRKEVENT); void FASTCALL KeReleaseInStackQueuedSpinLockFromDpcLevel(KLOCK_QUEUE_HANDLE*); LONG WINAPI KeReleaseMutex(PRKMUTEX,BOOLEAN); LONG WINAPI KeReleaseSemaphore(PRKSEMAPHORE,KPRIORITY,LONG,BOOLEAN);

1 0

Louis Lenders : api-ms-win-core-file-ansi-l2-1-0: Add dll.
by Alexandre Julliard Aug. 4, 2020

Aug. 4, 2020

Module: wine Branch: master Commit: 470e4828d114420a82e19ed3a7e4d550da8c4706 URL: https://source.winehq.org/git/wine.git/?a=commit;h=470e4828d114420a82e19ed3… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat Jul 11 10:52:02 2020 +0200 api-ms-win-core-file-ansi-l2-1-0: Add dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49477 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-file-ansi-l2-1-0/Makefile.in | 1 + .../api-ms-win-core-file-ansi-l2-1-0.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index f7fbde0d65..13c2078221 100755 --- a/configure +++ b/configure @@ -944,6 +944,7 @@ enable_api_ms_win_core_errorhandling_l1_1_2 enable_api_ms_win_core_errorhandling_l1_1_3 enable_api_ms_win_core_fibers_l1_1_0 enable_api_ms_win_core_fibers_l1_1_1 +enable_api_ms_win_core_file_ansi_l2_1_0 enable_api_ms_win_core_file_fromapp_l1_1_0 enable_api_ms_win_core_file_l1_1_0 enable_api_ms_win_core_file_l1_2_0 @@ -20319,6 +20320,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-errorhandling-l1-1-2 enable_api_ms_ wine_fn_config_makefile dlls/api-ms-win-core-errorhandling-l1-1-3 enable_api_ms_win_core_errorhandling_l1_1_3 wine_fn_config_makefile dlls/api-ms-win-core-fibers-l1-1-0 enable_api_ms_win_core_fibers_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-fibers-l1-1-1 enable_api_ms_win_core_fibers_l1_1_1 +wine_fn_config_makefile dlls/api-ms-win-core-file-ansi-l2-1-0 enable_api_ms_win_core_file_ansi_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-file-fromapp-l1-1-0 enable_api_ms_win_core_file_fromapp_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-file-l1-1-0 enable_api_ms_win_core_file_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-file-l1-2-0 enable_api_ms_win_core_file_l1_2_0 diff --git a/configure.ac b/configure.ac index 890184151d..d54857181e 100644 --- a/configure.ac +++ b/configure.ac @@ -2862,6 +2862,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-2) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-3) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-fibers-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-fibers-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-ansi-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-fromapp-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-l1-2-0) diff --git a/dlls/api-ms-win-core-file-ansi-l2-1-0/Makefile.in b/dlls/api-ms-win-core-file-ansi-l2-1-0/Makefile.in new file mode 100644 index 0000000000..087fadd251 --- /dev/null +++ b/dlls/api-ms-win-core-file-ansi-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-file-ansi-l2-1-0.dll diff --git a/dlls/api-ms-win-core-file-ansi-l2-1-0/api-ms-win-core-file-ansi-l2-1-0.spec b/dlls/api-ms-win-core-file-ansi-l2-1-0/api-ms-win-core-file-ansi-l2-1-0.spec new file mode 100644 index 0000000000..0eb7398aff --- /dev/null +++ b/dlls/api-ms-win-core-file-ansi-l2-1-0/api-ms-win-core-file-ansi-l2-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall CopyFileExA(str str ptr ptr ptr long) kernel32.CopyFileExA +@ stdcall ReplaceFileA(str str str long ptr ptr) kernel32.ReplaceFileA diff --git a/tools/make_specfiles b/tools/make_specfiles index a740a60c4c..2af4606984 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -237,6 +237,7 @@ my @dll_groups = "api-ms-win-core-file-l2-1-0", "api-ms-win-core-file-l2-1-1", "api-ms-win-core-file-l2-1-2", + "api-ms-win-core-file-ansi-l2-1-0", "api-ms-win-core-file-fromapp-l1-1-0", "api-ms-win-core-handle-l1-1-0", "api-ms-win-core-heap-l1-1-0",

1 0

Piotr Caban : msvcrt: Import sqrt from musl.
by Alexandre Julliard Aug. 4, 2020

Aug. 4, 2020

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 Aug. 4, 2020

Aug. 4, 2020

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

Alistair Leslie-Hughes : xactengine3_7: Return valid HRESULT from IXACT3Engine Initialize.
by Alexandre Julliard Aug. 4, 2020

Aug. 4, 2020

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

Piotr Caban : ucrtbase: Support overriding return value in _matherr.
by Alexandre Julliard Aug. 4, 2020

Aug. 4, 2020

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

Henri Verbeet : vkd3d-shader: Add a compiler message for unhandled register types in vkd3d_dxbc_compiler_get_descriptor_binding().
by Alexandre Julliard Aug. 4, 2020

Aug. 4, 2020

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

Henri Verbeet : vkd3d-shader: Fail shader compilation if any descriptor bindings are missing.
by Alexandre Julliard Aug. 4, 2020

Aug. 4, 2020

Module: vkd3d Branch: master Commit: cf3c50b7055f45a379594e56abb3fee6e2adb475 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cf3c50b7055f45a379594e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 15:01:29 2020 +0430 vkd3d-shader: Fail shader compilation if any descriptor bindings are missing. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 30 ++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_main.c | 51 ++++++++++++++++++-------------- libs/vkd3d-shader/vkd3d_shader_private.h | 7 ++++- 3 files changed, 64 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=cf3c50b7055f45a3795…

1 0

Henri Verbeet : vkd3d-shader: Allow plain storage buffers to be used for buffer UAVs.
by Alexandre Julliard Aug. 4, 2020

Aug. 4, 2020

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: Merge the vkd3d_shader_descriptor_type and vkd3d_shader_descriptor_range_type enumerations.
by Alexandre Julliard Aug. 4, 2020

Aug. 4, 2020

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