From a822b7b6cceb4c893ea7fab679bc3b51552d119b Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Sun, 6 Feb 2022 17:38:33 -0500
Subject: [PATCH] agx: Naturally align uniform pushes

Required to pack correctly, e.g if we push a 16-bit value then a 64-bit
value.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14903>
---
 src/asahi/compiler/agx_uniforms.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/asahi/compiler/agx_uniforms.c b/src/asahi/compiler/agx_uniforms.c
index f357b2f86b3..7f7d0255fbc 100644
--- a/src/asahi/compiler/agx_uniforms.c
+++ b/src/asahi/compiler/agx_uniforms.c
@@ -48,6 +48,8 @@ agx_indexed_sysval(agx_context *ctx, enum agx_push_type type,
    /* Otherwise, push */
    assert(ctx->out->push_ranges < AGX_MAX_PUSH_RANGES);
 
+   ctx->push_base = ALIGN_POT(ctx->push_base, agx_size_align_16(size));
+
    unsigned base = ctx->push_base;
    ctx->push_base += length;