From: Marek Olšák <marek.olsak@amd.com>
Date: Thu, 21 May 2020 08:18:19 +0000 (-0400)
Subject: radeonsi: remove const_buffers_declared hacks
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=877c56bfdcb97e47453b86f23a13033438f0daa1;p=mesa.git

radeonsi: remove const_buffers_declared hacks

This was a bug that was uncovered by 4553fc66a5f23607c2e872d8ac8755c747bd0bd2.

Piglit: spec@arb_uniform_buffer_object@maxblocks

Fixes: 4553fc66a5f23607c2e872d8ac8755c747bd0bd2

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5209>
---

diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c
index 03b04ba0293..74aa9f475f3 100644
--- a/src/gallium/drivers/radeonsi/si_shader_nir.c
+++ b/src/gallium/drivers/radeonsi/si_shader_nir.c
@@ -714,9 +714,7 @@ void si_nir_scan_shader(const struct nir_shader *nir, struct si_shader_info *inf
 
    info->constbuf0_num_slots = nir->num_uniforms;
    info->shader_buffers_declared = u_bit_consecutive(0, nir->info.num_ssbos);
-   info->const_buffers_declared = u_bit_consecutive(1, nir->info.num_ubos);
-   if (nir->num_uniforms > 0)
-      info->const_buffers_declared |= 1;
+   info->const_buffers_declared = u_bit_consecutive(0, nir->info.num_ubos);
    info->images_declared = u_bit_consecutive(0, nir->info.num_images);
    info->msaa_images_declared = nir->info.msaa_images;
    info->samplers_declared = nir->info.textures_used;