wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/fx: Read fx_2_0 assignment data outside of its dumping helper.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov
2025-03-13 22:21:36 +01:00
committed by Henri Verbeet
parent fb5d53bf57
commit 3e86484091
Notes: Henri Verbeet 2025-03-17 15:29:01 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1418
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3723,24 +3723,22 @@ static void fx_parse_fx_2_annotations(struct fx_parser *parser, uint32_t count)
vkd3d_string_buffer_printf(&parser->buffer, ">"); vkd3d_string_buffer_printf(&parser->buffer, ">");
} }
static void fx_parse_fx_2_assignment(struct fx_parser *parser) static void fx_parse_fx_2_assignment(struct fx_parser *parser, const struct fx_assignment *entry)
{ {
const struct rhs_named_value *named_value = NULL; const struct rhs_named_value *named_value = NULL;
const struct fx_2_state *state = NULL; const struct fx_2_state *state = NULL;
struct fx_assignment entry;
fx_parser_read_u32s(parser, &entry, sizeof(entry)); if (entry->id <= ARRAY_SIZE(fx_2_states))
if (entry.id <= ARRAY_SIZE(fx_2_states))
{ {
state = &fx_2_states[entry.id]; state = &fx_2_states[entry->id];
vkd3d_string_buffer_printf(&parser->buffer, "%s", state->name); vkd3d_string_buffer_printf(&parser->buffer, "%s", state->name);
if (state->array_size > 1) if (state->array_size > 1)
vkd3d_string_buffer_printf(&parser->buffer, "[%u]", entry.lhs_index); vkd3d_string_buffer_printf(&parser->buffer, "[%u]", entry->lhs_index);
} }
else else
{ {
vkd3d_string_buffer_printf(&parser->buffer, "<unrecognized state %u>", entry.id); vkd3d_string_buffer_printf(&parser->buffer, "<unrecognized state %u>", entry->id);
} }
vkd3d_string_buffer_printf(&parser->buffer, " = "); vkd3d_string_buffer_printf(&parser->buffer, " = ");
@@ -3749,7 +3747,7 @@ static void fx_parse_fx_2_assignment(struct fx_parser *parser)
const struct rhs_named_value *ptr = state->values; const struct rhs_named_value *ptr = state->values;
uint32_t value; uint32_t value;
fx_parser_read_unstructured(parser, &value, entry.value, sizeof(value)); fx_parser_read_unstructured(parser, &value, entry->value, sizeof(value));
while (ptr->name) while (ptr->name)
{ {
@@ -3768,11 +3766,11 @@ static void fx_parse_fx_2_assignment(struct fx_parser *parser)
} }
else if (state && (state->type == FX_UINT || state->type == FX_FLOAT)) else if (state && (state->type == FX_UINT || state->type == FX_FLOAT))
{ {
uint32_t offset = entry.type; uint32_t offset = entry->type;
unsigned int size; unsigned int size;
size = fx_get_fx_2_type_size(parser, &offset); size = fx_get_fx_2_type_size(parser, &offset);
parse_fx_2_numeric_value(parser, entry.value, size, entry.type); parse_fx_2_numeric_value(parser, entry->value, size, entry->type);
} }
else else
{ {
@@ -3830,8 +3828,11 @@ static void fx_parse_fx_2_technique(struct fx_parser *parser)
parse_fx_start_indent(parser); parse_fx_start_indent(parser);
for (uint32_t j = 0; j < pass.assignment_count; ++j) for (uint32_t j = 0; j < pass.assignment_count; ++j)
{ {
struct fx_assignment entry;
parse_fx_print_indent(parser); parse_fx_print_indent(parser);
fx_parse_fx_2_assignment(parser); fx_parser_read_u32s(parser, &entry, sizeof(entry));
fx_parse_fx_2_assignment(parser, &entry);
} }
parse_fx_end_indent(parser); parse_fx_end_indent(parser);