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/hlsl: Introduce an allocation helper for vkd3d_realloc() as well.

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Giovanni Mascellani <gmascellani@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-09-20 16:40:11 -05:00 committed by Alexandre Julliard
parent b4e301b2d8
commit 2ebfa91062
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/vkd3d-shader/hlsl.h
View File

@ -559,6 +559,15 @@ static inline void *hlsl_alloc(struct hlsl_ctx *ctx, size_t size)
return ptr; return ptr;
} }
static inline void *hlsl_realloc(struct hlsl_ctx *ctx, void *ptr, size_t size)
{
void *ret = vkd3d_realloc(ptr, size);
if (!ret)
ctx->result = VKD3D_ERROR_OUT_OF_MEMORY;
return ret;
}
static inline char *hlsl_strdup(struct hlsl_ctx *ctx, const char *string) static inline char *hlsl_strdup(struct hlsl_ctx *ctx, const char *string)
{ {
char *ptr = vkd3d_strdup(string); char *ptr = vkd3d_strdup(string);

6
libs/vkd3d-shader/hlsl.y
View File

@ -1997,7 +1997,7 @@ preproc_directive:
ctx->location.line = $1; ctx->location.line = $1;
if (strcmp($2, ctx->location.source_name)) if (strcmp($2, ctx->location.source_name))
new_array = vkd3d_realloc(ctx->source_files, new_array = hlsl_realloc(ctx, ctx->source_files,
sizeof(*ctx->source_files) * (ctx->source_files_count + 1)); sizeof(*ctx->source_files) * (ctx->source_files_count + 1));
if (new_array) if (new_array)
@ -2544,7 +2544,7 @@ arrays:
YYABORT; YYABORT;
} }
if (!(new_array = vkd3d_realloc($$.sizes, ($$.count + 1) * sizeof(*new_array)))) if (!(new_array = hlsl_realloc(ctx, $$.sizes, ($$.count + 1) * sizeof(*new_array))))
{ {
vkd3d_free($$.sizes); vkd3d_free($$.sizes);
YYABORT; YYABORT;
@ -2636,7 +2636,7 @@ initializer_expr_list:
| initializer_expr_list ',' initializer_expr | initializer_expr_list ',' initializer_expr
{ {
$$ = $1; $$ = $1;
if (!($$.args = vkd3d_realloc($$.args, ($$.args_count + 1) * sizeof(*$$.args)))) if (!($$.args = hlsl_realloc(ctx, $$.args, ($$.args_count + 1) * sizeof(*$$.args))))
YYABORT; YYABORT;
$$.args[$$.args_count++] = node_from_list($3); $$.args[$$.args_count++] = node_from_list($3);
list_move_tail($$.instrs, $3); list_move_tail($$.instrs, $3);