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: Fix structure type data written for fx_4.

Browse Source 
Strings and field types are written to the same unstructured area
as structure type itself, so it has to be done in two passes.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2024-06-30 23:06:11 +02:00 committed by Henri Verbeet
parent 2176294df8
commit aea36be94c
Notes: Henri Verbeet 2024-07-08 18:55:00 +02:00 
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/918
1 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -426,10 +426,20 @@ static const char * get_fx_4_type_name(const struct hlsl_type *type)
static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_context *fx) static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_context *fx)
{ {
struct field_offsets
{
uint32_t name;
uint32_t semantic;
uint32_t offset;
uint32_t type;
};
struct vkd3d_bytecode_buffer *buffer = &fx->unstructured; struct vkd3d_bytecode_buffer *buffer = &fx->unstructured;
uint32_t name_offset, offset, size, stride, numeric_desc; uint32_t name_offset, offset, size, stride, numeric_desc;
struct field_offsets *field_offsets = NULL;
struct hlsl_ctx *ctx = fx->ctx;
uint32_t elements_count = 0; uint32_t elements_count = 0;
const char *name; const char *name;
size_t i;
/* Resolve arrays to element type and number of elements. */ /* Resolve arrays to element type and number of elements. */
if (type->class == HLSL_CLASS_ARRAY) if (type->class == HLSL_CLASS_ARRAY)
@ -441,6 +451,22 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co
name = get_fx_4_type_name(type); name = get_fx_4_type_name(type);
name_offset = write_string(name, fx); name_offset = write_string(name, fx);
if (type->class == HLSL_CLASS_STRUCT)
{
if (!(field_offsets = hlsl_calloc(ctx, type->e.record.field_count, sizeof(*field_offsets))))
return 0;
for (i = 0; i < type->e.record.field_count; ++i)
{
const struct hlsl_struct_field *field = &type->e.record.fields[i];
field_offsets[i].name = write_string(field->name, fx);
field_offsets[i].semantic = write_string(field->semantic.raw_name, fx);
field_offsets[i].offset = field->reg_offset[HLSL_REGSET_NUMERIC];
field_offsets[i].type = write_type(field->type, fx);
}
}
offset = put_u32_unaligned(buffer, name_offset); offset = put_u32_unaligned(buffer, name_offset);
switch (type->class) switch (type->class)
@ -493,22 +519,15 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co
if (type->class == HLSL_CLASS_STRUCT) if (type->class == HLSL_CLASS_STRUCT)
{ {
size_t i;
put_u32_unaligned(buffer, type->e.record.field_count); put_u32_unaligned(buffer, type->e.record.field_count);
for (i = 0; i < type->e.record.field_count; ++i) for (i = 0; i < type->e.record.field_count; ++i)
{ {
const struct hlsl_struct_field *field = &type->e.record.fields[i]; const struct field_offsets *field = &field_offsets[i];
uint32_t semantic_offset, field_type_offset;
name_offset = write_string(field->name, fx); put_u32_unaligned(buffer, field->name);
semantic_offset = write_string(field->semantic.raw_name, fx); put_u32_unaligned(buffer, field->semantic);
field_type_offset = write_type(field->type, fx); put_u32_unaligned(buffer, field->offset);
put_u32_unaligned(buffer, field->type);
put_u32_unaligned(buffer, name_offset);
put_u32_unaligned(buffer, semantic_offset);
put_u32_unaligned(buffer, field->reg_offset[HLSL_REGSET_NUMERIC]);
put_u32_unaligned(buffer, field_type_offset);
} }
} }
else if (type->class == HLSL_CLASS_TEXTURE) else if (type->class == HLSL_CLASS_TEXTURE)
@ -581,9 +600,9 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co
{ {
FIXME("Type %u is not supported.\n", type->class); FIXME("Type %u is not supported.\n", type->class);
set_status(fx, VKD3D_ERROR_NOT_IMPLEMENTED); set_status(fx, VKD3D_ERROR_NOT_IMPLEMENTED);
return 0;
} }
vkd3d_free(field_offsets);
return offset; return offset;
} }