fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir/gather_info: don't allocate the ralloc context

Browse source 
It's only used by the set, so we can just free the set directly.

Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36728>
This commit is contained in:
Marek Olšák 2025-08-11 13:24:07 -04:00 • committed by Marge Bot
parent 390631e30a
commit 33a076789c
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/compiler/nir/nir_gather_info.c
View file

@ -414,8 +414,7 @@ intrinsic_is_bindless(nir_intrinsic_instr *instr)
}
static void
gather_intrinsic_info(nir_intrinsic_instr *instr, nir_shader *shader,
void *dead_ctx)
gather_intrinsic_info(nir_intrinsic_instr *instr, nir_shader *shader)
{
uint64_t slot_mask = 0;
uint16_t slot_mask_16bit = 0;
@ -952,7 +951,7 @@ gather_alu_info(nir_alu_instr *instr, nir_shader *shader)
static void
gather_func_info(nir_function_impl *func, nir_shader *shader,
struct set *visited_funcs, void *dead_ctx)
struct set *visited_funcs)
{
if (_mesa_set_search(visited_funcs, func))
return;
@ -966,7 +965,7 @@ gather_func_info(nir_function_impl *func, nir_shader *shader,
gather_alu_info(nir_instr_as_alu(instr), shader);
break;
case nir_instr_type_intrinsic:
gather_intrinsic_info(nir_instr_as_intrinsic(instr), shader, dead_ctx);
gather_intrinsic_info(nir_instr_as_intrinsic(instr), shader);
break;
case nir_instr_type_tex:
gather_tex_info(nir_instr_as_tex(instr), shader);
@ -978,7 +977,7 @@ gather_func_info(nir_function_impl *func, nir_shader *shader,
if (!call->indirect_callee.ssa)
assert(impl || !"nir_shader_gather_info only works with linked shaders");
if (impl)
gather_func_info(impl, shader, visited_funcs, dead_ctx);
gather_func_info(impl, shader, visited_funcs);
break;
}
default:
@ -1079,11 +1078,10 @@ nir_shader_gather_info(nir_shader *shader, nir_function_impl *entrypoint)
if (shader->info.stage != MESA_SHADER_FRAGMENT)
shader->info.writes_memory = shader->info.has_transform_feedback_varyings;
void *dead_ctx = ralloc_context(NULL);
struct set visited_funcs;
_mesa_pointer_set_init(&visited_funcs, dead_ctx);
gather_func_info(entrypoint, shader, &visited_funcs, dead_ctx);
ralloc_free(dead_ctx);
_mesa_pointer_set_init(&visited_funcs, NULL);
gather_func_info(entrypoint, shader, &visited_funcs);
_mesa_set_fini(&visited_funcs, NULL);
shader->info.per_view_outputs = 0;
nir_foreach_shader_out_variable(var, shader) {