January 2022 - Wine-commits

Zhiyi Zhang : uxtheme/tests: Avoid fix blurry apps popup in test_GetThemePartSize().
by Alexandre Julliard 10 Jan '22

10 Jan '22

Module: wine Branch: master Commit: 05d3480f875c8953260c9b07e826d5e9aafbee30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05d3480f875c8953260c9b07… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jan 10 15:38:29 2022 +0800 uxtheme/tests: Avoid fix blurry apps popup in test_GetThemePartSize(). When changing DPI, a "fix blurry apps" popup may appear on Windows 10. The popup may interfere with other tests as it steals focus, causing them to fail. So set IgnorePerProcessSystemDPIToast to 1 to temporarily disable the popup. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index b085e639784..0385af663e3 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -997,11 +997,13 @@ todo_wine static void test_GetThemePartSize(void) { + static const DWORD enabled = 1; DPI_AWARENESS_CONTEXT old_context; unsigned int old_dpi, current_dpi; HTHEME htheme = NULL; HWND hwnd = NULL; SIZE size, size2; + HKEY key = NULL; HRESULT hr; HDC hdc; @@ -1011,6 +1013,12 @@ static void test_GetThemePartSize(void) return; } + /* Set IgnorePerProcessSystemDPIToast to 1 to disable "fix blurry apps popup" on Windows 10, + * which may interfere other tests because it steals focus */ + RegOpenKeyA(HKEY_CURRENT_USER, "Control Panel\\Desktop", &key); + RegSetValueExA(key, "IgnorePerProcessSystemDPIToast", 0, REG_DWORD, (const BYTE *)&enabled, + sizeof(enabled)); + old_context = pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2); current_dpi = get_primary_monitor_effective_dpi(); old_dpi = current_dpi; @@ -1100,6 +1108,11 @@ done: CloseThemeData(htheme); if (get_primary_monitor_effective_dpi() != old_dpi) set_primary_monitor_effective_dpi(old_dpi); + if (key) + { + RegDeleteValueA(key, "IgnorePerProcessSystemDPIToast"); + RegCloseKey(key); + } pSetThreadDpiAwarenessContext(old_context); }

1 0

André Zwing : kernel32: Fix GetCompressedFileSize[AW] spec file entries.
by Alexandre Julliard 10 Jan '22

10 Jan '22

Module: wine Branch: master Commit: 34841c01486e29806518d9150ec1e63814ae7525 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34841c01486e29806518d915… Author: André Zwing <nerv(a)dawncrow.de> Date: Fri Jan 7 21:16:49 2022 +0100 kernel32: Fix GetCompressedFileSize[AW] spec file entries. Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec | 4 ++-- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernelbase/kernelbase.spec | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec b/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec index 61fedddd343..9d370e75af5 100644 --- a/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec +++ b/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec @@ -24,8 +24,8 @@ @ stdcall FindNextVolumeW(long ptr long) kernel32.FindNextVolumeW @ stdcall FindVolumeClose(ptr) kernel32.FindVolumeClose @ stdcall FlushFileBuffers(long) kernel32.FlushFileBuffers -@ stdcall GetCompressedFileSizeA(long ptr) kernel32.GetCompressedFileSizeA -@ stdcall GetCompressedFileSizeW(long ptr) kernel32.GetCompressedFileSizeW +@ stdcall GetCompressedFileSizeA(str ptr) kernel32.GetCompressedFileSizeA +@ stdcall GetCompressedFileSizeW(wstr ptr) kernel32.GetCompressedFileSizeW @ stdcall GetDiskFreeSpaceA(str ptr ptr ptr ptr) kernel32.GetDiskFreeSpaceA @ stdcall GetDiskFreeSpaceExA(str ptr ptr ptr) kernel32.GetDiskFreeSpaceExA @ stdcall GetDiskFreeSpaceExW(wstr ptr ptr ptr) kernel32.GetDiskFreeSpaceExW diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 6c487c86bd2..87fa0c39381 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -572,10 +572,10 @@ @ stdcall -import GetCommTimeouts(long ptr) @ stdcall -import GetCommandLineA() @ stdcall -import GetCommandLineW() -@ stdcall -import GetCompressedFileSizeA(long ptr) +@ stdcall -import GetCompressedFileSizeA(str ptr) # @ stub GetCompressedFileSizeTransactedA # @ stub GetCompressedFileSizeTransactedW -@ stdcall -import GetCompressedFileSizeW(long ptr) +@ stdcall -import GetCompressedFileSizeW(wstr ptr) @ stdcall GetComputerNameA(ptr ptr) @ stdcall GetComputerNameExA(long ptr ptr) @ stdcall -import GetComputerNameExW(long ptr ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index a118ab84ef8..01135d6250a 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -437,8 +437,8 @@ @ stdcall GetCommTimeouts(long ptr) @ stdcall GetCommandLineA() @ stdcall GetCommandLineW() -@ stdcall GetCompressedFileSizeA(long ptr) -@ stdcall GetCompressedFileSizeW(long ptr) +@ stdcall GetCompressedFileSizeA(str ptr) +@ stdcall GetCompressedFileSizeW(wstr ptr) @ stdcall GetComputerNameExA(long ptr ptr) @ stdcall GetComputerNameExW(long ptr ptr) @ stdcall GetConsoleCP()

