From 32f4be5dd72faa16c7cd54fc660aa7e2c4aceb08 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sat, 12 Jun 2021 20:46:51 -0400 Subject: [PATCH] agx: Rename agx_pack to agx_pack_binary Conflicts with GenXML. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/asahi/compiler/agx_compile.c | 2 +- src/asahi/compiler/agx_compiler.h | 2 +- src/asahi/compiler/agx_pack.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/asahi/compiler/agx_compile.c b/src/asahi/compiler/agx_compile.c index cbce223f49e..16173e20751 100644 --- a/src/asahi/compiler/agx_compile.c +++ b/src/asahi/compiler/agx_compile.c @@ -1228,7 +1228,7 @@ agx_compile_shader_nir(nir_shader *nir, if (agx_debug & AGX_DBG_SHADERS && !skip_internal) agx_print_shader(ctx, stdout); - agx_pack(ctx, binary); + agx_pack_binary(ctx, binary); if ((agx_debug & AGX_DBG_SHADERDB) && !skip_internal) agx_print_stats(ctx, binary->size, stderr); diff --git a/src/asahi/compiler/agx_compiler.h b/src/asahi/compiler/agx_compiler.h index 909ce2dba20..f8d50780a6b 100644 --- a/src/asahi/compiler/agx_compiler.h +++ b/src/asahi/compiler/agx_compiler.h @@ -589,6 +589,6 @@ void agx_print_shader(agx_context *ctx, FILE *fp); void agx_optimizer(agx_context *ctx); void agx_dce(agx_context *ctx); void agx_ra(agx_context *ctx); -void agx_pack(agx_context *ctx, struct util_dynarray *emission); +void agx_pack_binary(agx_context *ctx, struct util_dynarray *emission); #endif diff --git a/src/asahi/compiler/agx_pack.c b/src/asahi/compiler/agx_pack.c index b15fb97bf56..9407e86b411 100644 --- a/src/asahi/compiler/agx_pack.c +++ b/src/asahi/compiler/agx_pack.c @@ -606,7 +606,7 @@ agx_fixup_branch(struct util_dynarray *emission, struct agx_branch_fixup fix) } void -agx_pack(agx_context *ctx, struct util_dynarray *emission) +agx_pack_binary(agx_context *ctx, struct util_dynarray *emission) { struct util_dynarray fixups; util_dynarray_init(&fixups, ctx);