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

Esme Povirk : user32/tests: Test cross-platform use of scroll functions.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: 1855782ee0d9c3130a63484a1611868e1d3a92be URL: https://gitlab.winehq.org/wine/wine/-/commit/1855782ee0d9c3130a63484a161186… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Aug 22 14:03:12 2023 -0500 user32/tests: Test cross-platform use of scroll functions. --- dlls/user32/tests/scroll.c | 203 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 481219665ec..70947f5626b 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -785,6 +785,192 @@ static void test_subclass(void) DestroyWindow(hwnd); } +static void read_process(HWND hMainWnd) +{ + SCROLLBARINFO sbi = {0}; + SCROLLINFO si; + BOOL ret; + RECT rect, intersection; + BOOL (WINAPI *pGetScrollBarInfo)(HWND, LONG, LPSCROLLBARINFO); + + si.cbSize = sizeof(si); + si.fMask = SIF_PAGE|SIF_POS|SIF_RANGE; + si.nMin = si.nMax = si.nPos = (int)0xdeadbeef; + si.nPage = 0xdeadbeef; + ret = GetScrollInfo( hMainWnd, SB_HORZ, &si ); + todo_wine ok( ret, "GetScrollInfo should succeed\n" ); + + todo_wine ok( si.nMin == 1, "unexpected nMin %i\n", si.nMin ); + todo_wine ok( si.nMax == 10, "unexpected nMax %i\n", si.nMax ); + todo_wine ok( si.nPage == 3, "unexpected nPage %u\n", si.nPage ); + todo_wine ok( si.nPos == 4, "unexpected nPos %i\n", si.nPos ); + + si.cbSize = sizeof(si); + si.fMask = SIF_PAGE|SIF_POS|SIF_RANGE; + si.nMin = si.nMax = si.nPos = (int)0xdeadbeef; + si.nPage = 0xdeadbeef; + ret = GetScrollInfo( hMainWnd, SB_VERT, &si ); + todo_wine ok( ret, "GetScrollInfo should succeed\n" ); + + todo_wine ok( si.nMin == 201, "unexpected nMin %i\n", si.nMin ); + todo_wine ok( si.nMax == 210, "unexpected nMax %i\n", si.nMax ); + todo_wine ok( si.nPage == 2, "unexpected nPage %u\n", si.nPage ); + todo_wine ok( si.nPos == 204, "unexpected nPos %i\n", si.nPos ); + + pGetScrollBarInfo = (void*)GetProcAddress(GetModuleHandleA("user32.dll"), "GetScrollBarInfo"); + if (!pGetScrollBarInfo) + { + win_skip("GetScrollBarInfo is not available\n"); + return; + } + + ret = GetWindowRect( hMainWnd, &rect ); + ok( ret, "The GetWindowRect() call should not fail.\n" ); + + sbi.cbSize = sizeof(sbi); + sbi.rgstate[0] = 0xdeadbeef; + ret = pGetScrollBarInfo( hMainWnd, OBJID_HSCROLL, &sbi ); + todo_wine ok( ret, "The GetScrollBarInfo() call should not fail.\n" ); + + if (ret) + { + IntersectRect( &intersection, &sbi.rcScrollBar, &rect ); + ok( EqualRect( &intersection, &sbi.rcScrollBar ), "hscroll rect %s outside window rect %s\n", + wine_dbgstr_rect( &sbi.rcScrollBar ), wine_dbgstr_rect( &rect )); + ok( sbi.rcScrollBar.right - sbi.rcScrollBar.left > sbi.rcScrollBar.bottom - sbi.rcScrollBar.top, + "hscroll rect %s should have width > height\n", wine_dbgstr_rect( &rect )); + ok( sbi.rgstate[0] == 0, "unexpected hscroll state %#lx\n", sbi.rgstate[0] ); + } + + sbi.cbSize = sizeof(sbi); + sbi.rgstate[0] = 0xdeadbeef; + ret = pGetScrollBarInfo( hMainWnd, OBJID_VSCROLL, &sbi ); + todo_wine ok( ret, "The GetScrollBarInfo() call should not fail.\n" ); + + if (ret) + { + IntersectRect( &intersection, &sbi.rcScrollBar, &rect ); + ok( EqualRect( &intersection, &sbi.rcScrollBar ), "vscroll rect %s outside window rect %s\n", + wine_dbgstr_rect( &sbi.rcScrollBar ), wine_dbgstr_rect( &rect )); + ok( sbi.rcScrollBar.right - sbi.rcScrollBar.left < sbi.rcScrollBar.bottom - sbi.rcScrollBar.top, + "vscroll rect %s should have width < height\n", wine_dbgstr_rect( &rect )); + ok( sbi.rgstate[0] == 0, "unexpected vscroll state %#lx\n", sbi.rgstate[0] ); + } +} + +static DWORD WINAPI write_process(HWND hMainWnd) +{ + SCROLLBARINFO sbi; + SCROLLINFO si; + BOOL ret; + BOOL (WINAPI *pGetScrollBarInfo)(HWND, LONG, LPSCROLLBARINFO); + + si.cbSize = sizeof(si); + si.fMask = SIF_POS; + si.nPos = 6; + ret = SetScrollInfo( hMainWnd, SB_HORZ, &si, FALSE ); + todo_wine ok( ret, "SetScrollInfo should succeed\n" ); + + si.nPos = 206; + ret = SetScrollInfo( hMainWnd, SB_VERT, &si, FALSE ); + todo_wine ok( ret, "SetScrollInfo should succeed\n" ); + + si.nPos = 0xdeadbeef; + ret = GetScrollInfo( hMainWnd, SB_HORZ, &si ); + todo_wine ok( ret, "GetScrollInfo should succeed\n" ); + todo_wine ok( si.nPos == 6, "unexpected nPos %i\n", si.nPos ); + + si.nPos = 0xdeadbeef; + ret = GetScrollInfo( hMainWnd, SB_VERT, &si ); + todo_wine ok( ret, "GetScrollInfo should succeed\n" ); + todo_wine ok( si.nPos == 206, "unexpected nPos %i\n", si.nPos ); + + pGetScrollBarInfo = (void*)GetProcAddress(GetModuleHandleA("user32.dll"), "GetScrollBarInfo"); + if (!pGetScrollBarInfo) + { + win_skip("GetScrollBarInfo is not available\n"); + return 0; + } + + ret = EnableScrollBar( hMainWnd, SB_HORZ, ESB_DISABLE_BOTH ); + todo_wine ok( ret, "EnableScrollBar should succeed\n" ); + + ret = ShowScrollBar( hMainWnd, SB_VERT, FALSE ); + ok( ret, "ShowScrollBar should succeed\n" ); + + sbi.cbSize = sizeof(sbi); + sbi.rgstate[0] = 0xdeadbeef; + ret = pGetScrollBarInfo( hMainWnd, OBJID_HSCROLL, &sbi ); + todo_wine ok( ret, "The GetScrollBarInfo() call should not fail.\n" ); + todo_wine ok( sbi.rgstate[0] == STATE_SYSTEM_UNAVAILABLE, "unexpected hscroll state %#lx\n", sbi.rgstate[0] ); + + sbi.cbSize = sizeof(sbi); + sbi.rgstate[0] = 0xdeadbeef; + ret = pGetScrollBarInfo( hMainWnd, OBJID_VSCROLL, &sbi ); + todo_wine ok( ret, "The GetScrollBarInfo() call should not fail.\n" ); + todo_wine ok( sbi.rgstate[0] == STATE_SYSTEM_INVISIBLE, "unexpected vscroll state %#lx\n", sbi.rgstate[0] ); + + return 0; +} + +static void test_cross_process(const char* argv0) +{ + HWND hMainWnd; + BOOL ret; + SCROLLINFO si; + STARTUPINFOA startup_info = {0}; + PROCESS_INFORMATION process_info; + char path[MAX_PATH]; + + hMainWnd = create_main_test_wnd(); + + si.cbSize = sizeof(si); + si.fMask = SIF_PAGE|SIF_POS|SIF_RANGE; + si.nMin = 1; + si.nMax = 10; + si.nPage = 3; + si.nPos = 4; + SetScrollInfo( hMainWnd, SB_HORZ, &si, FALSE ); + + si.nMin = 201; + si.nMax = 210; + si.nPage = 2; + si.nPos = 204; + SetScrollInfo( hMainWnd, SB_VERT, &si, FALSE ); + + startup_info.cb = sizeof(startup_info); + sprintf( path, "%s scroll read_process %p", argv0, hMainWnd ); + ret = CreateProcessA( NULL, path, NULL, NULL, FALSE, 0, NULL, NULL, &startup_info, &process_info ); + ok(ret, "CreateProcess \"%s\" failed err %lu.\n", path, GetLastError()); + + /* Messages do not need to be processed to read info. */ + winetest_wait_child_process(process_info.hProcess); + CloseHandle(process_info.hProcess); + CloseHandle(process_info.hThread); + + sprintf( path, "%s scroll write_process %p", argv0, hMainWnd ); + ret = CreateProcessA( NULL, path, NULL, NULL, FALSE, 0, NULL, NULL, &startup_info, &process_info ); + ok(ret, "CreateProcess \"%s\" failed err %lu.\n", path, GetLastError()); + + /* Modifying info requires a message loop. */ + while (MsgWaitForMultipleObjects( 1, &process_info.hProcess, FALSE, 5000, QS_SENDMESSAGE ) == 1) + { + MSG msg; + while (PeekMessageA( &msg, NULL, 0, 0, PM_REMOVE )) + { + TranslateMessage( &msg ); + DispatchMessageA( &msg ); + } + } + + winetest_wait_child_process(process_info.hProcess); + CloseHandle(process_info.hProcess); + CloseHandle(process_info.hThread); + + DestroyWindow( hScroll ); + DestroyWindow( hMainWnd ); +} + static void test_visual(void) { static const int color_indices[] = {COLOR_SCROLLBAR, COLOR_BTNFACE}; @@ -826,10 +1012,26 @@ static void test_visual(void) START_TEST ( scroll ) { + char **argv; + int argc; WNDCLASSA wc; HMODULE hUxtheme; BOOL (WINAPI * pIsThemeActive)(VOID); + argc = winetest_get_mainargs(&argv); + if (argc >= 4 && (!strcmp( argv[2], "read_process" ) || !strcmp( argv[2], "write_process" ))) + { + long wnd_long = strtol( argv[3], NULL, 16 ); + HWND wnd = (HWND)(INT_PTR)wnd_long; + + if (!strcmp( argv[2], "read_process" )) + read_process( wnd ); + else + write_process( wnd ); + + return; + } + wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; wc.cbWndExtra = 0; @@ -849,6 +1051,7 @@ START_TEST ( scroll ) scrollbar_test_track(); test_SetScrollInfo(); test_subclass(); + test_cross_process( argv[0] ); /* Some test results vary depending of theming being active or not */ hUxtheme = LoadLibraryA("uxtheme.dll");

