- Wine-Devel - list.winehq.org

[PATCH 1/6] win32u: Move NtUserToUnicodeEx implementation from user32.
by Jacek Caban Nov. 17, 2021

Nov. 17, 2021

3 2

[PATCH v3] kernel32/tests: Add SetCurrentConsoleFontEx tests for the current window size
by Hugh McMaster Nov. 17, 2021

Nov. 17, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- Changes in v3: - Drop font selection loop. - Drop nFont comparisons. dlls/kernel32/tests/console.c | 187 +++++++++++++++++++++++++++++++++- 1 file changed, 185 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 8b5abfa2da9..bf9bf158267 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3554,10 +3554,17 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output) static void test_SetCurrentConsoleFontEx(HANDLE std_output) { - CONSOLE_FONT_INFOEX orig_cfix, cfix; + CONSOLE_FONT_INFOEX orig_cfix, cfix, tmp; BOOL ret; HANDLE pipe1, pipe2; HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); + unsigned int cp, font_family; + const WCHAR *face_name = L"Courier New"; + + font_family = TMPF_VECTOR | TMPF_TRUETYPE | FF_MODERN; + + /* Save current console font information */ + cp = GetConsoleOutputCP(); orig_cfix.cbSize = sizeof(CONSOLE_FONT_INFOEX); @@ -3651,17 +3658,193 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) ok(!ret, "got %d, expected 0\n", ret); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + /* Try setting console font information for the current window size */ + SetConsoleOutputCP(CP_UTF8); + + cfix.cbSize = sizeof(cfix); + cfix.nFont = 0; + cfix.dwFontSize.X = 8; + cfix.dwFontSize.Y = 16; + cfix.FontFamily = font_family; + cfix.FontWeight = FW_NORMAL; + lstrcpyW(cfix.FaceName, face_name); + + tmp.cbSize = sizeof(tmp); + + /* Courier New is available in the console by default from Windows 10 build 1607 */ + SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + + if (lstrcmpW(tmp.FaceName, face_name)) + { + SetConsoleOutputCP(cp); + skip("%s not available. Skipping SetCurrentConsoleFontEx tests.\n", wine_dbgstr_w(face_name)); + return; + } + + /* Test font size 8x16 */ SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 10x20 */ + cfix.dwFontSize.X = 10; + cfix.dwFontSize.Y = 20; SetLastError(0xdeadbeef); - ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 5x12. We pass in 10x12. */ + cfix.dwFontSize.Y = 12; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == 5, "got %u, expected font width of 5\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected font height of 12\n", tmp.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 10x20. Font height is 20. All other metrics are zero. */ + cfix.dwFontSize.X = 0; + cfix.dwFontSize.Y = 20; + cfix.FontFamily = 0; + cfix.FontWeight = 0; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == 10, "got %u, expected font width of 10\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 20, "got %u, expected font height of 20\n", tmp.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == font_family, "got %u, expected %u\n", tmp.FontFamily, font_family); + ok(tmp.FontWeight == FW_NORMAL, "got %u, expected %u\n", tmp.FontWeight, FW_NORMAL); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + + /* Test font size 7x14. We pass in 7x0. */ + cfix = tmp; + cfix.dwFontSize.X = 7; + cfix.dwFontSize.Y = 0; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == 5, "got %u, expected font width of 5\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected font height of 12\n", tmp.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size with width and height set to 0x0. */ + cfix.dwFontSize.X = 0; + cfix.dwFontSize.Y = 0; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == 5, "got %u, expected font width of 5\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected font height of 12\n", tmp.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test with invalid font face name */ + cfix.dwFontSize.X = 8; + cfix.dwFontSize.Y = 16; + lstrcpyW(cfix.FaceName, L"MissingFont"); + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + + /* Test with no font face name */ + cfix.FaceName[0] = 0; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + /* Restore original console font parameters */ + SetConsoleOutputCP(cp); + SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); -- 2.33.1

2 1

[PATCH vkd3d 6/6] vkd3d-shader/spirv: Shift the private variable destination mask instead of the source mask.
by Henri Verbeet Nov. 17, 2021

