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 packed size for fx_4+ types.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2024-06-30 23:31:50 +02:00 committed by Henri Verbeet
parent 856686b2a2
commit c97c652ff0
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 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -433,8 +433,8 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co
uint32_t offset; uint32_t offset;
uint32_t type; uint32_t type;
}; };
uint32_t name_offset, offset, total_size, packed_size, stride, numeric_desc;
struct vkd3d_bytecode_buffer *buffer = &fx->unstructured; struct vkd3d_bytecode_buffer *buffer = &fx->unstructured;
uint32_t name_offset, offset, size, stride, numeric_desc;
struct field_offsets *field_offsets = NULL; struct field_offsets *field_offsets = NULL;
struct hlsl_ctx *ctx = fx->ctx; struct hlsl_ctx *ctx = fx->ctx;
uint32_t elements_count = 0; uint32_t elements_count = 0;
@ -507,15 +507,22 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co
return 0; return 0;
} }
size = stride = type->reg_size[HLSL_REGSET_NUMERIC] * sizeof(float); /* Structures can only contain numeric fields, this is validated during variable declaration. */
total_size = stride = type->reg_size[HLSL_REGSET_NUMERIC] * sizeof(float);
packed_size = 0;
if (type->class == HLSL_CLASS_STRUCT || hlsl_is_numeric_type(type))
packed_size = hlsl_type_component_count(type) * sizeof(float);
if (elements_count) if (elements_count)
size *= elements_count; {
total_size *= elements_count;
packed_size *= elements_count;
}
stride = align(stride, 4 * sizeof(float)); stride = align(stride, 4 * sizeof(float));
put_u32_unaligned(buffer, elements_count); put_u32_unaligned(buffer, elements_count);
put_u32_unaligned(buffer, size); /* Total size. */ put_u32_unaligned(buffer, total_size);
put_u32_unaligned(buffer, stride); /* Stride. */ put_u32_unaligned(buffer, stride);
put_u32_unaligned(buffer, size); put_u32_unaligned(buffer, packed_size);
if (type->class == HLSL_CLASS_STRUCT) if (type->class == HLSL_CLASS_STRUCT)
{ {