wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_signature().

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-28 18:59:13 -05:00
committed by Alexandre Julliard
parent dda2c4839d
commit 26caa7136a
1 changed files with 6 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2940,22 +2940,6 @@ struct root_signature_writer_context
size_t chunk_position; size_t chunk_position;
}; };
static bool write_dwords(struct root_signature_writer_context *context,
unsigned int count, DWORD d)
{
unsigned int i;
for (i = 0; i < count; ++i)
put_u32(&context->buffer, d);
return !context->buffer.status;
}
static bool write_dword(struct root_signature_writer_context *context, DWORD d)
{
return write_dwords(context, 1, d);
}
static size_t get_chunk_offset(struct root_signature_writer_context *context) 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;
@@ -3140,22 +3124,12 @@ static int shader_write_root_signature(struct root_signature_writer_context *con
size_t samplers_offset_position; size_t samplers_offset_position;
int ret; int ret;
if (!write_dword(context, desc->version)) put_u32(buffer, desc->version);
goto fail; put_u32(buffer, versioned_root_signature_get_parameter_count(desc));
put_u32(buffer, get_chunk_offset(context) + 4 * sizeof(uint32_t)); /* offset */
if (!write_dword(context, versioned_root_signature_get_parameter_count(desc))) put_u32(buffer, versioned_root_signature_get_static_sampler_count(desc));
goto fail; samplers_offset_position = put_u32(buffer, 0xffffffff);
if (!write_dword(context, get_chunk_offset(context) + 4 * sizeof(DWORD))) /* offset */ put_u32(buffer, versioned_root_signature_get_flags(desc));
goto fail;
if (!write_dword(context, versioned_root_signature_get_static_sampler_count(desc)))
goto fail;
samplers_offset_position = bytecode_get_size(buffer);
if (!write_dword(context, 0xffffffff)) /* offset */
goto fail;
if (!write_dword(context, versioned_root_signature_get_flags(desc)))
goto fail;
if ((ret = shader_write_root_parameters(context, desc)) < 0) if ((ret = shader_write_root_parameters(context, desc)) < 0)
return ret; return ret;
@@ -3163,11 +3137,6 @@ static int shader_write_root_signature(struct root_signature_writer_context *con
set_u32(buffer, samplers_offset_position, get_chunk_offset(context)); set_u32(buffer, samplers_offset_position, get_chunk_offset(context));
shader_write_static_samplers(buffer, desc); shader_write_static_samplers(buffer, desc);
return 0; return 0;
fail:
vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY,
"Out of memory while writing root signature.");
return VKD3D_ERROR_OUT_OF_MEMORY;
} }
static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descriptor_table *descriptor_table, static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descriptor_table *descriptor_table,