OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir_to_tgsi_info: drop const_buffers_declared

Browse Source 
Drivers don't use this, so avoid the assert it could have.

Cc: mesa-stable
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18042>
(cherry picked from commit ad274ba889)
This commit is contained in:
Dave Airlie
2022-08-13 11:15:45 +10:00
committed by Dylan Baker
parent 705b30837c
commit 2bb0d73816
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@@ -805,7 +805,7 @@
"description": "nir_to_tgsi_info: drop const_buffers_declared", "description": "nir_to_tgsi_info: drop const_buffers_declared",
"nominated": true, "nominated": true,
"nomination_type": 0, "nomination_type": 0,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": null "because_sha": null
}, },

3
src/gallium/auxiliary/nir/nir_to_tgsi_info.c
View File

@@ -783,9 +783,6 @@ void nir_tgsi_scan_shader(const struct nir_shader *nir,
info->num_outputs = num_outputs; info->num_outputs = num_outputs;
info->const_file_max[0] = nir->num_uniforms - 1; 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->images_declared = nir->info.images_used[0];
info->samplers_declared = nir->info.textures_used[0]; info->samplers_declared = nir->info.textures_used[0];