1 0

Giovanni Mascellani : configure: Require widl >= 3.21.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: vkd3d Branch: master Commit: 39e62ed2be67e44b2ae34d48255b9836bd3ea3d7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/39e62ed2be67e44b2ae34d48255b9… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jul 11 11:08:37 2023 +0200 configure: Require widl >= 3.21. Commit b7402ddbbecdfaa81daa657fbb5d37661f401434 from wine is required, which was first released with 3.21, not 3.20. --- README | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index cac0d6dd..155f7de2 100644 --- a/README +++ b/README @@ -15,8 +15,8 @@ Vkd3d generates some of its headers from IDL files. If you are using the release tarballs, then these headers are pre-generated and are included. If you are building from git, then they will be generated at build-time using widl. By default, vkd3d will use the widl found in `PATH'. If widl is not -available or is not recent (>= 3.20), then you can build Wine with `make -tools/widl' to avoid building all of Wine. You can then point vkd3d's +available or is not recent (>= 3.21), then you can build Wine with `make +tools/widl/widl' to avoid building all of Wine. You can then point vkd3d's configure at that widl binary with `WIDL="/path/to/widl"'. For release builds, you may want to define NDEBUG. If you do not need debug log diff --git a/configure.ac b/configure.ac index b58c2f4d..213ab22e 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_SED AC_PROG_MKDIR_P -VKD3D_PROG_WIDL(3, 20) +VKD3D_PROG_WIDL(3, 21) AS_IF([test "x$WIDL" = "xno"], [AC_MSG_WARN([widl is required to build header files.])]) AC_CHECK_PROGS([FLEX], [flex], [none])

