wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit b5c067b41a.

The commit causes regressions in other shaders because unused elements
do not have an interpolation mode.
This commit is contained in:
Conor McCarthy 2024-01-04 11:23:16 +10:00 committed by Alexandre Julliard
parent efe800f7f0
commit b8280e4210
Notes: Alexandre Julliard 2024-01-18 23:20:00 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/536
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/vkd3d-shader/ir.c
View File

@ -865,9 +865,8 @@ static bool shader_signature_merge(struct shader_signature *s, uint8_t range_map
f = &elements[j]; f = &elements[j];
/* Merge different components of the same register unless sysvals are different, /* 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 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) || range_map_get_register_count(range_map, f->register_index, f->mask) > 1)
break; break;