agx: Rename agx_pack to agx_pack_binary

Conflicts with GenXML.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11718>

diff --git a/src/asahi/compiler/agx_compile.c b/src/asahi/compiler/agx_compile.c
index cbce223..16173e2 100644 (file)
--- 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 909ce2d..f8d5078 100644 (file)
--- 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 b15fb97..9407e86 100644 (file)
--- 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);