1 0

Etaash Mathamsetty : kernelbase: Add GetPackagePathByFullName stub.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 240556e2b8cb94fc9cc85949b7e043f392b1802a URL: https://gitlab.winehq.org/wine/wine/-/commit/240556e2b8cb94fc9cc85949b7e043… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Tue Aug 22 10:35:33 2023 -0400 kernelbase: Add GetPackagePathByFullName stub. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/version.c | 13 +++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index eb70a8763b5..52a17bd7a8c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -775,6 +775,7 @@ @ stdcall GetPackageFamilyName(long ptr ptr) kernelbase.GetPackageFamilyName @ stdcall GetPackageFullName(long ptr ptr) kernelbase.GetPackageFullName @ stdcall GetPackagesByPackageFamily(wstr ptr ptr ptr ptr) kernelbase.GetPackagesByPackageFamily +@ stdcall GetPackagePathByFullName(wstr ptr wstr) kernelbase.GetPackagePathByFullName @ stdcall -import GetPhysicallyInstalledSystemMemory(ptr) @ stdcall -import GetPriorityClass(long) @ stdcall GetPrivateProfileIntA(str str long str) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 5d5256eb65f..104dd99d619 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -631,7 +631,7 @@ # @ stub GetPackageInstallTime # @ stub GetPackageOSMaxVersionTested # @ stub GetPackagePath -# @ stub GetPackagePathByFullName +@ stdcall GetPackagePathByFullName(wstr ptr wstr) # @ stub GetPackagePathOnVolume # @ stub GetPackageProperty # @ stub GetPackagePropertyString diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index d8db79b1263..4631ac8d0bc 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -1618,6 +1618,19 @@ LONG WINAPI DECLSPEC_HOTPATCH GetPackagesByPackageFamily(const WCHAR *family_nam return ERROR_SUCCESS; } +/*********************************************************************** + * GetPackagePathByFullName (kernelbase.@) + */ +LONG WINAPI GetPackagePathByFullName(const WCHAR *name, UINT32 *len, WCHAR *path) +{ + if (!len || !name) + return ERROR_INVALID_PARAMETER; + + FIXME( "(%s %p %p): stub\n", debugstr_w(name), len, path ); + + return APPMODEL_ERROR_NO_PACKAGE; +} + static const struct { UINT32 code;

