aco: Remove esgs_itemsize from LDS alignment calculation.
authorTimur Kristóf <timur.kristof@gmail.com>
Tue, 18 Feb 2020 19:21:20 +0000 (20:21 +0100)
committerMarge Bot <eric+marge@anholt.net>
Wed, 11 Mar 2020 08:34:10 +0000 (08:34 +0000)
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>

src/amd/compiler/aco_instruction_selection.cpp

index 855021df108b48c8952c7cd3e91d0ac99e49a052..4f6b3aa81901a12a326844e8517f68a8bf04a184 100644 (file)
@@ -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));