OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: ralloc zink program structs

Browse Source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9273>
This commit is contained in:
Mike Blumenkrantz
2020-10-02 13:20:42 -04:00
committed by Marge Bot
parent 747caaa83d
commit 992ddf7e4b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/drivers/zink/zink_program.c
View File

@@ -453,7 +453,7 @@ zink_create_gfx_program(struct zink_context *ctx,
struct zink_shader *stages[ZINK_SHADER_COUNT]) struct zink_shader *stages[ZINK_SHADER_COUNT])
{ {
struct zink_screen *screen = zink_screen(ctx->base.screen); struct zink_screen *screen = zink_screen(ctx->base.screen);
struct zink_gfx_program *prog = CALLOC_STRUCT(zink_gfx_program); struct zink_gfx_program *prog = rzalloc(NULL, struct zink_gfx_program);
if (!prog) if (!prog)
goto fail; goto fail;
@@ -536,7 +536,7 @@ struct zink_compute_program *
zink_create_compute_program(struct zink_context *ctx, struct zink_shader *shader) zink_create_compute_program(struct zink_context *ctx, struct zink_shader *shader)
{ {
struct zink_screen *screen = zink_screen(ctx->base.screen); struct zink_screen *screen = zink_screen(ctx->base.screen);
struct zink_compute_program *comp = CALLOC_STRUCT(zink_compute_program); struct zink_compute_program *comp = rzalloc(NULL, struct zink_compute_program);
if (!comp) if (!comp)
goto fail; goto fail;
@@ -633,7 +633,7 @@ zink_destroy_gfx_program(struct zink_screen *screen,
} }
zink_shader_cache_reference(screen, &prog->shader_cache, NULL); zink_shader_cache_reference(screen, &prog->shader_cache, NULL);
FREE(prog); ralloc_free(prog);
} }
void void
@@ -660,7 +660,7 @@ zink_destroy_compute_program(struct zink_screen *screen,
_mesa_hash_table_destroy(comp->pipelines, NULL); _mesa_hash_table_destroy(comp->pipelines, NULL);
zink_shader_cache_reference(screen, &comp->shader_cache, NULL); zink_shader_cache_reference(screen, &comp->shader_cache, NULL);
FREE(comp); ralloc_free(comp);
} }
static VkPrimitiveTopology static VkPrimitiveTopology