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: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_signature_header().

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-07-27 16:06:45 -05:00 committed by Alexandre Julliard
parent 4e63842a73
commit 743b1fc090
1 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libs/vkd3d-shader/dxbc.c
View File

@ -2967,43 +2967,23 @@ static size_t get_chunk_offset(struct root_signature_writer_context *context)
return bytecode_get_size(&context->buffer) - context->chunk_position; return bytecode_get_size(&context->buffer) - context->chunk_position;
} }
static int shader_write_root_signature_header(struct root_signature_writer_context *context) static void shader_write_root_signature_header(struct root_signature_writer_context *context)
{ {
struct vkd3d_bytecode_buffer *buffer = &context->buffer; struct vkd3d_bytecode_buffer *buffer = &context->buffer;
unsigned int i;
if (!write_dword(context, TAG_DXBC)) put_u32(buffer, TAG_DXBC);
goto fail;
/* The checksum is computed when all data is generated. */ /* The checksum is computed when all data is generated. */
if (!write_dwords(context, 4, 0x00000000)) for (i = 0; i < 4; ++i)
goto fail; put_u32(buffer, 0);
put_u32(buffer, 1);
if (!write_dword(context, 0x00000001)) context->total_size_position = put_u32(buffer, 0xffffffff);
goto fail; put_u32(buffer, 1); /* chunk count */
put_u32(buffer, bytecode_get_size(buffer) + sizeof(uint32_t)); /* chunk offset */
context->total_size_position = bytecode_get_size(buffer); put_u32(buffer, TAG_RTS0);
if (!write_dword(context, 0xffffffff)) /* total size */ put_u32(buffer, 0xffffffff);
goto fail;
if (!write_dword(context, 1)) /* chunk count */
goto fail;
/* chunk offset */
if (!write_dword(context, bytecode_get_size(buffer) + sizeof(uint32_t)))
goto fail;
if (!write_dword(context, TAG_RTS0))
goto fail;
if (!write_dword(context, 0xffffffff)) /* chunk size */
goto fail;
context->chunk_position = bytecode_get_size(buffer); context->chunk_position = bytecode_get_size(buffer);
return VKD3D_OK;
fail:
vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY,
"Out of memory while writing root signature header.");
return VKD3D_ERROR_OUT_OF_MEMORY;
} }
static int shader_write_descriptor_ranges(struct root_signature_writer_context *context, static int shader_write_descriptor_ranges(struct root_signature_writer_context *context,
@ -3430,11 +3410,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro
goto done; goto done;
memset(dxbc, 0, sizeof(*dxbc)); memset(dxbc, 0, sizeof(*dxbc));
if ((ret = shader_write_root_signature_header(&context)) < 0) shader_write_root_signature_header(&context);
{
vkd3d_free(context.buffer.data);
goto done;
}
if ((ret = shader_write_root_signature(&context, root_signature)) < 0) if ((ret = shader_write_root_signature(&context, root_signature)) < 0)
{ {