1 0

Etaash Mathamsetty : wevtapi: Add stub for EvtCreateBookmark.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: caadb1fccb554be5fca5f681a6976e7452f7591c URL: https://gitlab.winehq.org/wine/wine/-/commit/caadb1fccb554be5fca5f681a6976e… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Tue Aug 22 20:04:06 2023 -0400 wevtapi: Add stub for EvtCreateBookmark. --- dlls/wevtapi/main.c | 7 +++++++ dlls/wevtapi/wevtapi.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index cd8e7239178..fa860e2a54f 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -141,3 +141,10 @@ BOOL WINAPI EvtExportLog(EVT_HANDLE session, const WCHAR *path, const WCHAR *que SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +EVT_HANDLE WINAPI EvtCreateBookmark(const WCHAR *bookmark_xml) +{ + FIXME("(%s) stub!\n", debugstr_w(bookmark_xml)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index 9ef06907dc1..16c06685257 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -2,7 +2,7 @@ @ stub EvtCancel @ stub EvtClearLog @ stdcall EvtClose(ptr) -@ stub EvtCreateBookmark +@ stdcall EvtCreateBookmark(wstr) @ stub EvtCreateRenderContext @ stdcall EvtExportLog(ptr wstr wstr wstr long) @ stub EvtFormatMessage

1 0

