From: Conor McCarthy Subject: [PATCH vkd3d 4/5] vkd3d-shader: Fix TessFactor order for isolines. Message-Id: <20210914020039.10807-4-cmccarthy@codeweavers.com> Date: Tue, 14 Sep 2021 12:00:38 +1000 In-Reply-To: <20210914020039.10807-1-cmccarthy@codeweavers.com> References: <20210914020039.10807-1-cmccarthy@codeweavers.com> Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy --- libs/vkd3d-shader/spirv.c | 4 ++-- tests/d3d12.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 005e803d..379746b7 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4064,8 +4064,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 ed85f4a1..3202c10b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29135,9 +29135,9 @@ static void test_tessellation_ds_inputs(void) static const bool is_todo[4][8] = { {false, false, false, false, true, true, false, false}, - {false, false, true, false, true, true, false, false}, - {false, false, true, true, true, true, false, false}, - {false, false, false, true, true, true, false, false}, + {false, false, false, false, true, true, false, false}, + {false, false, false, false, true, true, false, false}, + {false, false, false, false, true, true, false, false}, }; static const unsigned int stride = sizeof(reference[0]); -- 2.32.0