April 2024 - Wine-commits - list.winehq.org

Michael Bond : shell32/shellpath: Fix UserPinned and QuickLaunch KnownFolderPaths.
by Alexandre Julliard 22 Apr '24

22 Apr '24

Module: wine Branch: master Commit: 1134834b7478632da9c60f36d4a7cf254729242c URL: https://gitlab.winehq.org/wine/wine/-/commit/1134834b7478632da9c60f36d4a7cf… Author: Michael Bond <michael.bond(a)posteo.de> Date: Mon Apr 22 16:05:28 2024 +1000 shell32/shellpath: Fix UserPinned and QuickLaunch KnownFolderPaths. --- dlls/shell32/shellpath.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index e32bf5a50dc..7fbded5743b 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1722,7 +1722,7 @@ static const CSIDL_DATA CSIDL_Data[] = }, { /* 0x4b */ .id = &FOLDERID_ImplicitAppShortcuts, - .type = CSIDL_Type_Disallowed, /* FIXME */ + .type = CSIDL_Type_User, .category = KF_CATEGORY_PERUSER, .name = L"ImplicitAppShortcuts", .parent = &FOLDERID_UserPinned, @@ -1878,7 +1878,7 @@ static const CSIDL_DATA CSIDL_Data[] = }, { /* 0x5b */ .id = &FOLDERID_QuickLaunch, - .type = CSIDL_Type_Disallowed, /* FIXME */ + .type = CSIDL_Type_User, .category = KF_CATEGORY_PERUSER, .name = L"Quick Launch", .parent = &FOLDERID_RoamingAppData, @@ -2024,7 +2024,7 @@ static const CSIDL_DATA CSIDL_Data[] = }, { /* 0x6c */ .id = &FOLDERID_UserPinned, - .type = CSIDL_Type_Disallowed, /* FIXME */ + .type = CSIDL_Type_User, .category = KF_CATEGORY_PERUSER, .name = L"User Pinned", .parent = &FOLDERID_QuickLaunch,

1 0

Piotr Caban : windowscodecs: Support 32-bit ABGR bitfields bitmaps.
by Alexandre Julliard 22 Apr '24

22 Apr '24