Zebediah Figura : vkd3d-shader: Add a flag marking raw buffers to struct vkd3d_shader_descriptor_info.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: vkd3d Branch: master Commit: 622311da8e87c60110329044e29b88dd524e28e7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/622311da8e87c60110329044e29b8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 9 18:59:51 2023 -0500 vkd3d-shader: Add a flag marking raw buffers to struct vkd3d_shader_descriptor_info. --- include/vkd3d_shader.h | 2 ++ libs/vkd3d-shader/vkd3d_shader_main.c | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index e98aad4f..cfe54dbf 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1339,6 +1339,8 @@ enum vkd3d_shader_descriptor_info_flag /** The descriptor is a UAV resource, on which the shader performs * atomic ops. \since 1.6 */ VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_ATOMICS = 0x00000008, + /** The descriptor is a raw (byte-addressed) buffer. \since 1.9 */ + VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_RAW_BUFFER = 0x00000010, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_INFO_FLAG), }; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 10a51ab9..38f90966 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -819,7 +819,7 @@ static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_conte static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_resource *resource, enum vkd3d_shader_resource_type resource_type, enum vkd3d_shader_resource_data_type resource_data_type, - unsigned int sample_count, unsigned int structure_stride) + unsigned int sample_count, unsigned int structure_stride, bool raw) { struct vkd3d_shader_descriptor_info1 *d; enum vkd3d_shader_descriptor_type type; @@ -836,6 +836,8 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont return; d->sample_count = sample_count; d->structure_stride = structure_stride; + if (raw) + d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_RAW_BUFFER; } static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_scan_context *context, @@ -894,7 +896,7 @@ static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_sca } vkd3d_shader_scan_resource_declaration(context, &semantic->resource, - semantic->resource_type, resource_data_type, semantic->sample_count, 0); + semantic->resource_type, resource_data_type, semantic->sample_count, 0, false); } static void vkd3d_shader_scan_error(struct vkd3d_shader_scan_context *context, @@ -928,13 +930,13 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_DCL_RESOURCE_RAW: case VKD3DSIH_DCL_UAV_RAW: vkd3d_shader_scan_resource_declaration(context, &instruction->declaration.raw_resource.resource, - VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0, 0); + VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0, 0, true); break; case VKD3DSIH_DCL_RESOURCE_STRUCTURED: case VKD3DSIH_DCL_UAV_STRUCTURED: vkd3d_shader_scan_resource_declaration(context, &instruction->declaration.structured_resource.resource, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0, - instruction->declaration.structured_resource.byte_stride); + instruction->declaration.structured_resource.byte_stride, false); break; case VKD3DSIH_IF: cf_info = vkd3d_shader_scan_push_cf_info(context);

1 0

Conor McCarthy : vkd3d: Implement ID3D12Device1 with stubs.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: vkd3d Branch: master Commit: f3baf55d970edecaeb641eb5bb64e291c32fe838 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f3baf55d970edecaeb641eb5bb64e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jul 17 16:42:48 2023 +1000 vkd3d: Implement ID3D12Device1 with stubs. --- include/vkd3d_windows.h | 1 + libs/vkd3d/device.c | 213 ++++++++++++++++++++++++++------------------- libs/vkd3d/resource.c | 2 +- libs/vkd3d/vkd3d_main.c | 4 +- libs/vkd3d/vkd3d_private.h | 12 +-- 5 files changed, 132 insertions(+), 100 deletions(-)

1 0

Zebediah Figura : vkd3d-shader: Add constant buffer size to struct vkd3d_shader_descriptor_info1.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: vkd3d Branch: master Commit: 88f85ffb5065f56a09e4f45b0f73cf444a1f6171 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/88f85ffb5065f56a09e4f45b0f73c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 19:34:23 2023 -0500 vkd3d-shader: Add constant buffer size to struct vkd3d_shader_descriptor_info1. --- libs/vkd3d-shader/vkd3d_shader_main.c | 16 ++++++++++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 31ff5b97..991ef81f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -788,12 +788,15 @@ static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_sc const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_constant_buffer *cb = &instruction->declaration.cb; + struct vkd3d_shader_descriptor_info1 *d; if (!context->scan_descriptor_info) return; - vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, &cb->src.reg, &cb->range, - VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); + if (!(d = vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, + &cb->src.reg, &cb->range, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT))) + return; + d->buffer_size = cb->size * 16; } static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_context *context, @@ -1153,12 +1156,17 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info for (i = 0; i < ARRAY_SIZE(parser->shader_desc.flat_constant_count); ++i) { + unsigned int size = parser->shader_desc.flat_constant_count[i].external; struct vkd3d_shader_register_range range = {.space = 0, .first = i, .last = i}; struct vkd3d_shader_register reg = {.idx[0].offset = i, .idx_count = 1}; + struct vkd3d_shader_descriptor_info1 *d; if (parser->shader_desc.flat_constant_count[i].external) - vkd3d_shader_scan_add_descriptor(&context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, &reg, - &range, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); + { + if ((d = vkd3d_shader_scan_add_descriptor(&context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, &reg, + &range, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT))) + d->buffer_size = size * 16; + } } if (!ret && signature_info) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 89bc0ece..04aba20d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1123,6 +1123,7 @@ struct vkd3d_shader_descriptor_info1 enum vkd3d_shader_resource_data_type resource_data_type; unsigned int flags; unsigned int sample_count; + unsigned int buffer_size; unsigned int count; };

