wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-09-13 09:16:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/fx: Check destination array index when checking for duplicate state entries.

Browse Source
This commit is contained in:
Nikolay Sivov 2024-08-07 10:57:46 +02:00 committed by Henri Verbeet
parent b23874dad6
commit 1be0d99b76
Notes: Henri Verbeet 2024-08-12 14:30:49 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/989
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libs/vkd3d-shader/fx.c
View File

@ -1429,17 +1429,28 @@ static void write_fx_4_state_assignment(const struct hlsl_ir_var *var, struct hl
set_u32(buffer, rhs_offset, value_offset); set_u32(buffer, rhs_offset, value_offset);
} }
static bool state_block_contains_state(const char *name, unsigned int start, struct hlsl_state_block *block) static bool state_block_contains_state(const struct hlsl_state_block_entry *entry, unsigned int start_index,
struct hlsl_state_block *block)
{ {
unsigned int i; unsigned int i;
for (i = start; i < block->count; ++i) for (i = start_index; i < block->count; ++i)
{ {
if (block->entries[i]->is_function_call) const struct hlsl_state_block_entry *cur = block->entries[i];
if (cur->is_function_call)
continue; continue;
if (!ascii_strcasecmp(block->entries[i]->name, name)) if (ascii_strcasecmp(cur->name, entry->name))
return true; continue;
if (cur->lhs_has_index != entry->lhs_has_index)
continue;
if (cur->lhs_has_index && cur->lhs_index != entry->lhs_index)
continue;
return true;
} }
return false; return false;
@ -1936,7 +1947,7 @@ static void write_fx_4_state_block(struct hlsl_ir_var *var, unsigned int block_i
struct hlsl_state_block_entry *entry = block->entries[i]; struct hlsl_state_block_entry *entry = block->entries[i];
/* Skip if property is reassigned later. This will use the last assignment. */ /* Skip if property is reassigned later. This will use the last assignment. */
if (state_block_contains_state(entry->name, i + 1, block)) if (state_block_contains_state(entry, i + 1, block))
continue; continue;
/* Resolve special constant names and property names. */ /* Resolve special constant names and property names. */