Module: wine Branch: master Commit: 12f73ed9d8518442c6cc79d24a56dd07fa8a7fa8 URL: https://gitlab.winehq.org/wine/wine/-/commit/12f73ed9d8518442c6cc79d24a56dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 19 20:06:30 2024 +0200 windowscodecs: Support 32-bit ABGR bitfields bitmaps. --- dlls/windowscodecs/bmpdecode.c | 34 +++++++++ dlls/windowscodecs/tests/bmpformat.c | 137 +++++++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index e80f145c73c..9d4867447f0 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -415,6 +415,39 @@ fail: return hr; } +static HRESULT BmpFrameDecode_ReadABGRasBGR(BmpDecoder* This) +{ + UINT x, y, width, height; + BYTE *pixel; + HRESULT hr; + + hr = IWICBitmapFrameDecode_GetSize(&This->IWICBitmapFrameDecode_iface, &width, &height); + + if (SUCCEEDED(hr)) + { + hr = BmpFrameDecode_ReadUncompressed(This); + } + + if (SUCCEEDED(hr)) + { + for (y = 0; y < height; y++) + { + pixel = This->imagedatastart + This->stride * y; + + for (x = 0; x < width; x++) + { + pixel[0] = pixel[1]; + pixel[1] = pixel[2]; + pixel[2] = pixel[3]; + pixel[3] = 0; + pixel += 4; + } + } + } + + return hr; +} + static HRESULT BmpFrameDecode_ReadRGB8(BmpDecoder* This) { HRESULT hr; @@ -742,6 +775,7 @@ static const struct bitfields_format bitfields_formats[] = { {16,0xf800,0x7e0,0x1f,0,&GUID_WICPixelFormat16bppBGR565,BmpFrameDecode_ReadUncompressed}, {32,0xff0000,0xff00,0xff,0,&GUID_WICPixelFormat32bppBGR,BmpFrameDecode_ReadUncompressed}, {32,0xff0000,0xff00,0xff,0xff000000,&GUID_WICPixelFormat32bppBGRA,BmpFrameDecode_ReadUncompressed}, + {32,0xff000000,0xff0000,0xff00,0xff,&GUID_WICPixelFormat32bppBGR,BmpFrameDecode_ReadABGRasBGR}, {32,0xff,0xff00,0xff0000,0,&GUID_WICPixelFormat32bppBGR,BmpFrameDecode_ReadRGB8}, {0} }; diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 39a576d6c69..1a6a8185156 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -910,6 +910,142 @@ static void test_decode_rle4(void) IWICBitmapDecoder_Release(decoder); } +static const char testbmp_bitfields_abgr[] = { + /* BITMAPFILEHEADER */ + 'B','M', /* "BM" */ + sizeof(BITMAPFILEHEADER)+sizeof(BITMAPV5HEADER)+8,0,0,0, /* file size */ + 0,0,0,0, /* reserved */ + sizeof(BITMAPFILEHEADER)+sizeof(BITMAPV5HEADER),0,0,0, /* offset to bits */ + /* BITMAPV5HEADER */ + sizeof(BITMAPV5HEADER),0,0,0, /* size */ + 2,0,0,0, /* width */ + 1,0,0,0, /* height */ + 1,0, /* planes */ + 32,0, /* bit count */ + BI_BITFIELDS,0,0,0, /* compression */ + 8,0,0,0, /* image size */ + 19,11,0,0, /* X pixels per meter */ + 19,11,0,0, /* Y pixels per meter */ + 0,0,0,0, /* colors used */ + 0,0,0,0, /* colors important */ + 0,0,0,255, /* red mask */ + 0,0,255,0, /* green mask */ + 0,255,0,0, /* blue mask */ + 255,0,0,0, /* alpha mask */ + 'B','G','R','s', /* color space */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0, /* gamma */ + LCS_GM_GRAPHICS,0,0,0, /* intent */ + 0,0,0,0,0,0,0,0,0,0,0,0, + /* bits */ + 0,255,0,0,255,0,255,0 +}; + +static void test_decode_bitfields(void) +{ + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *framedecode; + HRESULT hr; + HGLOBAL hbmpdata; + char *bmpdata; + IStream *bmpstream; + GUID guidresult; + UINT count=0, width=0, height=0; + double dpiX, dpiY; + DWORD imagedata[2] = {1}; + const DWORD expected_imagedata[2] = { 0xff, 0xff00 }; + WICRect rc; + + hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%lx\n", hr); + if (FAILED(hr)) return; + + hbmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(testbmp_bitfields_abgr)); + ok(hbmpdata != 0, "GlobalAlloc failed\n"); + if (hbmpdata) + { + bmpdata = GlobalLock(hbmpdata); + memcpy(bmpdata, testbmp_bitfields_abgr, sizeof(testbmp_bitfields_abgr)); + GlobalUnlock(hbmpdata); + + hr = CreateStreamOnHGlobal(hbmpdata, FALSE, &bmpstream); + ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%lx\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_Initialize(decoder, bmpstream, WICDecodeMetadataCacheOnLoad); + ok(hr == S_OK, "Initialize failed, hr=%lx\n", hr); + + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); + ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%lx\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatBmp), "unexpected container format\n"); + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); + ok(SUCCEEDED(hr), "GetFrameCount failed, hr=%lx\n", hr); + ok(count == 1, "unexpected count %u\n", count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(SUCCEEDED(hr), "GetFrame failed, hr=%lx\n", hr); + if (SUCCEEDED(hr)) + { + IWICImagingFactory *factory; + IWICPalette *palette; + + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); + ok(SUCCEEDED(hr), "GetSize failed, hr=%lx\n", hr); + ok(width == 2, "expected width=2, got %u\n", width); + ok(height == 1, "expected height=1, got %u\n", height); + + hr = IWICBitmapFrameDecode_GetResolution(framedecode, &dpiX, &dpiY); + ok(SUCCEEDED(hr), "GetResolution failed, hr=%lx\n", hr); + ok(fabs(dpiX - 72.0) < 0.01, "expected dpiX=72.0, got %f\n", dpiX); + ok(fabs(dpiY - 72.0) < 0.01, "expected dpiY=72.0, got %f\n", dpiY); + + hr = IWICBitmapFrameDecode_GetPixelFormat(framedecode, &guidresult); + ok(SUCCEEDED(hr), "GetPixelFormat failed, hr=%lx\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_WICPixelFormat32bppBGR), "unexpected pixel format\n"); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%lx\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(SUCCEEDED(hr), "CreatePalette failed, hr=%lx\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "expected WINCODEC_ERR_PALETTEUNAVAILABLE, got %lx\n", hr); + + hr = IWICBitmapFrameDecode_CopyPalette(framedecode, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "expected WINCODEC_ERR_PALETTEUNAVAILABLE, got %lx\n", hr); + + IWICPalette_Release(palette); + } + + IWICImagingFactory_Release(factory); + } + + rc.X = 0; + rc.Y = 0; + rc.Width = 2; + rc.Height = 1; + hr = IWICBitmapFrameDecode_CopyPixels(framedecode, &rc, 32, sizeof(imagedata), (BYTE*)imagedata); + ok(SUCCEEDED(hr), "CopyPixels failed, hr=%lx\n", hr); + ok(!memcmp(imagedata, expected_imagedata, sizeof(imagedata)), "unexpected image data\n"); + + IWICBitmapFrameDecode_Release(framedecode); + } + + IStream_Release(bmpstream); + } + + GlobalFree(hbmpdata); + } + + IWICBitmapDecoder_Release(decoder); +} + static void test_componentinfo(void) { IWICImagingFactory *factory; @@ -1340,6 +1476,7 @@ START_TEST(bmpformat) test_decode_4bpp(); test_decode_rle8(); test_decode_rle4(); + test_decode_bitfields(); test_componentinfo(); test_createfromstream(); test_create_decoder();

1 0

Esme Povirk : mscoree: Update Wine Mono to 9.1.0.
by Alexandre Julliard 22 Apr '24

22 Apr '24

Module: wine Branch: master Commit: e00762b961b78b46be3a9ddaf0cfb74450de1427 URL: https://gitlab.winehq.org/wine/wine/-/commit/e00762b961b78b46be3a9ddaf0cfb7… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Apr 20 16:05:27 2024 +0000 mscoree: Update Wine Mono to 9.1.0. --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- tools/gitlab/test.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 6133737c3ec..0b11a48b8fe 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -56,10 +56,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "9.0.0" +#define MONO_VERSION "9.1.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "79f6c43100675566c112f4199b9ea7b944d338164b34bd91fa11b0b0a414e1c4" +#define MONO_SHA "8a0a1e6837b494df49927e5d759b1c6908e89b8a2f8e3ad025e1c2881882476e" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index f27ff95be2d..9f73522c6c4 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version); extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count); extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func); -#define WINE_MONO_VERSION "9.0.0" +#define WINE_MONO_VERSION "9.1.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index 4d04de64c1e..882f67342a2 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -7,7 +7,7 @@ variables: GIT_STRATEGY: none GECKO_VER: 2.47.4 - MONO_VER: 9.0.0 + MONO_VER: 9.1.0 cache: - key: wine-gecko-$GECKO_VER paths:

1 0

Giovanni Mascellani : vkd3d-utils: Make all extensions optional in D3D12CreateDeviceVKD3D().
by Alexandre Julliard 19 Apr '24

19 Apr '24

Module: vkd3d Branch: master Commit: 296edf0d68582181206271f4fba97706462981b9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/296edf0d68582181206271f4fba97… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Apr 18 13:12:56 2024 +0200 vkd3d-utils: Make all extensions optional in D3D12CreateDeviceVKD3D(). A D3D12 device can be useful even without a surface and swapchain. On the other hand, just having the surface and swapchain extensions doesn't give any feature (the client still has to manage them), so there is no point in making them a requirement. --- libs/vkd3d-utils/vkd3d_utils_main.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 9a1b5406..1a11543a 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -60,16 +60,14 @@ HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device, enum vkd3d_api_version api_version) { - struct vkd3d_optional_instance_extensions_info optional_extensions_info; + struct vkd3d_optional_instance_extensions_info optional_instance_extensions_info; + struct vkd3d_optional_device_extensions_info optional_device_extensions_info; struct vkd3d_instance_create_info instance_create_info; struct vkd3d_device_create_info device_create_info; - static const char * const instance_extensions[] = - { - VK_KHR_SURFACE_EXTENSION_NAME, - }; static const char * const optional_instance_extensions[] = { + VK_KHR_SURFACE_EXTENSION_NAME, "VK_KHR_android_surface", "VK_KHR_wayland_surface", "VK_KHR_win32_surface", @@ -79,7 +77,7 @@ HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL minim "VK_MVK_macos_surface", "VK_MVK_ios_surface", }; - static const char * const device_extensions[] = + static const char * const optional_device_extensions[] = { VK_KHR_SWAPCHAIN_EXTENSION_NAME, }; @@ -95,27 +93,28 @@ HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL minim if (adapter) FIXME("Ignoring adapter %p.\n", adapter); - memset(&optional_extensions_info, 0, sizeof(optional_extensions_info)); - optional_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO; - optional_extensions_info.next = &application_info; - optional_extensions_info.extensions = optional_instance_extensions; - optional_extensions_info.extension_count = ARRAY_SIZE(optional_instance_extensions); + memset(&optional_instance_extensions_info, 0, sizeof(optional_instance_extensions_info)); + optional_instance_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO; + optional_instance_extensions_info.next = &application_info; + optional_instance_extensions_info.extensions = optional_instance_extensions; + optional_instance_extensions_info.extension_count = ARRAY_SIZE(optional_instance_extensions); memset(&instance_create_info, 0, sizeof(instance_create_info)); instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; - instance_create_info.next = &optional_extensions_info; + instance_create_info.next = &optional_instance_extensions_info; instance_create_info.pfn_signal_event = vkd3d_signal_event; instance_create_info.wchar_size = sizeof(WCHAR); - instance_create_info.instance_extensions = instance_extensions; - instance_create_info.instance_extension_count = ARRAY_SIZE(instance_extensions); + + memset(&optional_device_extensions_info, 0, sizeof(optional_device_extensions_info)); + optional_device_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO; + optional_device_extensions_info.extensions = optional_device_extensions; + optional_device_extensions_info.extension_count = ARRAY_SIZE(optional_device_extensions); memset(&device_create_info, 0, sizeof(device_create_info)); device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; - device_create_info.next = NULL; + device_create_info.next = &optional_device_extensions_info; device_create_info.minimum_feature_level = minimum_feature_level; device_create_info.instance_create_info = &instance_create_info; - device_create_info.device_extensions = device_extensions; - device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); return vkd3d_create_device(&device_create_info, iid, device); }

1 0

Giovanni Mascellani : tests: Avoid using a different UAV for SM<6 and SM>=6.
by Alexandre Julliard 19 Apr '24

19 Apr '24

