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/fx: Implement parsing groups and techniques.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2024-10-19 18:12:52 +02:00 committed by Henri Verbeet
parent ae772d40cf
commit 8a3fe9cd1e
Notes: Henri Verbeet 2024-10-21 18:43:13 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1204
1 changed files with 102 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2854,6 +2854,7 @@ struct fx_parser
struct vkd3d_shader_message_context *message_context; struct vkd3d_shader_message_context *message_context;
struct vkd3d_string_buffer buffer; struct vkd3d_string_buffer buffer;
unsigned int indent; unsigned int indent;
unsigned int version;
struct struct
{ {
const uint8_t *ptr; const uint8_t *ptr;
@ -2862,6 +2863,7 @@ struct fx_parser
} unstructured; } unstructured;
uint32_t buffer_count; uint32_t buffer_count;
uint32_t object_count; uint32_t object_count;
uint32_t group_count;
bool failed; bool failed;
}; };
@ -3085,7 +3087,6 @@ static void fx_parse_fx_4_annotations(struct fx_parser *parser)
vkd3d_string_buffer_printf(&parser->buffer, ">"); vkd3d_string_buffer_printf(&parser->buffer, ">");
} }
static void fx_parse_fx_4_numeric_variables(struct fx_parser *parser, uint32_t count) static void fx_parse_fx_4_numeric_variables(struct fx_parser *parser, uint32_t count)
{ {
struct fx_4_numeric_variable struct fx_4_numeric_variable
@ -3212,6 +3213,97 @@ static void fx_4_parse_objects(struct fx_parser *parser)
} }
} }
static void fx_parse_fx_4_technique(struct fx_parser *parser)
{
struct fx_technique
{
uint32_t name;
uint32_t count;
} technique;
struct fx_pass
{
uint32_t name;
uint32_t count;
} pass;
const char *name;
uint32_t i;
if (parser->failed)
return;
fx_parser_read_u32s(parser, &technique, sizeof(technique));
name = fx_4_get_string(parser, technique.name);
parse_fx_print_indent(parser);
vkd3d_string_buffer_printf(&parser->buffer, "technique%u %s", parser->version, name);
fx_parse_fx_4_annotations(parser);
vkd3d_string_buffer_printf(&parser->buffer, "\n");
parse_fx_print_indent(parser);
vkd3d_string_buffer_printf(&parser->buffer, "{\n");
parse_fx_start_indent(parser);
for (i = 0; i < technique.count; ++i)
{
fx_parser_read_u32s(parser, &pass, sizeof(pass));
name = fx_4_get_string(parser, pass.name);
parse_fx_print_indent(parser);
vkd3d_string_buffer_printf(&parser->buffer, "pass %s", name);
fx_parse_fx_4_annotations(parser);
vkd3d_string_buffer_printf(&parser->buffer, "\n");
parse_fx_print_indent(parser);
vkd3d_string_buffer_printf(&parser->buffer, "{\n");
if (pass.count)
fx_parser_error(parser, VKD3D_SHADER_ERROR_FX_NOT_IMPLEMENTED,
"Parsing pass states is not implemented.\n");
parse_fx_print_indent(parser);
vkd3d_string_buffer_printf(&parser->buffer, "}\n\n");
}
parse_fx_end_indent(parser);
parse_fx_print_indent(parser);
vkd3d_string_buffer_printf(&parser->buffer, "}\n\n");
}
static void fx_parse_groups(struct fx_parser *parser)
{
struct fx_group
{
uint32_t name;
uint32_t count;
} group;
const char *name;
uint32_t i, j;
if (parser->failed)
return;
for (i = 0; i < parser->group_count; ++i)
{
fx_parser_read_u32s(parser, &group, sizeof(group));
name = fx_4_get_string(parser, group.name);
vkd3d_string_buffer_printf(&parser->buffer, "fxgroup %s", name);
fx_parse_fx_4_annotations(parser);
vkd3d_string_buffer_printf(&parser->buffer, "\n{\n");
parse_fx_start_indent(parser);
for (j = 0; j < group.count; ++j)
fx_parse_fx_4_technique(parser);
parse_fx_end_indent(parser);
vkd3d_string_buffer_printf(&parser->buffer, "}\n\n");
}
}
static int fx_4_parse(struct fx_parser *parser) static int fx_4_parse(struct fx_parser *parser)
{ {
struct fx_4_header struct fx_4_header
@ -3236,7 +3328,9 @@ static int fx_4_parse(struct fx_parser *parser)
uint32_t shader_count; uint32_t shader_count;
uint32_t inline_shader_count; uint32_t inline_shader_count;
} header; } header;
uint32_t i;
parser->version = 10;
fx_parser_read_u32s(parser, &header, sizeof(header)); fx_parser_read_u32s(parser, &header, sizeof(header));
parser->buffer_count = header.buffer_count; parser->buffer_count = header.buffer_count;
parser->object_count = header.object_count; parser->object_count = header.object_count;
@ -3255,6 +3349,9 @@ static int fx_4_parse(struct fx_parser *parser)
fx_parse_buffers(parser); fx_parse_buffers(parser);
fx_4_parse_objects(parser); fx_4_parse_objects(parser);
for (i = 0; i < header.technique_count; ++i)
fx_parse_fx_4_technique(parser);
return parser->failed ? - 1 : 0; return parser->failed ? - 1 : 0;
} }
@ -3288,9 +3385,11 @@ static int fx_5_parse(struct fx_parser *parser)
uint32_t class_instance_element_count; uint32_t class_instance_element_count;
} header; } header;
parser->version = 11;
fx_parser_read_u32s(parser, &header, sizeof(header)); fx_parser_read_u32s(parser, &header, sizeof(header));
parser->buffer_count = header.buffer_count; parser->buffer_count = header.buffer_count;
parser->object_count = header.object_count; parser->object_count = header.object_count;
parser->group_count = header.group_count;
if (parser->end - parser->ptr < header.unstructured_size) if (parser->end - parser->ptr < header.unstructured_size)
{ {
@ -3306,6 +3405,8 @@ static int fx_5_parse(struct fx_parser *parser)
fx_parse_buffers(parser); fx_parse_buffers(parser);
fx_4_parse_objects(parser); fx_4_parse_objects(parser);
fx_parse_groups(parser);
return parser->failed ? - 1 : 0; return parser->failed ? - 1 : 0;
} }