Nov. 17, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Otherwise if the input is located above position 0 in the private array it will be swizzled incorrectly, e.g. a.yz instead of a.xy in test_domain_shader_inputs(). Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 4 ++-- tests/d3d12.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5a7e561f..b7e7428a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4672,8 +4672,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, val_id, - vkd3d_write_mask_from_component_count(input_component_count) << component_idx, - VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_SHADER_NO_SWIZZLE, dst->write_mask); + vkd3d_write_mask_from_component_count(input_component_count), + VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_SHADER_NO_SWIZZLE, dst->write_mask >> component_idx); vkd3d_dxbc_compiler_emit_store_reg(compiler, &dst_reg, dst->write_mask, val_id); } diff --git a/tests/d3d12.c b/tests/d3d12.c index 670fbf4a..3b0c4242 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29506,7 +29506,6 @@ static void test_domain_shader_inputs(void) {1.0f, 2.0f, 0.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, {1.0f, 2.0f, 1.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, }; - static const unsigned int is_todo[] = {0x00110000, 0x00110000, 0x00110000, 0x00110000}; static const unsigned int stride = sizeof(*reference); memset(&desc, 0, sizeof(desc)); @@ -29556,9 +29555,8 @@ static void test_domain_shader_inputs(void) const float *elems = get_readback_data(&rb, y, 0, 0, stride); for (x = 0; x < ARRAY_SIZE(*reference); ++x) { - todo_if(is_todo[y] & (1u << (x * 4))) - ok(compare_float(reference[y][x], elems[x], 0), - "Got unexpected value %.8e for [%u][%u], expected %.8e.\n", elems[x], y, x, reference[y][x]); + ok(compare_float(reference[y][x], elems[x], 0), + "Got unexpected value %.8e for [%u][%u], expected %.8e.\n", elems[x], y, x, reference[y][x]); } } release_resource_readback(&rb); -- 2.20.1

1 0

[PATCH vkd3d 5/6] vkd3d-shader/spirv: Fix the outer tessellation level indices for isoline tessellation.
by Henri Verbeet Nov. 17, 2021