1 0

Zebediah Figura : vkd3d-shader: Add sample count to struct vkd3d_shader_descriptor_info1.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: vkd3d Branch: master Commit: 8c465c81cff58f1746d349e27632eab4324e145c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8c465c81cff58f1746d349e27632e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 19:22:33 2023 -0500 vkd3d-shader: Add sample count to struct vkd3d_shader_descriptor_info1. --- libs/vkd3d-shader/vkd3d_shader_main.c | 15 +++++++++------ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 75fb54c2..31ff5b97 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -815,8 +815,9 @@ static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_conte static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_resource *resource, enum vkd3d_shader_resource_type resource_type, - enum vkd3d_shader_resource_data_type resource_data_type) + enum vkd3d_shader_resource_data_type resource_data_type, unsigned int sample_count) { + struct vkd3d_shader_descriptor_info1 *d; enum vkd3d_shader_descriptor_type type; if (!context->scan_descriptor_info) @@ -826,8 +827,10 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; else type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; - vkd3d_shader_scan_add_descriptor(context, type, &resource->reg.reg, &resource->range, - resource_type, resource_data_type); + if (!(d = vkd3d_shader_scan_add_descriptor(context, type, &resource->reg.reg, + &resource->range, resource_type, resource_data_type))) + return; + d->sample_count = sample_count; } static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_scan_context *context, @@ -886,7 +889,7 @@ static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_sca } vkd3d_shader_scan_resource_declaration(context, &semantic->resource, - semantic->resource_type, resource_data_type); + semantic->resource_type, resource_data_type, semantic->sample_count); } static void vkd3d_shader_scan_error(struct vkd3d_shader_scan_context *context, @@ -920,12 +923,12 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_DCL_RESOURCE_RAW: case VKD3DSIH_DCL_UAV_RAW: vkd3d_shader_scan_resource_declaration(context, &instruction->declaration.raw_resource.resource, - VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); + VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); break; case VKD3DSIH_DCL_RESOURCE_STRUCTURED: case VKD3DSIH_DCL_UAV_STRUCTURED: vkd3d_shader_scan_resource_declaration(context, &instruction->declaration.structured_resource.resource, - VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); + VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); break; case VKD3DSIH_IF: cf_info = vkd3d_shader_scan_push_cf_info(context); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index c719085e..89bc0ece 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1122,6 +1122,7 @@ struct vkd3d_shader_descriptor_info1 enum vkd3d_shader_resource_type resource_type; enum vkd3d_shader_resource_data_type resource_data_type; unsigned int flags; + unsigned int sample_count; unsigned int count; };

1 0

Zebediah Figura : vkd3d-shader: Add structure stride to struct vkd3d_shader_descriptor_info1.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: vkd3d Branch: master Commit: c1ebba9515f29c32c39dda28c9735ec8fd181a99 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c1ebba9515f29c32c39dda28c9735… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 19:56:43 2023 -0500 vkd3d-shader: Add structure stride to struct vkd3d_shader_descriptor_info1. --- libs/vkd3d-shader/vkd3d_shader_main.c | 11 +++++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 991ef81f..10a51ab9 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -818,7 +818,8 @@ static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_conte static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_resource *resource, enum vkd3d_shader_resource_type resource_type, - enum vkd3d_shader_resource_data_type resource_data_type, unsigned int sample_count) + enum vkd3d_shader_resource_data_type resource_data_type, + unsigned int sample_count, unsigned int structure_stride) { struct vkd3d_shader_descriptor_info1 *d; enum vkd3d_shader_descriptor_type type; @@ -834,6 +835,7 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont &resource->range, resource_type, resource_data_type))) return; d->sample_count = sample_count; + d->structure_stride = structure_stride; } static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_scan_context *context, @@ -892,7 +894,7 @@ static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_sca } vkd3d_shader_scan_resource_declaration(context, &semantic->resource, - semantic->resource_type, resource_data_type, semantic->sample_count); + semantic->resource_type, resource_data_type, semantic->sample_count, 0); } static void vkd3d_shader_scan_error(struct vkd3d_shader_scan_context *context, @@ -926,12 +928,13 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_DCL_RESOURCE_RAW: case VKD3DSIH_DCL_UAV_RAW: vkd3d_shader_scan_resource_declaration(context, &instruction->declaration.raw_resource.resource, - VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); + VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0, 0); break; case VKD3DSIH_DCL_RESOURCE_STRUCTURED: case VKD3DSIH_DCL_UAV_STRUCTURED: vkd3d_shader_scan_resource_declaration(context, &instruction->declaration.structured_resource.resource, - VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); + VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0, + instruction->declaration.structured_resource.byte_stride); break; case VKD3DSIH_IF: cf_info = vkd3d_shader_scan_push_cf_info(context); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 04aba20d..bf925a44 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1124,6 +1124,7 @@ struct vkd3d_shader_descriptor_info1 unsigned int flags; unsigned int sample_count; unsigned int buffer_size; + unsigned int structure_stride; unsigned int count; };

