Mesa (main): turnip: Fix up per-stage additional size accounting.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 12314067c419321376f0ea6c38bee66071a3e80f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=12314067c419321376f0ea6c38bee66071a3e80f

Author: Emma Anholt <emma at anholt.net>
Date:   Thu Jun 16 16:31:00 2022 -0700

turnip: Fix up per-stage additional size accounting.

input_size is the dwords emitted (hard to tell because of all of the * 4 /
4 going on), and constant_data is emitted with the emit_program call too.

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

---

 src/freedreno/vulkan/tu_pipeline.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c
index 5a0508b1c99..b09cd4f27ac 100644
--- a/src/freedreno/vulkan/tu_pipeline.c
+++ b/src/freedreno/vulkan/tu_pipeline.c
@@ -431,7 +431,9 @@ tu_xs_get_additional_cs_size_dwords(const struct ir3_shader_variant *xs)
    size += 4 * const_state->ubo_state.num_enabled;
 
    /* Variable number of dwords for the primitive map */
-   size += DIV_ROUND_UP(xs->input_size, 4);
+   size += xs->input_size;
+
+   size += xs->constant_data_size / 4;
 
    return size;
 }