Nov. 17, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> For isoline tessellation, "density" is specified by OL0, and "detail" by OL1. Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 4 ++-- tests/d3d12.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e1a7dd37..5a7e561f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4084,8 +4084,8 @@ vkd3d_system_value_builtins[] = {VKD3D_SIV_TRIANGLE_W_TESS_FACTOR, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 2}}, {VKD3D_SIV_TRIANGLE_INNER_TESS_FACTOR, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInTessLevelInner, NULL, 2, 0}}, - {VKD3D_SIV_LINE_DETAIL_TESS_FACTOR, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 0}}, - {VKD3D_SIV_LINE_DENSITY_TESS_FACTOR, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 1}}, + {VKD3D_SIV_LINE_DENSITY_TESS_FACTOR, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 0}}, + {VKD3D_SIV_LINE_DETAIL_TESS_FACTOR, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 1}}, }; static const struct vkd3d_spirv_builtin vkd3d_pixel_shader_position_builtin = { diff --git a/tests/d3d12.c b/tests/d3d12.c index f5a1723a..670fbf4a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29506,7 +29506,7 @@ static void test_domain_shader_inputs(void) {1.0f, 2.0f, 0.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, {1.0f, 2.0f, 1.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, }; - static const unsigned int is_todo[] = {0x00110000, 0x00110100, 0x00111100, 0x00111000}; + static const unsigned int is_todo[] = {0x00110000, 0x00110000, 0x00110000, 0x00110000}; static const unsigned int stride = sizeof(*reference); memset(&desc, 0, sizeof(desc)); -- 2.20.1

1 0

[PATCH vkd3d 4/6] tests: Add tests for a domain shader using a single patch constant input value.
by Henri Verbeet Nov. 17, 2021

Nov. 17, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> This specifically tests the case where "count" would end up being one for arrayed builtins in needs_private_io_variable(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- tests/d3d12.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9b0a91f7..f5a1723a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29567,6 +29567,180 @@ static void test_domain_shader_inputs(void) destroy_test_context(&context); } +static void test_domain_shader_one_patch_constant_input(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; + D3D12_INPUT_LAYOUT_DESC input_layout; + struct test_context_desc desc; + struct resource_readback rb; + struct test_context context; + ID3D12Resource *so_buffer; + ID3D12CommandQueue *queue; + unsigned int x, y; + HRESULT hr; + +#if 0 + struct data + { + float4 position : SV_Position; + }; + + data vs_main() + { + data d; + d.position = float4(1.0f, 2.0f, 3.0f, 4.0f); + return d; + } + + struct patch_constant_data + { + float tess_factor[2] : SV_TessFactor; + }; + + void patch_constant(OutputPatch<data, 1> control_points, + uint prim_id : SV_PrimitiveID, + out patch_constant_data output) + { + output.tess_factor[0] = 2.0f; + output.tess_factor[1] = 1.0f; + } + + [domain("isoline")] + [outputcontrolpoints(1)] + [partitioning("integer")] + [outputtopology("line")] + [patchconstantfunc("patch_constant")] + data hs_main(InputPatch<data, 1> input) + { + return input[0]; + } + + [domain("isoline")] + void ds_main(float tess_factor[2] : SV_TessFactor, + const OutputPatch<data, 1> patch, + out float4 position : SV_Position) + { + position = float4(patch[0].position.xyz, tess_factor[1]); + } +#endif + static const DWORD vs_code[] = + { + 0x43425844, 0xcb24c840, 0x8a22891b, 0xcf0dbe1d, 0x7b0a4fdb, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x58454853, 0x00000040, 0x00010050, 0x00000010, + 0x0100086a, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x3f800000, 0x40000000, 0x40400000, 0x40800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD hs_code[] = + { + 0x43425844, 0x36132cb6, 0x45a8f125, 0x2ff97810, 0xf60e439e, 0x00000001, 0x000001f4, 0x00000004, + 0x00000030, 0x00000064, 0x00000098, 0x000000e8, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x47534350, 0x00000048, + 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000010, 0x00000003, 0x00000000, 0x00000e01, + 0x00000038, 0x00000001, 0x0000000f, 0x00000003, 0x00000001, 0x00000e01, 0x545f5653, 0x46737365, + 0x6f746361, 0xabab0072, 0x58454853, 0x00000104, 0x00030050, 0x00000041, 0x01000071, 0x01000893, + 0x01000894, 0x01000895, 0x01000896, 0x01001097, 0x0100086a, 0x00001835, 0x0000000a, 0x40000000, + 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 0x01000072, + 0x0400005f, 0x002010f2, 0x00000001, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x06000036, + 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x02000099, + 0x00000002, 0x0200005f, 0x00017000, 0x04000067, 0x00102012, 0x00000000, 0x00000016, 0x04000067, + 0x00102012, 0x00000001, 0x00000015, 0x02000068, 0x00000001, 0x0400005b, 0x00102012, 0x00000000, + 0x00000002, 0x04000036, 0x00100012, 0x00000000, 0x0001700a, 0x07000036, 0x00902012, 0x0010000a, + 0x00000000, 0x0090900a, 0x0010000a, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)}; + static const DWORD ds_code[] = + { + 0x43425844, 0x3ac40533, 0x2aa65785, 0x41df1859, 0xb3b2294b, 0x00000001, 0x00000164, 0x00000004, + 0x00000030, 0x00000064, 0x000000b4, 0x000000e8, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000070f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x47534350, 0x00000048, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000010, + 0x00000003, 0x00000000, 0x00000001, 0x00000038, 0x00000001, 0x0000000f, 0x00000003, 0x00000001, + 0x00000101, 0x545f5653, 0x46737365, 0x6f746361, 0xabab0072, 0x4e47534f, 0x0000002c, 0x00000001, + 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, + 0x7469736f, 0x006e6f69, 0x58454853, 0x00000074, 0x00040050, 0x0000001d, 0x01000893, 0x01000895, + 0x0100086a, 0x04000061, 0x0011b012, 0x00000001, 0x00000015, 0x0400005f, 0x00219072, 0x00000001, + 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x06000036, 0x00102072, 0x00000000, + 0x00219246, 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x0011b00a, 0x00000001, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; + static const D3D12_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "SV_POSITION", 0, 0, 4, 0}, + }; + static const float reference[][4] = + { + {1.0f, 2.0f, 3.0f, 1.0f}, + {1.0f, 2.0f, 3.0f, 1.0f}, + {1.0f, 2.0f, 3.0f, 1.0f}, + {1.0f, 2.0f, 3.0f, 1.0f}, + }; + static const unsigned int stride = sizeof(*reference); + + memset(&desc, 0, sizeof(desc)); + desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT + | D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + memset(&input_layout, 0, sizeof(input_layout)); + + init_pipeline_state_desc(&pso_desc, context.root_signature, DXGI_FORMAT_UNKNOWN, &vs, NULL, &input_layout); + pso_desc.HS = hs; + pso_desc.DS = ds; + memset(&pso_desc.PS, 0, sizeof(pso_desc.PS)); + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH; + pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration); + pso_desc.StreamOutput.pSODeclaration = so_declaration; + pso_desc.StreamOutput.pBufferStrides = &stride; + pso_desc.StreamOutput.NumStrides = 1; + pso_desc.StreamOutput.RasterizedStream = D3D12_SO_NO_RASTERIZED_STREAM; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + so_buffer = create_default_buffer(context.device, 1024, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); + sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); + sobv.SizeInBytes = 1024; + sobv.BufferFilledSizeLocation = sobv.BufferLocation + sobv.SizeInBytes; + + ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + for (y = 0; y < ARRAY_SIZE(reference); ++y) + { + const float *elems = get_readback_data(&rb, y, 0, 0, stride); + for (x = 0; x < ARRAY_SIZE(*reference); ++x) + { + ok(compare_float(reference[y][x], elems[x], 0), + "Got unexpected value %.8e for [%u][%u], expected %.8e.\n", elems[x], y, x, reference[y][x]); + } + } + release_resource_readback(&rb); + + ID3D12Resource_Release(so_buffer); + destroy_test_context(&context); +} + static void test_render_a8(void) { static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -35970,6 +36144,7 @@ START_TEST(d3d12) run_test(test_line_tessellation); run_test(test_tessellation_primitive_id); run_test(test_domain_shader_inputs); + run_test(test_domain_shader_one_patch_constant_input); run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance); -- 2.20.1

1 0

[PATCH vkd3d 3/6] tests: Add tests for domain shader patch constant inputs.
by Henri Verbeet Nov. 17, 2021

Nov. 17, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- tests/d3d12.c | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 208 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 8071faf0..9b0a91f7 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29360,6 +29360,213 @@ static void test_tessellation_primitive_id(void) destroy_test_context(&context); } +static void test_domain_shader_inputs(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; + D3D12_INPUT_LAYOUT_DESC input_layout; + struct test_context_desc desc; + struct resource_readback rb; + struct test_context context; + ID3D12Resource *so_buffer; + ID3D12CommandQueue *queue; + unsigned int x, y; + HRESULT hr; + +#if 0 + struct data + { + float4 position : SV_Position; + }; + + data vs_main() + { + data d; + d.position = float4(1.0f, 2.0f, 3.0f, 4.0f); + return d; + } + + struct patch_constant_data + { + float tess_factor[2] : SV_TessFactor; + float3 a : A; + float3 b : B; + }; + + void patch_constant(OutputPatch<data, 1> control_points, + uint prim_id : SV_PrimitiveID, + out patch_constant_data output) + { + output.tess_factor[0] = 2.0f; + output.tess_factor[1] = 1.0f; + output.a = float3(2.0f, 4.0f, 10.0f); + output.b = float3(3.0f, 3.0f, 12.0f); + } + + [domain("isoline")] + [outputcontrolpoints(1)] + [partitioning("integer")] + [outputtopology("line")] + [patchconstantfunc("patch_constant")] + data hs_main(InputPatch<data, 1> input) + { + return input[0]; + } + + [domain("isoline")] + void ds_main(float tess_factor[2] : SV_TessFactor, + float2 tess_coord : SV_DomainLocation, + float3 a : A, + float3 b : B, + const OutputPatch<data, 1> patch, + out float4 position : SV_Position, + out float4 out_color : COLOR) + { + position = float4(patch[0].position.xy, tess_coord); + out_color = float4(0.5f * (a.xy + b.yz), tess_factor[0], tess_factor[1]); + } +#endif + static const DWORD vs_code[] = + { + 0x43425844, 0xcb24c840, 0x8a22891b, 0xcf0dbe1d, 0x7b0a4fdb, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x58454853, 0x00000040, 0x00010050, 0x00000010, + 0x0100086a, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x3f800000, 0x40000000, 0x40400000, 0x40800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD hs_code[] = + { + 0x43425844, 0x67db9c59, 0xff2c4d5e, 0xc2a4d15b, 0x0f71495f, 0x00000001, 0x00000384, 0x00000004, + 0x00000030, 0x00000064, 0x00000098, 0x0000011c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x47534350, 0x0000007c, + 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x00000010, 0x00000003, 0x00000000, 0x00000e01, + 0x00000076, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000010e, 0x00000068, 0x00000001, + 0x0000000f, 0x00000003, 0x00000001, 0x00000e01, 0x00000078, 0x00000000, 0x00000000, 0x00000003, + 0x00000001, 0x0000010e, 0x545f5653, 0x46737365, 0x6f746361, 0x00410072, 0xabab0042, 0x58454853, + 0x00000260, 0x00030050, 0x00000098, 0x01000071, 0x01000893, 0x01000894, 0x01000895, 0x01000896, + 0x01001097, 0x0100086a, 0x00001835, 0x0000000a, 0x41200000, 0x40800000, 0x40000000, 0x40000000, + 0x41400000, 0x40400000, 0x40400000, 0x3f800000, 0x01000072, 0x0400005f, 0x002010f2, 0x00000001, + 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, + 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x02000099, 0x00000002, 0x0200005f, 0x00017000, + 0x04000067, 0x00102012, 0x00000000, 0x00000016, 0x04000067, 0x00102012, 0x00000001, 0x00000015, + 0x02000068, 0x00000001, 0x0400005b, 0x00102012, 0x00000000, 0x00000002, 0x04000036, 0x00100012, + 0x00000000, 0x0001700a, 0x07000036, 0x00902012, 0x0010000a, 0x00000000, 0x0090903a, 0x0010000a, + 0x00000000, 0x0100003e, 0x01000073, 0x02000099, 0x00000002, 0x0200005f, 0x00017000, 0x03000065, + 0x00102022, 0x00000000, 0x03000065, 0x00102022, 0x00000001, 0x02000068, 0x00000001, 0x0400005b, + 0x00102022, 0x00000000, 0x00000002, 0x04000036, 0x00100012, 0x00000000, 0x0001700a, 0x07000036, + 0x00902022, 0x0010000a, 0x00000000, 0x0090902a, 0x0010000a, 0x00000000, 0x0100003e, 0x01000073, + 0x02000099, 0x00000002, 0x0200005f, 0x00017000, 0x03000065, 0x00102042, 0x00000000, 0x03000065, + 0x00102042, 0x00000001, 0x02000068, 0x00000001, 0x0400005b, 0x00102042, 0x00000000, 0x00000002, + 0x04000036, 0x00100012, 0x00000000, 0x0001700a, 0x07000036, 0x00902042, 0x0010000a, 0x00000000, + 0x0090901a, 0x0010000a, 0x00000000, 0x0100003e, 0x01000073, 0x02000099, 0x00000002, 0x0200005f, + 0x00017000, 0x03000065, 0x00102082, 0x00000000, 0x03000065, 0x00102082, 0x00000001, 0x02000068, + 0x00000001, 0x0400005b, 0x00102082, 0x00000000, 0x00000002, 0x04000036, 0x00100012, 0x00000000, + 0x0001700a, 0x07000036, 0x00902082, 0x0010000a, 0x00000000, 0x0090900a, 0x0010000a, 0x00000000, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)}; + static const DWORD ds_code[] = + { + 0x43425844, 0xef67f8be, 0x1be137b6, 0x0e4a6b01, 0xf0cd92d8, 0x00000001, 0x00000264, 0x00000004, + 0x00000030, 0x00000064, 0x000000e8, 0x0000013c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x47534350, 0x0000007c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x00000010, + 0x00000003, 0x00000000, 0x00000101, 0x00000076, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000060e, 0x00000068, 0x00000001, 0x0000000f, 0x00000003, 0x00000001, 0x00000101, 0x00000078, + 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000c0e, 0x545f5653, 0x46737365, 0x6f746361, + 0x00410072, 0xabab0042, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, + 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, + 0x00000001, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, 0x58454853, + 0x00000120, 0x00040050, 0x00000048, 0x01000893, 0x01000895, 0x0100086a, 0x04000061, 0x0011b012, + 0x00000000, 0x00000016, 0x0300005f, 0x0011b062, 0x00000000, 0x04000061, 0x0011b012, 0x00000001, + 0x00000015, 0x0300005f, 0x0011b0c2, 0x00000001, 0x0200005f, 0x0001c032, 0x0400005f, 0x00219032, + 0x00000001, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000001, 0x02000068, 0x00000001, 0x06000036, 0x00102032, 0x00000000, 0x00219046, 0x00000000, + 0x00000000, 0x04000036, 0x001020c2, 0x00000000, 0x0001c406, 0x07000000, 0x00100032, 0x00000000, + 0x0011b596, 0x00000000, 0x0011bae6, 0x00000001, 0x0a000038, 0x00102032, 0x00000001, 0x00100046, + 0x00000000, 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, 0x00000000, 0x05000036, 0x00102042, + 0x00000001, 0x0011b00a, 0x00000000, 0x05000036, 0x00102082, 0x00000001, 0x0011b00a, 0x00000001, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; + static const D3D12_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "SV_POSITION", 0, 0, 4, 0}, + {0, "COLOR", 0, 0, 4, 0}, + }; + static const float reference[][8] = + { + {1.0f, 2.0f, 0.0f, 0.0f, 2.5f, 8.0f, 2.0f, 1.0f}, + {1.0f, 2.0f, 1.0f, 0.0f, 2.5f, 8.0f, 2.0f, 1.0f}, + {1.0f, 2.0f, 0.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, + {1.0f, 2.0f, 1.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, + }; + static const unsigned int is_todo[] = {0x00110000, 0x00110100, 0x00111100, 0x00111000}; + static const unsigned int stride = sizeof(*reference); + + memset(&desc, 0, sizeof(desc)); + desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT + | D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + memset(&input_layout, 0, sizeof(input_layout)); + + init_pipeline_state_desc(&pso_desc, context.root_signature, DXGI_FORMAT_UNKNOWN, &vs, NULL, &input_layout); + pso_desc.HS = hs; + pso_desc.DS = ds; + memset(&pso_desc.PS, 0, sizeof(pso_desc.PS)); + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH; + pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration); + pso_desc.StreamOutput.pSODeclaration = so_declaration; + pso_desc.StreamOutput.pBufferStrides = &stride; + pso_desc.StreamOutput.NumStrides = 1; + pso_desc.StreamOutput.RasterizedStream = D3D12_SO_NO_RASTERIZED_STREAM; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + so_buffer = create_default_buffer(context.device, 1024, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); + sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); + sobv.SizeInBytes = 1024; + sobv.BufferFilledSizeLocation = sobv.BufferLocation + sobv.SizeInBytes; + + ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + for (y = 0; y < ARRAY_SIZE(reference); ++y) + { + const float *elems = get_readback_data(&rb, y, 0, 0, stride); + for (x = 0; x < ARRAY_SIZE(*reference); ++x) + { + todo_if(is_todo[y] & (1u << (x * 4))) + ok(compare_float(reference[y][x], elems[x], 0), + "Got unexpected value %.8e for [%u][%u], expected %.8e.\n", elems[x], y, x, reference[y][x]); + } + } + release_resource_readback(&rb); + + ID3D12Resource_Release(so_buffer); + destroy_test_context(&context); +} + static void test_render_a8(void) { static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -35762,6 +35969,7 @@ START_TEST(d3d12) run_test(test_hull_shader_fork_phase); run_test(test_line_tessellation); run_test(test_tessellation_primitive_id); + run_test(test_domain_shader_inputs); run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance); -- 2.20.1

1 0

[PATCH vkd3d 2/6] vkd3d-shader/spirv: Handle arrayed builtin inputs.
by Henri Verbeet Nov. 17, 2021

Nov. 17, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Fixes invalid SPIR-V being generated in Monster Hunter: World. Based on vkd3d-proton patches by Hans-Kristian Arntzen and Philip Rebohle. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This is triggered by the tests in patch 3/6 and 4/6 in this series. libs/vkd3d-shader/spirv.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8827c431..e1a7dd37 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4416,6 +4416,13 @@ static bool needs_private_io_variable(const struct vkd3d_shader_signature *signa bool have_sysval = false; unsigned int i, count; + /* Always use private variables for arrayed builtins. These are generally + * scalars on the D3D side, so would need extra array indices when + * accessing them. It may be feasible to insert those indices at the point + * where the builtins are used, but it's not clear it's worth the effort. */ + if (builtin && (builtin->spirv_array_size || builtin->fixup_pfn)) + return true; + if (*component_count == VKD3D_VEC4_SIZE) return false; @@ -4519,8 +4526,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi component_idx = vkd3d_write_mask_get_component_idx(signature_element->mask); } - if (!(use_private_var = builtin && builtin->fixup_pfn) - && needs_private_io_variable(shader_signature, reg_idx, builtin, &input_component_count, &write_mask) + if (needs_private_io_variable(shader_signature, reg_idx, builtin, &input_component_count, &write_mask) && (compiler->shader_type != VKD3D_SHADER_TYPE_HULL || (reg->type != VKD3DSPR_INCONTROLPOINT && reg->type != VKD3DSPR_PATCHCONST))) use_private_var = true; @@ -4644,6 +4650,16 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi val_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, ptr_type_id, input_id, index); dst_reg.idx[0].offset = i; } + else if (builtin && builtin->spirv_array_size) + { + /* The D3D builtin is not an array, but the SPIR-V builtin is, + * so we'll need to index into the SPIR-V builtin when loading + * it. This happens when reading TessLevel in domain shaders. */ + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassInput, type_id); + index = vkd3d_dxbc_compiler_get_constant_uint(compiler, builtin->member_idx); + val_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, ptr_type_id, input_id, index); + dst_reg.idx[0].offset = reg_idx + i; + } val_id = vkd3d_spirv_build_op_load(builder, type_id, val_id, SpvMemoryAccessMaskNone); if (builtin && builtin->fixup_pfn) @@ -4947,11 +4963,11 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler const struct vkd3d_spirv_builtin *builtin; const struct vkd3d_shader_phase *phase; struct vkd3d_symbol *symbol = NULL; + bool use_private_variable = false; struct vkd3d_symbol reg_symbol; SpvStorageClass storage_class; struct rb_entry *entry = NULL; unsigned int signature_idx; - bool use_private_variable; unsigned int write_mask; unsigned int array_size; bool is_patch_constant; @@ -4991,11 +5007,10 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler storage_class = SpvStorageClassOutput; - if (!(use_private_variable = builtin && builtin->spirv_array_size) - && (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_SHADER_NO_SWIZZLE + if (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_SHADER_NO_SWIZZLE || needs_private_io_variable(shader_signature, signature_element->register_index, builtin, &output_component_count, &write_mask) - || is_patch_constant)) + || is_patch_constant) use_private_variable = true; else component_idx = vkd3d_write_mask_get_component_idx(write_mask); -- 2.20.1