1 0

Zebediah Figura : vkd3d-shader: Set descriptor flags in the caller to vkd3d_shader_scan_add_descriptor().
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: vkd3d Branch: master Commit: ccedb7f711a2a9af49f1057e47bc13a6a929866c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ccedb7f711a2a9af49f1057e47bc1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 15 17:52:24 2023 -0500 vkd3d-shader: Set descriptor flags in the caller to vkd3d_shader_scan_add_descriptor(). Return the vkd3d_shader_descriptor_info1 from that function. --- libs/vkd3d-shader/vkd3d_shader_main.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 3a2432c1..75fb54c2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -755,10 +755,10 @@ static void vkd3d_shader_scan_record_uav_atomic_op(struct vkd3d_shader_scan_cont vkd3d_shader_scan_add_uav_flag(context, reg, VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_ATOMICS); } -static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *context, +static struct vkd3d_shader_descriptor_info1 *vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *context, enum vkd3d_shader_descriptor_type type, const struct vkd3d_shader_register *reg, const struct vkd3d_shader_register_range *range, enum vkd3d_shader_resource_type resource_type, - enum vkd3d_shader_resource_data_type resource_data_type, unsigned int flags) + enum vkd3d_shader_resource_data_type resource_data_type) { struct vkd3d_shader_scan_descriptor_info1 *info = context->scan_descriptor_info; struct vkd3d_shader_descriptor_info1 *d; @@ -767,21 +767,21 @@ static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *c info->descriptor_count + 1, sizeof(*info->descriptors))) { ERR("Failed to allocate descriptor info.\n"); - return false; + return NULL; } d = &info->descriptors[info->descriptor_count]; + memset(d, 0, sizeof(*d)); d->type = type; d->register_id = reg->idx[0].offset; d->register_space = range->space; d->register_index = range->first; d->resource_type = resource_type; d->resource_data_type = resource_data_type; - d->flags = flags; d->count = (range->last == ~0u) ? ~0u : range->last - range->first + 1; ++info->descriptor_count; - return true; + return d; } static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_scan_context *context, @@ -793,24 +793,24 @@ static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_sc return; vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, &cb->src.reg, &cb->range, - VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); + VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); } static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_sampler *sampler = &instruction->declaration.sampler; - unsigned int flags; + struct vkd3d_shader_descriptor_info1 *d; if (!context->scan_descriptor_info) return; + if (!(d = vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, + &sampler->src.reg, &sampler->range, VKD3D_SHADER_RESOURCE_NONE, VKD3D_SHADER_RESOURCE_DATA_UINT))) + return; + if (instruction->flags & VKD3DSI_SAMPLER_COMPARISON_MODE) - flags = VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE; - else - flags = 0; - vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, &sampler->src.reg, &sampler->range, - VKD3D_SHADER_RESOURCE_NONE, VKD3D_SHADER_RESOURCE_DATA_UINT, flags); + d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE; } static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_context *context, @@ -827,7 +827,7 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont else type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; vkd3d_shader_scan_add_descriptor(context, type, &resource->reg.reg, &resource->range, - resource_type, resource_data_type, 0); + resource_type, resource_data_type); } static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_scan_context *context, @@ -1155,7 +1155,7 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info if (parser->shader_desc.flat_constant_count[i].external) vkd3d_shader_scan_add_descriptor(&context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, &reg, - &range, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); + &range, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); } if (!ret && signature_info)

1 0