KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nir: Don't bail too early in lower_mem_constant_vars 

If there were no constant variables, we would bail out entirely.
However, we may still have constant input pointers coming in from the
client.

Fixes: 4360a8a2b3 "nir/lower_io: Add support for nir_var_mem_constant"
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6472>
This commit is contained in:
Jason Ekstrand 2020-09-02 17:38:23 -05:00 committed by Marge Bot
parent a7a0315d7f
commit 9414cbc13c
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/compiler/nir/nir_lower_io.c
View File

@ -1724,32 +1724,35 @@ bool
nir_lower_mem_constant_vars(nir_shader *shader,
glsl_type_size_align_func type_info)
{
bool progress = false;
unsigned old_constant_data_size = shader->constant_data_size;
if (!lower_vars_to_explicit(shader, &shader->variables,
nir_var_mem_constant, type_info)) {
nir_shader_preserve_all_metadata(shader);
return false;
}
if (lower_vars_to_explicit(shader, &shader->variables,
nir_var_mem_constant, type_info)) {
assert(shader->constant_data_size > old_constant_data_size);
shader->constant_data = rerzalloc_size(shader, shader->constant_data,
old_constant_data_size,
shader->constant_data_size);
shader->constant_data = rerzalloc_size(shader, shader->constant_data,
old_constant_data_size,
shader->constant_data_size);
nir_foreach_variable_with_modes(var, shader, nir_var_mem_constant) {
write_constant((char *)shader->constant_data + var->data.driver_location,
var->constant_initializer, var->type);
nir_foreach_variable_with_modes(var, shader, nir_var_mem_constant) {
write_constant((char *)shader->constant_data +
var->data.driver_location,
var->constant_initializer, var->type);
}
progress = true;
}
nir_foreach_function(function, shader) {
if (!function->impl)
continue;
nir_lower_vars_to_explicit_types_impl(function->impl,
nir_var_mem_constant,
type_info);
if (nir_lower_vars_to_explicit_types_impl(function->impl,
nir_var_mem_constant,
type_info))
progress = true;
}
return true;
return progress;
}
/**