From: Timur Kristóf <timur.kristof@gmail.com>
Date: Tue, 18 Feb 2020 19:21:20 +0000 (+0100)
Subject: aco: Remove esgs_itemsize from LDS alignment calculation.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4fc1da208efa6333ce4fa6836d0348313085d635;p=mesa.git

aco: Remove esgs_itemsize from LDS alignment calculation.

It was problematic to have it, because some shader stages might
not even know about the esgs_itemsize, for example TCS and
the merged VS+TCS stages.

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3964>
---

diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index 855021df108..4f6b3aa8190 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -2886,9 +2886,7 @@ void store_lds(isel_context *ctx, unsigned elem_size_bytes, Temp data, uint32_t
 
 unsigned calculate_lds_alignment(isel_context *ctx, unsigned const_offset)
 {
-   unsigned itemsize = ctx->program->info->vs.es_info.esgs_itemsize;
    unsigned align = 16;
-   align = std::min(align, 1u << (ffs(itemsize) - 1));
    if (const_offset)
       align = std::min(align, 1u << (ffs(const_offset) - 1));