[PATCH 0/1] MR536: vkd3d-shader/ir: Revert "Do not merge signature elements which have different interpolation modes."

[Conor McCarthy (＠cmccarthy)]

This may have a new fix added to it, but right now I need to see the ShadowCI results.

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/536

[PATCH 1/1] vkd3d-shader/ir: Revert "Do not merge signature elements which have different interpolation modes."

[Conor McCarthy]

From: Conor McCarthy <cmccarthy(a)codeweavers.com>

This reverts commit b5c067b41a173e2ab252d5a3588f807c3ade5b2a.

The commit causes regressions in other shaders. We may require a more
complex algorithm.
---
 libs/vkd3d-shader/ir.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c
index d38b3c397..cbe07663d 100644
--- a/libs/vkd3d-shader/ir.c
+++ b/libs/vkd3d-shader/ir.c
@@ -780,9 +780,8 @@ static bool shader_signature_merge(struct shader_signature *s, uint8_t range_map
             f = &elements[j];
 
             /* Merge different components of the same register unless sysvals are different,
-             * interpolation modes are different, or it will be relative-addressed. */
+             * or it will be relative-addressed. */
             if (f->register_index != e->register_index || f->sysval_semantic != e->sysval_semantic
-                    || f->interpolation_mode != e->interpolation_mode
                     || range_map_get_register_count(range_map, f->register_index, f->mask) > 1)
                 break;
 
-- 
GitLab

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/536