KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zink: ralloc spirv_shader 

This uses ralloc for spirv_shader and it's data-payload, which seems a
bit neater than having to remember to free twice. We can now also easily
piggy back on more sophisticated ralloc usage as well.

No need to use rzalloc here, as we'll write all memory in the struct,
and the struct isn't used as a hashmap key, so padding shouldn't matter.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8049>
This commit is contained in:
Erik Faye-Lund 2020-12-10 17:51:39 +01:00 committed by Marge Bot
parent 03ccd3c468
commit 008bf6ca61
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
View File

@ -2602,11 +2602,11 @@ nir_to_spirv(struct nir_shader *s, const struct zink_so_info *so_info,
size_t num_words = spirv_builder_get_num_words(&ctx.builder);
ret = CALLOC_STRUCT(spirv_shader);
ret = ralloc(NULL, struct spirv_shader);
if (!ret)
goto fail;
ret->words = MALLOC(sizeof(uint32_t) * num_words);
ret->words = ralloc_size(ret, sizeof(uint32_t) * num_words);
if (!ret->words)
goto fail;

3
src/gallium/drivers/zink/zink_compiler.c
View File

@ -269,8 +269,7 @@ zink_shader_compile(struct zink_screen *screen, struct zink_shader *zs, struct z
ralloc_free(nir);
/* TODO: determine if there's any reason to cache spirv output? */
free(spirv->words);
free(spirv);
ralloc_free(spirv);
return mod;
}