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

nir/lower-atomics-to-ssbo: remove atomic_uint arrays too

Browse source 
Maybe there is a better way to do this.  But by the time we get to
assigning uniform locs, we want the atomic_uint's to all be gone,
otherwise we assert in st_glsl_attrib_type_size().

Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Rob Clark 2017-05-15 15:53:12 -04:00
parent 5f6c034f82
commit 6f65a1a211
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/compiler/nir/nir_lower_atomics_to_ssbo.c
View file

@ -163,6 +163,14 @@ lower_instr(nir_intrinsic_instr *instr, unsigned ssbo_offset, nir_builder *b)
return true;
}
static bool
is_atomic_uint(const struct glsl_type *type)
{
if (glsl_get_base_type(type) == GLSL_TYPE_ARRAY)
return is_atomic_uint(glsl_get_array_element(type));
return glsl_get_base_type(type) == GLSL_TYPE_ATOMIC_UINT;
}
bool
nir_lower_atomics_to_ssbo(nir_shader *shader, unsigned ssbo_offset)
{
@ -189,7 +197,7 @@ nir_lower_atomics_to_ssbo(nir_shader *shader, unsigned ssbo_offset)
/* replace atomic_uint uniforms with ssbo's: */
unsigned replaced = 0;
nir_foreach_variable_safe(var, &shader->uniforms) {
if (glsl_get_base_type(var->type) == GLSL_TYPE_ATOMIC_UINT) {
if (is_atomic_uint(var->type)) {
exec_node_remove(&var->node);
if (replaced & (1 << var->data.binding))