From: Eric Anholt <eric@anholt.net>
Date: Mon, 1 Jun 2020 18:40:36 +0000 (-0700)
Subject: freedreno/ir3: Drop unnecessary alignment of pushed UBO size.
X-Git-Tag: upstream/21.0.0~9025
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9e58ab09ffbd18355868000b2da90a5cd73b5c09;p=platform%2Fupstream%2Fmesa.git

freedreno/ir3: Drop unnecessary alignment of pushed UBO size.

The analysis pass gives us vec4-aligned size, and all of our other
constbuf allocations here are in vec4 units, so we can just divide by 16.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5273>
---

diff --git a/src/freedreno/ir3/ir3_nir.c b/src/freedreno/ir3/ir3_nir.c
index 1481860..ac07224 100644
--- a/src/freedreno/ir3/ir3_nir.c
+++ b/src/freedreno/ir3/ir3_nir.c
@@ -477,7 +477,7 @@ ir3_setup_const_state(struct ir3_shader *shader, nir_shader *nir)
 	const_state->num_driver_params = align(const_state->num_driver_params, 4);
 
 	debug_assert((shader->ubo_state.size % 16) == 0);
-	unsigned constoff = align(shader->ubo_state.size / 16, 8);
+	unsigned constoff = shader->ubo_state.size / 16;
 	unsigned ptrsz = ir3_pointer_size(compiler);
 
 	if (const_state->num_ubos > 0) {