[PATCH 0/3] MR352: vkd3d-shader: Export vkd3d_shader_build_varying_map.

[PATCH 1/3] vkd3d-shader: Export vkd3d_shader_build_varying_map.

[Henri Verbeet]

From: Henri Verbeet

---
 libs/vkd3d-shader/vkd3d_shader.map | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map
index 8a596a804..a64b98e71 100644
--- a/libs/vkd3d-shader/vkd3d_shader.map
+++ b/libs/vkd3d-shader/vkd3d_shader.map
@@ -1,6 +1,7 @@
 VKD3D_1_0
 {
 global:
+    vkd3d_shader_build_varying_map;
     vkd3d_shader_compile;
     vkd3d_shader_convert_root_signature;
     vkd3d_shader_find_signature_element;

[PATCH 2/3] include: Add a corresponding function pointer type for vkd3d_shader_build_varying_map().

[Henri Verbeet]

From: Henri Verbeet

---
 include/vkd3d_shader.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index d329e205f..e7ac3d626 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -2362,6 +2362,10 @@ typedef int (*PFN_vkd3d_shader_parse_dxbc)(const struct vkd3d_shader_code *dxbc,
 typedef int (*PFN_vkd3d_shader_serialize_dxbc)(size_t section_count,
         const struct vkd3d_shader_dxbc_section_desc *sections, struct vkd3d_shader_code *dxbc, char **messages);

+/** Type of vkd3d_shader_build_varying_map(). \since 1.9 */
+typedef void (*PFN_vkd3d_shader_build_varying_map)(const struct vkd3d_shader_signature *output_signature,
+        const struct vkd3d_shader_signature *input_signature,
+        unsigned int *count, struct vkd3d_shader_varying_map *varyings);
 /** Type of vkd3d_shader_free_scan_signature_info(). \since 1.9 */
 typedef void (*PFN_vkd3d_shader_free_scan_signature_info)(struct vkd3d_shader_scan_signature_info *info);

[PATCH 3/3] tests: Add a small test for vkd3d_shader_build_varying_map().

[Henri Verbeet]

From: Henri Verbeet

There's probably room for improvement, but this at least verifies the
function can be called.
---
 tests/vkd3d_shader_api.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c
index af75e0fde..ea53c81d0 100644
--- a/tests/vkd3d_shader_api.c
+++ b/tests/vkd3d_shader_api.c
@@ -823,6 +823,36 @@ static void test_scan_descriptors(void)
     }
 }

+static void test_build_varying_map(void)
+{
+    struct vkd3d_shader_signature_element output_elements[] =
+    {
+        {"position", 0, 0, VKD3D_SHADER_SV_POSITION, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf},
+        {"texcoord", 2, 0, VKD3D_SHADER_SV_NONE,     VKD3D_SHADER_COMPONENT_FLOAT, 1, 0xf, 0xf},
+        {"colour",   0, 0, VKD3D_SHADER_SV_NONE,     VKD3D_SHADER_COMPONENT_FLOAT, 2, 0xf, 0xf},
+    };
+    struct vkd3d_shader_signature_element input_elements[] =
+    {
+        {"colour",   0, 0, VKD3D_SHADER_SV_NONE,     VKD3D_SHADER_COMPONENT_FLOAT, 3, 0xf, 0xf},
+        {"texcoord", 2, 0, VKD3D_SHADER_SV_NONE,     VKD3D_SHADER_COMPONENT_FLOAT, 4, 0x3, 0x3},
+    };
+    struct vkd3d_shader_signature output = {output_elements, ARRAY_SIZE(output_elements)};
+    struct vkd3d_shader_signature input = {input_elements, ARRAY_SIZE(input_elements)};
+    PFN_vkd3d_shader_build_varying_map pfn_vkd3d_shader_build_varying_map;
+    struct vkd3d_shader_varying_map map[ARRAY_SIZE(input_elements)];
+    unsigned int count;
+
+    pfn_vkd3d_shader_build_varying_map = vkd3d_shader_build_varying_map;
+    pfn_vkd3d_shader_build_varying_map(&output, &input, &count, map);
+    ok(count == ARRAY_SIZE(input_elements), "Got count %u.\n", count);
+    ok(map[0].output_signature_index == 2, "Got map[0].output_signature_index %u.\n", map[0].output_signature_index);
+    ok(map[0].input_register_index == 3, "Got map[0].input_register_index %u.\n", map[0].input_register_index);
+    ok(map[0].input_mask == 0xf, "Got map[0].input_mask %#x.\n", map[0].input_mask);
+    ok(map[1].output_signature_index == 1, "Got map[1].output_signature_index %u.\n", map[1].output_signature_index);
+    ok(map[1].input_register_index == 4, "Got map[1].input_register_index %u.\n", map[1].input_register_index);
+    ok(map[1].input_mask == 0x3, "Got map[1].input_mask %#x.\n", map[1].input_mask);
+}
+
 START_TEST(vkd3d_shader_api)
 {
     setlocale(LC_ALL, "");
@@ -834,4 +864,5 @@ START_TEST(vkd3d_shader_api)
     run_test(test_dxbc);
     run_test(test_scan_signatures);
     run_test(test_scan_descriptors);
+    run_test(test_build_varying_map);
 }

[PATCH 0/3] MR352: vkd3d-shader: Export vkd3d_shader_build_varying_map. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.