Module: vkd3d Branch: master Commit: 12c457b43f69a5c16f399ed84786e711ec85ca44 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/12c457b43f69a5c16f399ed84786e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 12 13:42:56 2024 +0200 tests: Avoid using a different UAV for SM<6 and SM>=6. --- tests/hlsl/discard.shader_test | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/tests/hlsl/discard.shader_test b/tests/hlsl/discard.shader_test index cf53bf48..69272b58 100644 --- a/tests/hlsl/discard.shader_test +++ b/tests/hlsl/discard.shader_test @@ -19,12 +19,6 @@ probe all rgba (1, 2, 3, 4) [require] shader model >= 5.0 -[uav 0] -format r32 float -size (2d, 2, 1) - -0.0 0.0 - [uav 1] format r32 float size (2d, 2, 1) @@ -34,7 +28,7 @@ size (2d, 2, 1) % Check that side effects stop happening after discard [pixel shader] uniform float4 x; -RWTexture2D<float> y; +RWTexture2D<float> y : register(u1); float4 main(float4 pos : sv_position) : sv_target { @@ -51,14 +45,10 @@ float4 main(float4 pos : sv_position) : sv_target uniform 0 float4 1 2 3 4 todo(glsl) draw quad probe all rgba (1, 2, 3, 4) -if(sm<6) probe uav 1 (0, 0) r (1.0) -if(sm<6) probe uav 1 (1, 0) r (1.0) -if(sm>=6) probe uav 0 (0, 0) r (1.0) -if(sm>=6) probe uav 0 (1, 0) r (1.0) +probe uav 1 (0, 0) r (1.0) +probe uav 1 (1, 0) r (1.0) uniform 0 float4 9 8 7 6 todo(glsl) draw quad probe all rgba (1, 2, 3, 4) -if(sm<6) probe uav 1 (0, 0) r (2.0) -if(sm<6) probe uav 1 (1, 0) r (1.0) -if(sm>=6) probe uav 0 (0, 0) r (2.0) -if(sm>=6) probe uav 0 (1, 0) r (1.0) +probe uav 1 (0, 0) r (2.0) +probe uav 1 (1, 0) r (1.0)

1 0

Giovanni Mascellani : tests: Check that derivatives are still computed after discarding.
by Alexandre Julliard 19 Apr '24

19 Apr '24

Module: vkd3d Branch: master Commit: 7196484e5920992f8786f58acfc3b086d0a85423 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7196484e5920992f8786f58acfc3b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 12 14:06:36 2024 +0200 tests: Check that derivatives are still computed after discarding. --- tests/hlsl/discard.shader_test | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/hlsl/discard.shader_test b/tests/hlsl/discard.shader_test index 69272b58..152a3a0d 100644 --- a/tests/hlsl/discard.shader_test +++ b/tests/hlsl/discard.shader_test @@ -16,6 +16,30 @@ uniform 0 float4 9 8 7 6 todo(sm<4 | glsl) draw quad probe all rgba (1, 2, 3, 4) +[require] +shader model >= 3.0 + +% Check that derivatives are still computed after discarding +% other pixels in the same quad +[pixel shader todo(sm<4)] +float4 main(float4 pos : sv_position) : sv_target +{ + if (frac((floor(pos.x) + floor(pos.y)) / 2) == 0.5) + discard; + return float4(ddx(pos.x), ddx(pos.y), ddy(pos.x), ddy(pos.y)); +} + +[test] +todo(sm<4 | glsl) draw quad +probe (0, 0) rgba (1, 0, 0, 1) +probe (1, 0) rgba (1, 2, 3, 4) +probe (0, 1) rgba (1, 2, 3, 4) +probe (1, 1) rgba (1, 0, 0, 1) +probe (2, 0) rgba (1, 0, 0, 1) +probe (3, 0) rgba (1, 2, 3, 4) +probe (2, 1) rgba (1, 2, 3, 4) +probe (3, 1) rgba (1, 0, 0, 1) + [require] shader model >= 5.0

1 0

Giovanni Mascellani : tests/shader-runner: Use OpDemoteToHelperInvocationEXT when available.
by Alexandre Julliard 19 Apr '24

19 Apr '24

Module: vkd3d Branch: master Commit: dbe3c00a775ee5bb87a72f264f7ea0a05fbc3821 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dbe3c00a775ee5bb87a72f264f7ea… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 17 16:16:34 2024 +0200 tests/shader-runner: Use OpDemoteToHelperInvocationEXT when available. --- tests/shader_runner_vulkan.c | 44 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index c903c894..cedecce3 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -55,6 +55,7 @@ struct vulkan_shader_runner { struct shader_runner r; struct shader_runner_caps caps; + bool demote_to_helper_invocation; VkInstance instance; VkPhysicalDevice phys_device; @@ -89,6 +90,7 @@ struct physical_device_info { VkPhysicalDeviceFeatures2 features2; VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT interlock_features; + VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT demote_to_helper_invocation_features; }; static struct vulkan_shader_runner *vulkan_shader_runner(struct shader_runner *r) @@ -431,6 +433,7 @@ static bool compile_shader(struct vulkan_shader_runner *runner, const char *sour struct vkd3d_shader_compile_info info = {.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO}; struct vkd3d_shader_resource_binding bindings[MAX_RESOURCES + MAX_SAMPLERS]; struct vkd3d_shader_push_constant_buffer push_constants; + enum vkd3d_shader_spirv_extension spirv_extensions[2]; struct vkd3d_shader_resource_binding *binding; struct vkd3d_shader_compile_option options[3]; struct vkd3d_shader_compile_option *option; @@ -517,16 +520,13 @@ static bool compile_shader(struct vulkan_shader_runner *runner, const char *sour spirv_info.next = &interface_info; spirv_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; - if (runner->caps.rov) - { - static const enum vkd3d_shader_spirv_extension extensions[] = - { - VKD3D_SHADER_SPIRV_EXTENSION_EXT_FRAGMENT_SHADER_INTERLOCK, - }; + spirv_info.extensions = spirv_extensions; + spirv_info.extension_count = 0; - spirv_info.extensions = extensions; - spirv_info.extension_count = ARRAY_SIZE(extensions); - } + if (runner->caps.rov) + spirv_extensions[spirv_info.extension_count++] = VKD3D_SHADER_SPIRV_EXTENSION_EXT_FRAGMENT_SHADER_INTERLOCK; + if (runner->demote_to_helper_invocation) + spirv_extensions[spirv_info.extension_count++] = VKD3D_SHADER_SPIRV_EXTENSION_EXT_DEMOTE_TO_HELPER_INVOCATION; push_constants.register_space = 0; push_constants.register_index = 0; @@ -1374,6 +1374,7 @@ static bool check_device_extensions(struct vulkan_shader_runner *runner, struct device_extensions[] = { {VK_EXT_FRAGMENT_SHADER_INTERLOCK_EXTENSION_NAME}, + {VK_EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION_EXTENSION_NAME}, {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, true}, {VK_KHR_MAINTENANCE1_EXTENSION_NAME, true}, }; @@ -1394,6 +1395,8 @@ static bool check_device_extensions(struct vulkan_shader_runner *runner, struct enabled_extensions->names[enabled_extensions->count++] = name; if (!strcmp(name, VK_EXT_FRAGMENT_SHADER_INTERLOCK_EXTENSION_NAME)) runner->caps.rov = true; + if (!strcmp(name, VK_EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION_EXTENSION_NAME)) + runner->demote_to_helper_invocation = true; continue; } @@ -1421,6 +1424,15 @@ static void get_physical_device_info(struct vulkan_shader_runner *runner, struct info->interlock_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_INTERLOCK_FEATURES_EXT; } + if (runner->demote_to_helper_invocation) + { + void *list = info->features2.pNext; + + info->features2.pNext = &info->demote_to_helper_invocation_features; + info->demote_to_helper_invocation_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT; + info->demote_to_helper_invocation_features.pNext = list; + } + if (runner->vkGetPhysicalDeviceFeatures2KHR) VK_CALL(vkGetPhysicalDeviceFeatures2KHR(runner->phys_device, &info->features2)); else @@ -1432,6 +1444,7 @@ static bool init_vulkan_runner(struct vulkan_shader_runner *runner) VkDescriptorPoolCreateInfo descriptor_pool_desc = {.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO}; VkCommandBufferAllocateInfo cmd_buffer_desc = {.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO}; VkCommandPoolCreateInfo command_pool_desc = {.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO}; + VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT demote_to_helper_invocation_features; VkDeviceQueueCreateInfo queue_desc = {.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO}; VkInstanceCreateInfo instance_desc = {.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO}; VkDeviceCreateInfo device_desc = {.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO}; @@ -1561,6 +1574,19 @@ static bool init_vulkan_runner(struct vulkan_shader_runner *runner) runner->caps.rov = false; } + if (device_info.demote_to_helper_invocation_features.shaderDemoteToHelperInvocation) + { + memset(&demote_to_helper_invocation_features, 0, sizeof(demote_to_helper_invocation_features)); + demote_to_helper_invocation_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT; + demote_to_helper_invocation_features.pNext = (void *)device_desc.pNext; + demote_to_helper_invocation_features.shaderDemoteToHelperInvocation = VK_TRUE; + device_desc.pNext = &demote_to_helper_invocation_features; + } + else + { + runner->demote_to_helper_invocation = false; + } + vr = VK_CALL(vkCreateDevice(runner->phys_device, &device_desc, NULL, &device)); free(enabled_extensions.names); if (vr)

1 0

Conor McCarthy : tests/hlsl: Add tests for SV_Depth.
by Alexandre Julliard 19 Apr '24

19 Apr '24

Module: vkd3d Branch: master Commit: b68a9ae3ec360162f5e8f7b44835d0bbcc61ae31 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b68a9ae3ec360162f5e8f7b44835d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 15 10:33:15 2024 +1000 tests/hlsl: Add tests for SV_Depth. --- Makefile.am | 1 + tests/d3d12_test_utils.h | 6 + tests/hlsl/depth-out.shader_test | 35 ++++++ tests/shader_runner.c | 105 ++++++++++++----- tests/shader_runner.h | 4 + tests/shader_runner_d3d11.c | 45 ++++++- tests/shader_runner_d3d12.c | 67 ++++++++++- tests/shader_runner_d3d9.c | 13 ++ tests/shader_runner_gl.c | 40 ++++++- tests/shader_runner_vulkan.c | 249 ++++++++++++++++++++++++++++++--------- 10 files changed, 472 insertions(+), 93 deletions(-)

1 0

Conor McCarthy : tests/hlsl: Add tests for SV_DepthLessEqual and SV_DepthGreaterEqual.
by Alexandre Julliard 19 Apr '24

19 Apr '24

Module: vkd3d Branch: master Commit: 7eeca3fa39d2441516f11074a9c095a31965596b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7eeca3fa39d2441516f11074a9c09… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 15 10:37:37 2024 +1000 tests/hlsl: Add tests for SV_DepthLessEqual and SV_DepthGreaterEqual. --- tests/hlsl/depth-out.shader_test | 75 ++++++++++++++++++++++++++++++++++++++++ tests/shader_runner.c | 13 +++++++ tests/shader_runner_d3d11.c | 4 +++ tests/shader_runner_d3d12.c | 5 +++ tests/shader_runner_gl.c | 11 +++++- tests/shader_runner_vulkan.c | 7 ++++ 6 files changed, 114 insertions(+), 1 deletion(-) diff --git a/tests/hlsl/depth-out.shader_test b/tests/hlsl/depth-out.shader_test index 7acd05b4..fa40e1a1 100644 --- a/tests/hlsl/depth-out.shader_test +++ b/tests/hlsl/depth-out.shader_test @@ -33,3 +33,78 @@ depth less clear dsv 0.5 todo(sm>=6 | glsl) draw quad probe dsv all r (0.5) + + +[require] +shader model >= 5.0 + +[rtv 0] +format r32g32b32a32 float +size (2d, 640, 480) + +[vertex shader] +float2 depth; + +void main(float4 in_position : POSITION, out float4 out_position : SV_Position) +{ + out_position = in_position; + out_position.z = depth.x; +} + +[pixel shader todo] +float2 depth; + +float4 main(out float out_depth : SV_DepthLessEqual) : SV_Target +{ + out_depth = depth.y; + return float4(0.0f, 1.0f, 0.0f, 1.0f); +} + +[test] +uniform 0 float4 0.75 0.75 0.0 0.0 +clear rtv 0 1.0 1.0 1.0 1.0 +clear dsv 0.5 +depth greater equal +todo draw quad +probe all rgba (0.0, 1.0, 0.0, 1.0) +probe dsv all r (0.75) + +uniform 0 float4 0.75 0.375 0.0 0.0 +clear rtv 0 1.0 1.0 1.0 1.0 +clear dsv 0.5 +todo draw quad +probe all rgba (1.0, 1.0, 1.0, 1.0) +probe dsv all r (0.5) + + +[pixel shader todo] +float2 depth; + +float4 main(out float out_depth : SV_DepthGreaterEqual) : SV_Target +{ + out_depth = depth.y; + return float4(0.0f, 1.0f, 0.0f, 1.0f); +} + +[test] +uniform 0 float4 0.75 0.75 0.0 0.0 +clear rtv 0 1.0 1.0 1.0 1.0 +clear dsv 0.5 +depth greater equal +todo draw quad +probe all rgba (0.0, 1.0, 0.0, 1.0) +probe dsv all r (0.75) + +uniform 0 float4 0.375 0.625 0.0 0.0 +clear rtv 0 1.0 1.0 1.0 1.0 +clear dsv 0.5 +todo draw quad +probe all rgba (0.0, 1.0, 0.0, 1.0) +probe dsv all r (0.625) + +uniform 0 float4 0.375 0.375 0.0 0.0 +clear rtv 0 1.0 1.0 1.0 1.0 +clear dsv 0.5 +todo draw quad +probe all rgba (1.0, 1.0, 1.0, 1.0) +probe dsv all r (0.5) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 98e87115..f3b6972f 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -834,6 +834,19 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) runner->last_render_failed = !runner->ops->dispatch(runner, x, y, z); } + else if (match_string(line, "clear rtv", &line)) + { + struct resource *resource; + unsigned int slot; + struct vec4 v; + + if (sscanf(line, "%u %f %f %f %f", &slot, &v.x, &v.y, &v.z, &v.w) < 5) + fatal_error("Malformed rtv clear arguments '%s'.\n", line); + + if (!(resource = shader_runner_get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, slot))) + fatal_error("Resource not found.\n"); + runner->ops->clear(runner, resource, &v); + } else if (match_string(line, "clear dsv", &line)) { struct resource *resource; diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index a8ab80e0..c656a318 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -620,6 +620,10 @@ static void d3d11_runner_clear(struct shader_runner *r, struct resource *res, co switch (resource->r.type) { + case RESOURCE_TYPE_RENDER_TARGET: + ID3D11DeviceContext_ClearRenderTargetView(context, resource->rtv, (const float *)clear_value); + break; + case RESOURCE_TYPE_DEPTH_STENCIL: ID3D11DeviceContext_ClearDepthStencilView(context, resource->dsv, D3D11_CLEAR_DEPTH, clear_value->x, 0); break; diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index bb4157d4..7729de7c 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -468,6 +468,11 @@ static void d3d12_runner_clear(struct shader_runner *r, struct resource *resourc switch (resource->type) { + case RESOURCE_TYPE_RENDER_TARGET: + view = get_cpu_rtv_handle(test_context, runner->rtv_heap, resource->slot); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, view, (const float *)clear_value, 0, NULL); + break; + case RESOURCE_TYPE_DEPTH_STENCIL: view = get_cpu_dsv_handle(test_context, runner->dsv_heap, 0); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, view, diff --git a/tests/shader_runner_gl.c b/tests/shader_runner_gl.c index 7e93763f..fdc418ba 100644 --- a/tests/shader_runner_gl.c +++ b/tests/shader_runner_gl.c @@ -940,6 +940,7 @@ static void gl_runner_clear(struct shader_runner *r, struct resource *res, const { struct gl_resource *resource = gl_resource(res); struct gl_runner *runner = gl_runner(r); + GLbitfield clear_mask; if (!runner->fbo_id) glGenFramebuffers(1, &runner->fbo_id); @@ -947,10 +948,18 @@ static void gl_runner_clear(struct shader_runner *r, struct resource *res, const switch (resource->r.type) { + case RESOURCE_TYPE_RENDER_TARGET: + glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, resource->id, 0); + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + glClearColor(clear_value->x, clear_value->y, clear_value->z, clear_value->w); + clear_mask = GL_COLOR_BUFFER_BIT; + break; + case RESOURCE_TYPE_DEPTH_STENCIL: glFramebufferTexture(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, resource->id, 0); glDepthMask(GL_TRUE); glClearDepthf(clear_value->x); + clear_mask = GL_DEPTH_BUFFER_BIT; break; default: @@ -958,7 +967,7 @@ static void gl_runner_clear(struct shader_runner *r, struct resource *res, const } glScissor(0, 0, res->width, res->height); - glClear(GL_DEPTH_BUFFER_BIT); + glClear(clear_mask); } static bool gl_runner_draw(struct shader_runner *r, diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index 8a3e9163..d9f06980 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -1225,6 +1225,13 @@ static void vulkan_runner_clear(struct shader_runner *r, struct resource *res, c switch (resource->r.type) { + case RESOURCE_TYPE_RENDER_TARGET: + attachment_desc.initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + sub_pass_desc.colorAttachmentCount = 1; + sub_pass_desc.pColorAttachments = &attachment_ref; + memcpy(vk_clear_value.color.float32, clear_value, sizeof(vk_clear_value.color.float32)); + break; + case RESOURCE_TYPE_DEPTH_STENCIL: attachment_desc.initialLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; sub_pass_desc.pDepthStencilAttachment = &attachment_ref;

1 0

Conor McCarthy : vkd3d-shader/dxil: Support SV_Depth, SV_DepthGreaterEqual and SV_DepthLessEqual.
by Alexandre Julliard 19 Apr '24

19 Apr '24

Module: vkd3d Branch: master Commit: 3205e08fb12dd24bf19db0ca4480579b8aa89e51 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3205e08fb12dd24bf19db0ca44805… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Apr 10 11:20:02 2024 +1000 vkd3d-shader/dxil: Support SV_Depth, SV_DepthGreaterEqual and SV_DepthLessEqual. --- libs/vkd3d-shader/dxil.c | 72 +++++++++++++++++++++++++++++++++------- tests/hlsl/depth-out.shader_test | 18 +++++----- 2 files changed, 69 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index d0a799b1..220ba773 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -799,7 +799,7 @@ struct sm6_parser struct vkd3d_shader_dst_param *output_params; struct vkd3d_shader_dst_param *input_params; - uint32_t input_regs_declared[(VKD3DSPR_COUNT + 0x1f) / 0x20]; + uint32_t io_regs_declared[(VKD3DSPR_COUNT + 0x1f) / 0x20]; struct sm6_function *functions; size_t function_count; @@ -3672,6 +3672,22 @@ static void src_params_init_from_operands(struct vkd3d_shader_src_param *src_par src_param_init_from_value(&src_params[i], operands[i]); } +static enum vkd3d_shader_register_type register_type_from_dxil_semantic_kind( + enum vkd3d_shader_sysval_semantic sysval_semantic) +{ + switch (sysval_semantic) + { + case VKD3D_SHADER_SV_DEPTH: + return VKD3DSPR_DEPTHOUT; + case VKD3D_SHADER_SV_DEPTH_GREATER_EQUAL: + return VKD3DSPR_DEPTHOUTGE; + case VKD3D_SHADER_SV_DEPTH_LESS_EQUAL: + return VKD3DSPR_DEPTHOUTLE; + default: + return VKD3DSPR_INVALID; + } +} + static void sm6_parser_init_signature(struct sm6_parser *sm6, const struct shader_signature *s, enum vkd3d_shader_register_type reg_type, struct vkd3d_shader_dst_param *params) { @@ -3684,6 +3700,13 @@ static void sm6_parser_init_signature(struct sm6_parser *sm6, const struct shade e = &s->elements[i]; param = &params[i]; + + if (e->register_index == UINT_MAX) + { + dst_param_io_init(param, e, register_type_from_dxil_semantic_kind(e->sysval_semantic)); + continue; + } + dst_param_io_init(param, e, reg_type); count = 0; if (e->register_count > 1) @@ -4624,16 +4647,16 @@ static void sm6_parser_emit_dx_cbuffer_load(struct sm6_parser *sm6, enum dx_intr instruction_dst_param_init_ssa_vector(ins, sm6_type_max_vector_size(type), sm6); } -static void sm6_parser_dcl_register_builtin(struct sm6_parser *sm6, +static void sm6_parser_dcl_register_builtin(struct sm6_parser *sm6, enum vkd3d_shader_opcode handler_idx, enum vkd3d_shader_register_type reg_type, enum vkd3d_data_type data_type, unsigned int component_count) { struct vkd3d_shader_dst_param *dst_param; struct vkd3d_shader_instruction *ins; - if (!bitmap_is_set(sm6->input_regs_declared, reg_type)) + if (!bitmap_is_set(sm6->io_regs_declared, reg_type)) { - bitmap_set(sm6->input_regs_declared, reg_type); - ins = sm6_parser_add_instruction(sm6, VKD3DSIH_DCL_INPUT); + bitmap_set(sm6->io_regs_declared, reg_type); + ins = sm6_parser_add_instruction(sm6, handler_idx); dst_param = &ins->declaration.dst; vsir_register_init(&dst_param->reg, reg_type, data_type, 0); dst_param_init_vector(dst_param, component_count); @@ -4649,7 +4672,7 @@ static void sm6_parser_emit_dx_input_register_mov(struct sm6_parser *sm6, if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) return; - sm6_parser_dcl_register_builtin(sm6, reg_type, data_type, 1); + sm6_parser_dcl_register_builtin(sm6, VKD3DSIH_DCL_INPUT, reg_type, data_type, 1); vsir_register_init(&src_param->reg, reg_type, data_type, 0); src_param_init(src_param); @@ -4813,7 +4836,7 @@ static void sm6_parser_emit_dx_compute_builtin(struct sm6_parser *sm6, enum dx_i vkd3d_unreachable(); } - sm6_parser_dcl_register_builtin(sm6, reg_type, VKD3D_DATA_UINT, component_count); + sm6_parser_dcl_register_builtin(sm6, VKD3DSIH_DCL_INPUT, reg_type, VKD3D_DATA_UINT, component_count); vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) return; @@ -5497,6 +5520,12 @@ static void sm6_parser_emit_dx_store_output(struct sm6_parser *sm6, enum dx_intr if (e->register_count > 1) register_index_address_init(&dst_param->reg.idx[0], operands[1], sm6); + if (e->register_index == UINT_MAX) + { + sm6_parser_dcl_register_builtin(sm6, VKD3DSIH_DCL_OUTPUT, dst_param->reg.type, + dst_param->reg.data_type, vsir_write_mask_component_count(e->mask)); + } + if ((src_param = instruction_src_params_alloc(ins, 1, sm6))) src_param_init_from_value(src_param, value); } @@ -7938,6 +7967,9 @@ static const enum vkd3d_shader_sysval_semantic sysval_semantic_table[] = [SEMANTIC_KIND_POSITION] = VKD3D_SHADER_SV_POSITION, [SEMANTIC_KIND_ISFRONTFACE] = VKD3D_SHADER_SV_IS_FRONT_FACE, [SEMANTIC_KIND_TARGET] = VKD3D_SHADER_SV_TARGET, + [SEMANTIC_KIND_DEPTH] = VKD3D_SHADER_SV_DEPTH, + [SEMANTIC_KIND_DEPTHLESSEQUAL] = VKD3D_SHADER_SV_DEPTH_LESS_EQUAL, + [SEMANTIC_KIND_DEPTHGREATEREQUAL] = VKD3D_SHADER_SV_DEPTH_GREATER_EQUAL, }; static enum vkd3d_shader_sysval_semantic sysval_semantic_from_dxil_semantic_kind(enum dxil_semantic_kind kind, @@ -8735,6 +8767,7 @@ static enum vkd3d_result sm6_parser_read_signature(struct sm6_parser *sm6, const const struct sm6_metadata_node *node, *element_node; struct signature_element *elements, *e; unsigned int values[10]; + bool is_register; if (!m) return VKD3D_OK; @@ -8843,7 +8876,18 @@ static enum vkd3d_result sm6_parser_read_signature(struct sm6_parser *sm6, const column_count = values[7]; e->register_index = values[8]; e->target_location = e->register_index; - if (e->register_index > MAX_REG_OUTPUT || e->register_count > MAX_REG_OUTPUT - e->register_index) + + if ((is_register = e->register_index == UINT_MAX)) + { + if (register_type_from_dxil_semantic_kind(e->sysval_semantic) == VKD3DSPR_INVALID) + { + WARN("Unhandled I/O register semantic kind %u.\n", j); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_SIGNATURE, + "DXIL semantic kind %u is unhandled for an I/O register.", j); + return VKD3D_ERROR_INVALID_SHADER; + } + } + else if (e->register_index > MAX_REG_OUTPUT || e->register_count > MAX_REG_OUTPUT - e->register_index) { WARN("Invalid row start %u with row count %u.\n", e->register_index, e->register_count); vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_SIGNATURE, @@ -8851,8 +8895,9 @@ static enum vkd3d_result sm6_parser_read_signature(struct sm6_parser *sm6, const e->register_index, e->register_count); return VKD3D_ERROR_INVALID_SHADER; } + index = values[9]; - if (index >= VKD3D_VEC4_SIZE || column_count > VKD3D_VEC4_SIZE - index) + if (index != UINT8_MAX && (index >= VKD3D_VEC4_SIZE || column_count > VKD3D_VEC4_SIZE - index)) { WARN("Invalid column start %u with count %u.\n", index, column_count); vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_SIGNATURE, @@ -8862,10 +8907,13 @@ static enum vkd3d_result sm6_parser_read_signature(struct sm6_parser *sm6, const e->mask = vkd3d_write_mask_from_component_count(column_count); e->used_mask = e->mask; - e->mask <<= index; - signature_element_read_additional_element_values(e, element_node, sm6); - e->used_mask <<= index; + + if (index != UINT8_MAX) + { + e->mask <<= index; + e->used_mask <<= index; + } m = element_node->operands[4]; if (!sm6_metadata_value_is_node(m)) diff --git a/tests/hlsl/depth-out.shader_test b/tests/hlsl/depth-out.shader_test index fa40e1a1..3a99a0f0 100644 --- a/tests/hlsl/depth-out.shader_test +++ b/tests/hlsl/depth-out.shader_test @@ -16,22 +16,22 @@ float main() : SV_Depth uniform 0 float 0.0 clear dsv 1.0 depth less -todo(sm>=6 | glsl) draw quad +todo(glsl) draw quad probe dsv all r (0.0) uniform 0 float 0.75 clear dsv 1.0 -todo(sm>=6 | glsl) draw quad +todo(glsl) draw quad probe dsv all r (0.75) clear dsv 0.5 depth greater -todo(sm>=6 | glsl) draw quad +todo(glsl) draw quad probe dsv all r (0.75) depth less clear dsv 0.5 -todo(sm>=6 | glsl) draw quad +todo(glsl) draw quad probe dsv all r (0.5) @@ -65,14 +65,14 @@ uniform 0 float4 0.75 0.75 0.0 0.0 clear rtv 0 1.0 1.0 1.0 1.0 clear dsv 0.5 depth greater equal -todo draw quad +todo(sm<6 | glsl) draw quad probe all rgba (0.0, 1.0, 0.0, 1.0) probe dsv all r (0.75) uniform 0 float4 0.75 0.375 0.0 0.0 clear rtv 0 1.0 1.0 1.0 1.0 clear dsv 0.5 -todo draw quad +todo(sm<6 | glsl) draw quad probe all rgba (1.0, 1.0, 1.0, 1.0) probe dsv all r (0.5) @@ -91,20 +91,20 @@ uniform 0 float4 0.75 0.75 0.0 0.0 clear rtv 0 1.0 1.0 1.0 1.0 clear dsv 0.5 depth greater equal -todo draw quad +todo(sm<6 | glsl) draw quad probe all rgba (0.0, 1.0, 0.0, 1.0) probe dsv all r (0.75) uniform 0 float4 0.375 0.625 0.0 0.0 clear rtv 0 1.0 1.0 1.0 1.0 clear dsv 0.5 -todo draw quad +todo(sm<6 | glsl) draw quad probe all rgba (0.0, 1.0, 0.0, 1.0) probe dsv all r (0.625) uniform 0 float4 0.375 0.375 0.0 0.0 clear rtv 0 1.0 1.0 1.0 1.0 clear dsv 0.5 -todo draw quad +todo(sm<6 | glsl) draw quad probe all rgba (1.0, 1.0, 1.0, 1.0) probe dsv all r (0.5)

1 0