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

nir,agx: Allow nir_precomp_print_blob to print a static array

Browse Source 
This makes it stop leaking shader binary blobs definition and is
required for panfrost clc.

Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Eric R. Smith <eric.smith@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32939>
This commit is contained in:
Mary Guillemard
2024-12-10 12:32:41 +01:00
committed by Marge Bot
parent 5f8addfd99
commit ecdccae990
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/asahi/clc/asahi_clc.c
View File

@@ -189,7 +189,7 @@ print_shader(FILE *fp, const char *name, const char *suffix, uint32_t variant,
memcpy(mem, &info, sizeof(info));
memcpy((uint8_t *)mem + sizeof(info), p->binary, p->info.binary_size);
nir_precomp_print_blob(fp, name, suffix, variant, mem, sz_B);
nir_precomp_print_blob(fp, name, suffix, variant, mem, sz_B, true);
free(mem);
}

6
src/compiler/nir/nir_precompiled.h
View File

@@ -617,9 +617,9 @@ nir_precompiled_build_variant(const nir_function *libfunc, unsigned variant,
static inline void
nir_precomp_print_blob(FILE *fp, const char *arr_name, const char *suffix,
uint32_t variant, const uint32_t *data, size_t len)
uint32_t variant, const uint32_t *data, size_t len, bool is_static)
{
fprintf(fp, "const uint32_t %s_%u_%s[%zu] = {", arr_name, variant, suffix,
fprintf(fp, "%sconst uint32_t %s_%u_%s[%zu] = {", is_static ? "static " : "", arr_name, variant, suffix,
DIV_ROUND_UP(len, 4));
for (unsigned i = 0; i < (len / 4); i++) {
if (i % 4 == 0)
@@ -651,7 +651,7 @@ nir_precomp_print_nir(FILE *fp_c, FILE *fp_h, const nir_shader *nir,
nir_serialize(&blob, nir, true /* strip */);
nir_precomp_print_blob(fp_c, name, suffix, 0, (const uint32_t *)blob.data,
blob.size);
blob.size, false);
fprintf(fp_h, "extern const uint32_t %s_0_%s[%zu];\n", name, suffix,
DIV_ROUND_UP(blob.size, 4));