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 modifiers when reusing types.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2024-09-08 04:42:11 +02:00 committed by Henri Verbeet
parent d71966c77e
commit 3b4e0ce8e9
Notes: Henri Verbeet 2024-09-10 21:58:51 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1054
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,7 @@ struct type_entry
struct list entry; struct list entry;
const char *name; const char *name;
uint32_t elements_count; uint32_t elements_count;
uint32_t modifiers;
uint32_t offset; uint32_t offset;
}; };
@ -278,9 +279,9 @@ static void write_fx_4_state_block(struct hlsl_ir_var *var, unsigned int block_i
static uint32_t write_type(const struct hlsl_type *type, struct fx_write_context *fx) static uint32_t write_type(const struct hlsl_type *type, struct fx_write_context *fx)
{ {
unsigned int elements_count, modifiers;
const struct hlsl_type *element_type; const struct hlsl_type *element_type;
struct type_entry *type_entry; struct type_entry *type_entry;
unsigned int elements_count;
const char *name; const char *name;
VKD3D_ASSERT(fx->ctx->profile->major_version >= 4); VKD3D_ASSERT(fx->ctx->profile->major_version >= 4);
@ -297,6 +298,7 @@ static uint32_t write_type(const struct hlsl_type *type, struct fx_write_context
} }
name = get_fx_4_type_name(element_type); name = get_fx_4_type_name(element_type);
modifiers = element_type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK;
LIST_FOR_EACH_ENTRY(type_entry, &fx->types, struct type_entry, entry) LIST_FOR_EACH_ENTRY(type_entry, &fx->types, struct type_entry, entry)
{ {
@ -306,6 +308,9 @@ static uint32_t write_type(const struct hlsl_type *type, struct fx_write_context
if (type_entry->elements_count != elements_count) if (type_entry->elements_count != elements_count)
continue; continue;
if (type_entry->modifiers != modifiers)
continue;
return type_entry->offset; return type_entry->offset;
} }
@ -315,6 +320,7 @@ static uint32_t write_type(const struct hlsl_type *type, struct fx_write_context
type_entry->offset = write_fx_4_type(type, fx); type_entry->offset = write_fx_4_type(type, fx);
type_entry->name = name; type_entry->name = name;
type_entry->elements_count = elements_count; type_entry->elements_count = elements_count;
type_entry->modifiers = modifiers;
list_add_tail(&fx->types, &type_entry->entry); list_add_tail(&fx->types, &type_entry->entry);