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

glsl: fix out params in glsl to nir

Browse source 
We must use a temp var for out params and later copy the out values
to the correct parameter otherwise we can end up overwriting
global variables prematurely.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24914>
This commit is contained in:
Timothy Arceri 2023-09-01 10:45:50 +10:00
parent 51ad269198
commit 67d1c36bb4
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/compiler/glsl/glsl_to_nir.cpp
View file

@ -1636,8 +1636,10 @@ nir_visitor::visit(ir_call *ir)
ir_variable *sig_param = (ir_variable *) formal_node;
if (sig_param->data.mode == ir_var_function_out) {
nir_deref_instr *out_deref = evaluate_deref(param_rvalue);
call->params[i] = nir_src_for_ssa(&out_deref->def);
nir_variable *out_param =
nir_local_variable_create(this->impl, sig_param->type, "param");
nir_deref_instr *out_param_deref = nir_build_deref_var(&b, out_param);
call->params[i] = nir_src_for_ssa(&out_param_deref->def);
} else if (sig_param->data.mode == ir_var_function_in) {
nir_def *val = evaluate_rvalue(param_rvalue);
nir_src src = nir_src_for_ssa(val);
@ -1652,6 +1654,25 @@ nir_visitor::visit(ir_call *ir)
nir_builder_instr_insert(&b, &call->instr);
/* Copy out params. We must do this after the function call to ensure we
* do not overwrite global variables prematurely.
*/
i = ir->return_deref ? 1 : 0;
foreach_two_lists(formal_node, &ir->callee->parameters,
actual_node, &ir->actual_parameters) {
ir_rvalue *param_rvalue = (ir_rvalue *) actual_node;
ir_variable *sig_param = (ir_variable *) formal_node;
if (sig_param->data.mode == ir_var_function_out) {
nir_store_deref(&b, evaluate_deref(param_rvalue),
nir_load_deref(&b, nir_src_as_deref(call->params[i])),
~0);
}
i++;
}
if (ir->return_deref)
nir_store_deref(&b, evaluate_deref(ir->return_deref), nir_load_deref(&b, ret_deref), ~0);
}