radeonsi: remove const_buffers_declared hacks

This was a bug that was uncovered by 4553fc66a5.

Piglit: spec@arb_uniform_buffer_object@maxblocks

Fixes: 4553fc66a5

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5209>
This commit is contained in:
Marek Olšák 2020-05-21 04:18:19 -04:00 committed by Marge Bot
parent ce4575b3b5
commit 877c56bfdc

View file

@ -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;