From 2bb0d73816cd7b55af6359499f799f5926e6736a Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sat, 13 Aug 2022 11:15:45 +1000 Subject: [PATCH] nir_to_tgsi_info: drop const_buffers_declared MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drivers don't use this, so avoid the assert it could have. Cc: mesa-stable Reviewed-by: Marek Olšák Part-of: (cherry picked from commit ad274ba8893a31477ca946dfb670d29f8643b01d) --- .pick_status.json | 2 +- src/gallium/auxiliary/nir/nir_to_tgsi_info.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 63bf07b7ce3..0c4df1b7144 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -805,7 +805,7 @@ "description": "nir_to_tgsi_info: drop const_buffers_declared", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/auxiliary/nir/nir_to_tgsi_info.c b/src/gallium/auxiliary/nir/nir_to_tgsi_info.c index ca02678c333..5ec51fc5a6a 100644 --- a/src/gallium/auxiliary/nir/nir_to_tgsi_info.c +++ b/src/gallium/auxiliary/nir/nir_to_tgsi_info.c @@ -783,9 +783,6 @@ void nir_tgsi_scan_shader(const struct nir_shader *nir, info->num_outputs = num_outputs; info->const_file_max[0] = nir->num_uniforms - 1; - info->const_buffers_declared = u_bit_consecutive(1, nir->info.num_ubos); - if (nir->num_uniforms > 0) - info->const_buffers_declared |= 1; info->images_declared = nir->info.images_used[0]; info->samplers_declared = nir->info.textures_used[0];