wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Don't allocate an initial buffer in vkd3d_string_buffer_init().

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 2020-10-09 01:14:03 -05:00 committed by Alexandre Julliard
parent 05cf9a5404
commit 5fb9bcdd14
4 changed files with 16 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2781,8 +2781,7 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc,
memset(root_signature, 0, sizeof(*root_signature)); memset(root_signature, 0, sizeof(*root_signature));
if (messages) if (messages)
*messages = NULL; *messages = NULL;
if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL)) vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL);
return VKD3D_ERROR;
ret = parse_dxbc(dxbc->code, dxbc->size, &message_context, rts0_handler, root_signature); ret = parse_dxbc(dxbc->code, dxbc->size, &message_context, rts0_handler, root_signature);
vkd3d_shader_message_context_trace_messages(&message_context); vkd3d_shader_message_context_trace_messages(&message_context);
@ -3346,8 +3345,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro
*messages = NULL; *messages = NULL;
memset(&context, 0, sizeof(context)); memset(&context, 0, sizeof(context));
if (!vkd3d_shader_message_context_init(&context.message_context, VKD3D_SHADER_LOG_INFO, NULL)) vkd3d_shader_message_context_init(&context.message_context, VKD3D_SHADER_LOG_INFO, NULL);
return VKD3D_ERROR;
if (root_signature->version != VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0 if (root_signature->version != VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0
&& root_signature->version != VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_1) && root_signature->version != VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_1)

6
libs/vkd3d-shader/trace.c
View File

@ -1579,11 +1579,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code
enum vkd3d_result result = VKD3D_OK; enum vkd3d_result result = VKD3D_OK;
void *code; void *code;
if (!vkd3d_string_buffer_init(&buffer)) vkd3d_string_buffer_init(&buffer);
{
ERR("Failed to initialize string buffer.\n");
return VKD3D_ERROR;
}
shader_sm4_read_header(data, &ptr, &shader_version); shader_sm4_read_header(data, &ptr, &shader_version);
shader_addline(&buffer, "%s_%u_%u\n", shader_addline(&buffer, "%s_%u_%u\n",

35
libs/vkd3d-shader/vkd3d_shader_main.c
View File

@ -23,23 +23,9 @@
VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG");
static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer)
{ {
buffer->buffer[0] = '\0'; memset(buffer, 0, sizeof(*buffer));
buffer->content_size = 0;
}
bool vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer)
{
buffer->buffer_size = 32;
if (!(buffer->buffer = vkd3d_malloc(buffer->buffer_size)))
{
ERR("Failed to allocate shader buffer memory.\n");
return false;
}
vkd3d_string_buffer_clear(buffer);
return true;
} }
void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer)
@ -52,6 +38,7 @@ static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int r
unsigned int new_buffer_size = buffer->buffer_size * 2; unsigned int new_buffer_size = buffer->buffer_size * 2;
char *new_buffer; char *new_buffer;
new_buffer_size = max(new_buffer_size, 32);
while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size) while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size)
new_buffer_size *= 2; new_buffer_size *= 2;
if (!(new_buffer = vkd3d_realloc(buffer->buffer, new_buffer_size))) if (!(new_buffer = vkd3d_realloc(buffer->buffer, new_buffer_size)))
@ -71,6 +58,9 @@ int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *
va_list a; va_list a;
int rc; int rc;
if (!buffer->content_size && !vkd3d_string_buffer_resize(buffer, 32))
return -1;
for (;;) for (;;)
{ {
rem = buffer->buffer_size - buffer->content_size; rem = buffer->buffer_size - buffer->content_size;
@ -118,7 +108,7 @@ static void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer,
} }
} }
bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, void vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context,
enum vkd3d_shader_log_level log_level, const char *source_name) enum vkd3d_shader_log_level log_level, const char *source_name)
{ {
context->log_level = log_level; context->log_level = log_level;
@ -126,7 +116,7 @@ bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *cont
context->line = 0; context->line = 0;
context->column = 0; context->column = 0;
return vkd3d_string_buffer_init(&context->messages); vkd3d_string_buffer_init(&context->messages);
} }
void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context)
@ -845,8 +835,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char
if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0)
return ret; return ret;
if (!vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name)) vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name);
return VKD3D_ERROR_OUT_OF_MEMORY;
ret = scan_dxbc(compile_info, &message_context); ret = scan_dxbc(compile_info, &message_context);
@ -947,8 +936,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info,
if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0)
return ret; return ret;
if (!vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name)) vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name);
return VKD3D_ERROR;
switch (compile_info->source_type) switch (compile_info->source_type)
{ {
@ -1050,8 +1038,7 @@ int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc,
if (messages) if (messages)
*messages = NULL; *messages = NULL;
if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL)) vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL);
return VKD3D_ERROR;
ret = shader_parse_input_signature(dxbc->code, dxbc->size, &message_context, signature); ret = shader_parse_input_signature(dxbc->code, dxbc->size, &message_context, signature);
vkd3d_shader_message_context_trace_messages(&message_context); vkd3d_shader_message_context_trace_messages(&message_context);

4
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@ -836,7 +836,7 @@ struct vkd3d_string_buffer
enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code *out) DECLSPEC_HIDDEN;
void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN;
bool vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN;
int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *format, va_list args) DECLSPEC_HIDDEN; int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *format, va_list args) DECLSPEC_HIDDEN;
struct vkd3d_shader_message_context struct vkd3d_shader_message_context
@ -850,7 +850,7 @@ struct vkd3d_shader_message_context
void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN;
bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context, bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context,
char **out) DECLSPEC_HIDDEN; char **out) DECLSPEC_HIDDEN;
bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, void vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context,
enum vkd3d_shader_log_level log_level, const char *source_name) DECLSPEC_HIDDEN; enum vkd3d_shader_log_level log_level, const char *source_name) DECLSPEC_HIDDEN;
void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context,
const char *function) DECLSPEC_HIDDEN; const char *function) DECLSPEC_HIDDEN;