1 0

André Zwing : rpcrt4: Fix TowerConstruct spec file entry.
by Alexandre Julliard 10 Jan '22

10 Jan '22

Module: wine Branch: master Commit: 70ec0c8ccf6e5ab271dd9ce99c6ef7b4beae041e URL: https://source.winehq.org/git/wine.git/?a=commit;h=70ec0c8ccf6e5ab271dd9ce9… Author: André Zwing <nerv(a)dawncrow.de> Date: Fri Jan 7 21:16:51 2022 +0100 rpcrt4: Fix TowerConstruct spec file entry. Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpcrt4.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 5a294df65ad..21476714ae2 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -494,7 +494,7 @@ @ stub SimpleTypeAlignment # wxp @ stub SimpleTypeBufferSize # wxp @ stub SimpleTypeMemorySize # wxp -@ stdcall TowerConstruct(ptr ptr ptr ptr ptr ptr) +@ stdcall TowerConstruct(ptr ptr str str str ptr) @ stdcall TowerExplode(ptr ptr ptr ptr ptr ptr) @ stdcall UuidCompare(ptr ptr ptr) @ stdcall UuidCreate(ptr)

1 0

André Zwing : wintrust: Fix WintrustAddDefaultForUsage spec file entry.
by Alexandre Julliard 10 Jan '22

10 Jan '22

Module: wine Branch: master Commit: 1659f314a764e208894842c6222d386258538d07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1659f314a764e208894842c6… Author: André Zwing <nerv(a)dawncrow.de> Date: Fri Jan 7 21:16:52 2022 +0100 wintrust: Fix WintrustAddDefaultForUsage spec file entry. Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/wintrust.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 8226c80c05f..06db4a1159e 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -142,7 +142,7 @@ @ stdcall WinVerifyTrust(long ptr ptr) @ stdcall WinVerifyTrustEx(long ptr ptr) @ stdcall WintrustAddActionID(ptr long ptr) -@ stdcall WintrustAddDefaultForUsage(ptr ptr) +@ stdcall WintrustAddDefaultForUsage(str ptr) @ stdcall WintrustCertificateTrust(ptr) @ stub WintrustGetDefaultForUsage @ stdcall WintrustGetRegPolicyFlags(ptr)

1 0

André Zwing : shlwapi: Report keyName as string.
by Alexandre Julliard 10 Jan '22

10 Jan '22

