From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Mon, 17 Aug 2020 18:49:52 +0000 (-0400)
Subject: panfrost: Reduce attribute buffer allocations
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=94f4ecba8dd8611133b94154a28b6e85cc9903de;p=mesa.git

panfrost: Reduce attribute buffer allocations

With vertex ID / instance ID in use, vs->attribute_count will be
expanded appropriately. Without them in use, everything is 1:1 (or 1:2
in the worst case of NPOT everything).

Down to 3 slabs + 64184 bytes.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6373>
---

diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c
index 43c64e4a2c4..0b4a9bed4f4 100644
--- a/src/gallium/drivers/panfrost/pan_cmdstream.c
+++ b/src/gallium/drivers/panfrost/pan_cmdstream.c
@@ -1336,7 +1336,7 @@ panfrost_emit_vertex_data(struct panfrost_batch *batch,
         bool could_npot = instance_shift || instance_odd;
 
         struct panfrost_transfer S = panfrost_pool_alloc_aligned(&batch->pool,
-                        MALI_ATTRIBUTE_BUFFER_LENGTH * PIPE_MAX_ATTRIBS *
+                        MALI_ATTRIBUTE_BUFFER_LENGTH * vs->attribute_count *
                         (could_npot ? 2 : 1),
                         MALI_ATTRIBUTE_BUFFER_LENGTH);