1 0

[PATCH vkd3d 1/6] vkd3d-shader/spirv: Apply 'Patch' decorations to builtin patch constant inputs.
by Henri Verbeet Nov. 17, 2021

Nov. 17, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Prevents a crash in radv when such inputs are present. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This is triggered by the tests in patch 3/6 and 4/6 in this series. libs/vkd3d-shader/spirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 698c3054..8827c431 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4582,6 +4582,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi if (builtin) { input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, storage_class, array_size); + if (reg->type == VKD3DSPR_PATCHCONST) + vkd3d_spirv_build_op_decorate(builder, input_id, SpvDecorationPatch, NULL, 0); } else { -- 2.20.1

1 0

[PATCH v2 01/10] Revert "makefiles: Use static importlibs on all platforms."
by Rémi Bernon Nov. 17, 2021

Nov. 17, 2021

This reverts commit a9b5bb326a1514e2c4185633ab34b22c9bbc9863. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Add a win32u fix for a random explorer.exe crash on startup, although maybe unrelated to the issues seen before. Fix call to CancelIoEx / GetOverlappedResult which didn't previously wait on Wine, causing 32bit segmentation fault after the result was later overwritten on the stack. PATCH 1 is still only there for the tests to run. tools/makedep.c | 78 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 25 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9ea46aed8d8..d5412eccfa4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2189,10 +2189,19 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra for (j = 0; j < subdirs.count; j++) { if (submakes[j]->importlib && !strcmp( submakes[j]->importlib, name )) - lib = obj_dir_path( submakes[j], strmake( "lib%s.a", name )); - else - lib = get_static_lib( submakes[j], name ); - if (lib) break; + { + if (is_cross || !*dll_ext || submakes[j]->staticimplib) + lib = obj_dir_path( submakes[j], strmake( "lib%s.a", name )); + else + { + strarray_add_uniq( deps, strmake( "%s/lib%s.def", submakes[j]->obj_dir, name )); + if (needs_implib_symlink( submakes[j] )) + strarray_add_uniq( deps, strmake( "dlls/lib%s.def", name )); + } + break; + } + + if ((lib = get_static_lib( submakes[j], name ))) break; } if (lib) @@ -2579,8 +2588,12 @@ static void output_uninstall_rules( struct makefile *make ) static struct strarray output_importlib_symlinks( const struct makefile *make ) { struct strarray ret = empty_strarray; - const char *lib, *dst, *ext[2] = { "a", "cross.a" }; - int i, count = 1 + !!crosstarget; + const char *lib, *dst, *ext[4]; + int i, count = 0; + + ext[count++] = (*dll_ext && !make->implib_objs.count) ? "def" : "a"; + if (crosstarget) ext[count++] = "cross.a"; + if (needs_delay_lib( make )) ext[count++] = "delay.a"; for (i = 0; i < count; i++) { @@ -3307,27 +3320,42 @@ static void output_module( struct makefile *make ) if (spec_file && make->importlib) { char *importlib_path = obj_dir_path( make, strmake( "lib%s", make->importlib )); - - strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib )); - if (!*dll_ext && needs_delay_lib( make )) + if (*dll_ext && !make->implib_objs.count) { - strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); - output( "%s.delay.a ", importlib_path ); + strarray_add( &make->clean_files, strmake( "lib%s.def", make->importlib )); + output( "%s.def: %s %s\n", importlib_path, tools_path( make, "winebuild" ), spec_file ); + output( "\t%s%s -w --def -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); + output_filenames( target_flags ); + if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); + output( "\n" ); + add_install_rule( make, make->importlib, + strmake( "lib%s.def", make->importlib ), + strmake( "d%s/lib%s.def", so_dir, make->importlib )); + } + else + { + strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib )); + if (!*dll_ext && needs_delay_lib( make )) + { + strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); + output( "%s.delay.a ", importlib_path ); + } + output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); + output_filenames_obj_dir( make, make->implib_objs ); + output( "\n" ); + output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); + output_filenames( target_flags ); + if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); + output_filenames_obj_dir( make, make->implib_objs ); + output( "\n" ); + add_install_rule( make, make->importlib, + strmake( "lib%s.a", make->importlib ), + strmake( "d%s/lib%s.a", so_dir, make->importlib )); } - output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); - output_filenames_obj_dir( make, make->implib_objs ); - output( "\n" ); - output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); - output_filenames( target_flags ); - if (make->is_win16) output_filename( "-m16" ); - output_filename( "--export" ); - output_filename( spec_file ); - output_filenames_obj_dir( make, make->implib_objs ); - output( "\n" ); - add_install_rule( make, make->importlib, - strmake( "lib%s.a", make->importlib ), - strmake( "d%s/lib%s.a", so_dir, make->importlib )); - if (crosstarget) { struct strarray cross_files = strarray_replace_extension( &make->implib_objs, ".o", ".cross.o" ); -- 2.33.1

1 10

[PATCH v2 3/3] msdasql: Implement IGetDataSource GetDataSource
by Alistair Leslie-Hughes Nov. 17, 2021

Nov. 17, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 2 +- dlls/msdasql/msdasql_private.h | 2 +- dlls/msdasql/session.c | 15 ++++++++++++--- dlls/msdasql/tests/provider.c | 7 ++++++- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index e98945b9777..bc208a74cc5 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -559,7 +559,7 @@ static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *ou if (outer) FIXME("outer currently not supported.\n"); - hr = create_db_session(riid, (void**)session); + hr = create_db_session(riid, &provider->MSDASQL_iface, (void**)session); return hr; } diff --git a/dlls/msdasql/msdasql_private.h b/dlls/msdasql/msdasql_private.h index a3d73498fe9..7d7f67c2c78 100644 --- a/dlls/msdasql/msdasql_private.h +++ b/dlls/msdasql/msdasql_private.h @@ -16,4 +16,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT create_db_session(REFIID riid, void **unk) DECLSPEC_HIDDEN; +HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) DECLSPEC_HIDDEN; diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 44f36f0e591..b4239c59037 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -43,6 +43,8 @@ struct msdasql_session ISessionProperties ISessionProperties_iface; IDBCreateCommand IDBCreateCommand_iface; LONG refs; + + IUnknown *datasource; }; static inline struct msdasql_session *impl_from_IUnknown( IUnknown *iface ) @@ -139,6 +141,8 @@ static ULONG WINAPI session_Release(IUnknown *iface) if (!refs) { TRACE( "destroying %p\n", session ); + + IUnknown_Release(session->datasource); heap_free( session ); } return refs; @@ -173,9 +177,13 @@ ULONG WINAPI datasource_Release(IGetDataSource *iface) HRESULT WINAPI datasource_GetDataSource(IGetDataSource *iface, REFIID riid, IUnknown **datasource) { struct msdasql_session *session = impl_from_IGetDataSource( iface ); - FIXME("%p, %s, %p stub\n", session, debugstr_guid(riid), datasource); - return E_NOTIMPL; + TRACE("%p, %s, %p stub\n", session, debugstr_guid(riid), datasource); + + if (!datasource) + return E_INVALIDARG; + + return IUnknown_QueryInterface(session->datasource, riid, (void**)datasource); } static const IGetDataSourceVtbl datasourceVtbl = @@ -1155,7 +1163,7 @@ static const IDBCreateCommandVtbl createcommandVtbl = createcommand_CreateCommand }; -HRESULT create_db_session(REFIID riid, void **unk) +HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) { struct msdasql_session *session; HRESULT hr; @@ -1169,6 +1177,7 @@ HRESULT create_db_session(REFIID riid, void **unk) session->IOpenRowset_iface.lpVtbl = &openrowsetVtbl; session->ISessionProperties_iface.lpVtbl = &propertiesVtbl; session->IDBCreateCommand_iface.lpVtbl = &createcommandVtbl; + IUnknown_QueryInterface(datasource, &IID_IUnknown, (void**)&session->datasource); session->refs = 1; hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index a0b11194f2b..b520b127d67 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -399,7 +399,7 @@ static void test_command_rowset(IUnknown *cmd) static void test_sessions(void) { - IDBProperties *props; + IDBProperties *props, *dsource = NULL; IDBInitialize *dbinit = NULL; IDataInitialize *datainit; IDBCreateSession *dbsession = NULL; @@ -456,6 +456,11 @@ static void test_sessions(void) hr = IUnknown_QueryInterface(session, &IID_IGetDataSource, (void**)&datasource); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IGetDataSource_GetDataSource(datasource, &IID_IDBProperties, (IUnknown**)&dsource); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dsource == props, "different pointers\n"); + IDBProperties_Release(dsource); IGetDataSource_Release(datasource); hr = IUnknown_QueryInterface(session, &IID_ITransactionJoin, (void**)&join); -- 2.33.0

2 1