Module: wine Branch: master Commit: 08c856570a4a30ad7a0fd57bcab0b193fc840d64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08c856570a4a30ad7a0fd57b… Author: André Zwing <nerv(a)dawncrow.de> Date: Fri Jan 7 21:16:54 2022 +0100 shlwapi: Report keyName as string. Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 2 +- dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index f15dba14f21..bdd9da0c67b 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2714,7 +2714,7 @@ DWORD WINAPI SHGetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPWSTR out, BOOL WINAPI SHSetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPCWSTR str, LPCWSTR filename) { - TRACE("(%s, %p, %s, %s)\n", debugstr_w(appName), keyName, debugstr_w(str), + TRACE("(%s, %s, %s, %s)\n", debugstr_w(appName), debugstr_w(keyName), debugstr_w(str), debugstr_w(filename)); return WritePrivateProfileStringW(appName, keyName, str, filename); diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index b126a46a78f..68d0e7f8122 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -292,7 +292,7 @@ 292 stdcall -noname SHMessageBoxCheckExW(ptr ptr ptr ptr ptr long wstr) 293 stub -noname SHCancelUserWorkItems 294 stdcall -noname SHGetIniStringW(wstr wstr ptr long wstr) -295 stdcall -noname SHSetIniStringW(wstr ptr wstr wstr) +295 stdcall -noname SHSetIniStringW(wstr wstr wstr wstr) 296 stub -noname CreateURLFileContentsW 297 stub -noname CreateURLFileContentsA 298 stdcall -noname WritePrivateProfileStringWrapW(wstr wstr wstr wstr) kernel32.WritePrivateProfileStringW

1 0

Stefan Dösinger : ddraw/tests: Reduce precision in test_filling_convention.
by Alexandre Julliard 10 Jan '22

10 Jan '22

Module: wine Branch: master Commit: 9e6a307f099b686bbb1096421791a62090ed9679 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e6a307f099b686bbb109642… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 10 11:00:46 2022 +0300 ddraw/tests: Reduce precision in test_filling_convention. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 6 ++++-- dlls/ddraw/tests/ddraw2.c | 6 ++++-- dlls/ddraw/tests/ddraw4.c | 6 ++++-- dlls/ddraw/tests/ddraw7.c | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 11c14777122..efbecf04c2d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -14513,8 +14513,10 @@ static void test_filling_convention(void) D3DRECT clear_rect = {{0}, {0}, {vp_size}, {vp_size}}; /* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; + * "Rasterization Rules (Direct3D 9)" article. + * + * See the d3d9 test for a comment about the eps value. */ + static const float eps = 1.0f / 64.0f; D3DLVERTEX center_tris[] = { /* left */ diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 33ad957b644..65ac21d73ad 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -15443,8 +15443,10 @@ static void test_filling_convention(void) D3DRECT clear_rect = {{0}, {0}, {vp_size}, {vp_size}}; /* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; + * "Rasterization Rules (Direct3D 9)" article. + * + * See the d3d9 test for a comment about the eps value. */ + static const float eps = 1.0f / 64.0f; D3DLVERTEX center_tris[] = { /* left */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 61828430331..ce2333d93f0 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -18493,8 +18493,10 @@ static void test_filling_convention(void) D3DRECT clear_rect = {{0}, {0}, {vp_size}, {vp_size}}; /* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; + * "Rasterization Rules (Direct3D 9)" article. + * + * See the d3d9 test for a comment about the eps value. */ + static const float eps = 1.0f / 64.0f; struct { struct vec3 position; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index fc0f854e125..4cf57bfcfd3 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18745,8 +18745,10 @@ static void test_filling_convention(void) D3DVIEWPORT7 vp = { 0, 0, vp_size, vp_size, 0.0, 1.0 }; /* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; + * "Rasterization Rules (Direct3D 9)" article. + * + * See the d3d9 test for a comment about the eps value. */ + static const float eps = 1.0f / 64.0f; struct { struct vec3 position;

1 0

Stefan Dösinger : d3d8/tests: Reduce precision in test_filling_convention.
by Alexandre Julliard 10 Jan '22

10 Jan '22

Module: wine Branch: master Commit: e0434bce9090b7064b2fd4d301bdf18de6bf2158 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0434bce9090b7064b2fd4d3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 10 11:00:47 2022 +0300 d3d8/tests: Reduce precision in test_filling_convention. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 29baf07398c..3c61426e17f 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -11330,8 +11330,10 @@ static void test_filling_convention(void) }; /* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; + * "Rasterization Rules (Direct3D 9)" article. + * + * See the d3d9 test for a comment about the eps value. */ + static const float eps = 1.0f / 64.0f; const struct { struct vec3 position;

1 0

Stefan Dösinger : d3d9/tests: Use a HW generation dependent offset for the filling convetion test.
by Alexandre Julliard 10 Jan '22

10 Jan '22

Module: wine Branch: master Commit: 57e7ccaa6afe8095a3cf7ebf1d1e8f8d51855cd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57e7ccaa6afe8095a3cf7ebf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 10 11:00:48 2022 +0300 d3d9/tests: Use a HW generation dependent offset for the filling convetion test. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index eb31f877acd..f4aa45f91fa 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -117,6 +117,19 @@ static BOOL adapter_is_amd(const D3DADAPTER_IDENTIFIER9 *identifier) return adapter_is_vendor(identifier, 0x1002); } +static BOOL device_is_d3d10(IDirect3DDevice9 *device) +{ + IDirect3D9 *d3d; + HRESULT hr; + + IDirect3DDevice9_GetDirect3D(device, &d3d); + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_QUERY_FILTER, D3DRTYPE_TEXTURE, D3DFMT_A32B32G32R32F); + IDirect3D9_Release(d3d); + + return SUCCEEDED(hr); +} + /* Locks a given surface and returns the color at (x,y). It's the caller's * responsibility to only pass in lockable surfaces and valid x,y coordinates */ static DWORD getPixelColorFromSurface(IDirect3DSurface9 *surface, UINT x, UINT y) @@ -27052,9 +27065,22 @@ static void test_filling_convention(void) }; /* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; - const struct + * "Rasterization Rules (Direct3D 9)" article. + * + * The eps offset is filled in later depending on the GPU generation. The -eps/+eps below + * is kept for keeping the code similar to the same test in the other d3d versions. + * + * For d3d10+ GPUs even an offset of 1/(1024^2) is enough to make a difference. dx9 GPUs + * (or at least r500, on which this was tested) need an offset of 1/128. dx7 (or rather, + * a Geforce 4 GO, AKA a rebranded geforce 2) need 1/64. + * + * GameFace is the only software we found that we know is picky regarding small geometry + * offsets. It needs d3d10 and newer. A number of games have been written for d3d9 that + * actually need d3d10 hardware (e.g. ARGB32F with filtering, some fourcc hacks). There + * might be something that needs the d3d10+ precision in the d3d9 API. So demand it if + * we find a d3d10+ GPU. */ + float eps = 0.0f; + struct { struct vec3 position; DWORD diffuse; @@ -27406,6 +27432,19 @@ static void test_filling_convention(void) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (device_is_d3d10(device)) + eps = 1.0f / 512.0f; + else + eps = 1.0f / 64.0f; + + for (i = 0; i < 12; ++i) + { + nudge_right_tris[i].position.x +=eps; + nudge_left_tris[i].position.x -=eps; + nudge_top_tris[i].position.y +=eps; + nudge_bottom_tris[i].position.y -=eps; + } + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice9_SetFVF(device, tests[i].fvf);

1 0

Conor McCarthy : vkd3d-shader/dxbc: Emit a fixme when a DXIL shader chunk is found.
by Alexandre Julliard 10 Jan '22

10 Jan '22

Module: vkd3d Branch: master Commit: eb1ae29de0a5a7c319c2123396c31871a27cc0fe URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=eb1ae29de0a5a7c319c2123… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jan 10 15:14:37 2022 +1000 vkd3d-shader/dxbc: Emit a fixme when a DXIL shader chunk is found. Simplifies detection of SM6+ shaders, e.g. Horizon Zero Dawn and Cyberpunk 2077. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 0b76a4a..d26ed54 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1988,6 +1988,10 @@ static int shdr_handler(const char *data, DWORD data_size, DWORD tag, void *cont TRACE("Skipping AON9 shader code chunk.\n"); break; + case TAG_DXIL: + FIXME("Skipping DXIL shader model 6+ code chunk.\n"); + break; + default: TRACE("Skipping chunk %#x.\n", tag); break; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index ffea91d..6f0c57c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1216,6 +1216,7 @@ static inline void *vkd3d_find_struct_(const struct vkd3d_struct *chain, ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) #define TAG_AON9 MAKE_TAG('A', 'o', 'n', '9') #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') +#define TAG_DXIL MAKE_TAG('D', 'X', 'I', 'L') #define TAG_ISG1 MAKE_TAG('I', 'S', 'G', '1') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') #define TAG_OSG1 MAKE_TAG('O', 'S', 'G', '1')

1 0

Conor McCarthy : vkd3d: Handle D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE using a Vulkan extension.
by Alexandre Julliard 10 Jan '22

10 Jan '22

Module: vkd3d Branch: master Commit: 5d2b604b5cdb0b3f7a990df482c5d843886be4d5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5d2b604b5cdb0b3f7a990df… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jan 10 16:08:27 2022 +1000 vkd3d: Handle D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE using a Vulkan extension. Used by Cyberpunk 2077. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 1 + libs/vkd3d/resource.c | 14 +++++++++----- libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4a9a0c7..4ce3ed8 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -128,6 +128,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = VK_EXTENSION(KHR_IMAGE_FORMAT_LIST, KHR_image_format_list), VK_EXTENSION(KHR_MAINTENANCE3, KHR_maintenance3), VK_EXTENSION(KHR_PUSH_DESCRIPTOR, KHR_push_descriptor), + VK_EXTENSION(KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE, KHR_sampler_mirror_clamp_to_edge), /* EXT extensions */ VK_EXTENSION(EXT_CONDITIONAL_RENDERING, EXT_conditional_rendering), VK_EXTENSION(EXT_DEBUG_MARKER, EXT_debug_marker), diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index fb5346e..78b32bd 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -3044,7 +3044,8 @@ static VkSamplerMipmapMode vk_mipmap_mode_from_d3d12(D3D12_FILTER_TYPE type) } } -static VkSamplerAddressMode vk_address_mode_from_d3d12(D3D12_TEXTURE_ADDRESS_MODE mode) +static VkSamplerAddressMode vk_address_mode_from_d3d12(const struct d3d12_device *device, + D3D12_TEXTURE_ADDRESS_MODE mode) { switch (mode) { @@ -3056,7 +3057,10 @@ static VkSamplerAddressMode vk_address_mode_from_d3d12(D3D12_TEXTURE_ADDRESS_MOD return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE; case D3D12_TEXTURE_ADDRESS_MODE_BORDER: return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER; - /* D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE requires VK_KHR_mirror_clamp_to_edge. */ + case D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE: + if (device->vk_info.KHR_sampler_mirror_clamp_to_edge) + return VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE; + /* Fall through */ default: FIXME("Unhandled address mode %#x.\n", mode); return VK_SAMPLER_ADDRESS_MODE_REPEAT; @@ -3085,9 +3089,9 @@ static VkResult d3d12_create_sampler(struct d3d12_device *device, D3D12_FILTER f sampler_desc.magFilter = vk_filter_from_d3d12(D3D12_DECODE_MAG_FILTER(filter)); sampler_desc.minFilter = vk_filter_from_d3d12(D3D12_DECODE_MIN_FILTER(filter)); sampler_desc.mipmapMode = vk_mipmap_mode_from_d3d12(D3D12_DECODE_MIP_FILTER(filter)); - sampler_desc.addressModeU = vk_address_mode_from_d3d12(address_u); - sampler_desc.addressModeV = vk_address_mode_from_d3d12(address_v); - sampler_desc.addressModeW = vk_address_mode_from_d3d12(address_w); + sampler_desc.addressModeU = vk_address_mode_from_d3d12(device, address_u); + sampler_desc.addressModeV = vk_address_mode_from_d3d12(device, address_v); + sampler_desc.addressModeW = vk_address_mode_from_d3d12(device, address_w); sampler_desc.mipLodBias = mip_lod_bias; sampler_desc.anisotropyEnable = D3D12_DECODE_IS_ANISOTROPIC_FILTER(filter); sampler_desc.maxAnisotropy = max_anisotropy; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 454b066..047f4a2 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -106,6 +106,7 @@ struct vkd3d_vulkan_info bool KHR_image_format_list; bool KHR_maintenance3; bool KHR_push_descriptor; + bool KHR_sampler_mirror_clamp_to_edge; /* EXT device extensions */ bool EXT_conditional_rendering; bool EXT_debug_marker;

1 0