aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/compiler/glsl/gl_nir_link_uniforms.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/compiler/glsl/gl_nir_link_uniforms.c b/src/compiler/glsl/gl_nir_link_uniforms.c
index c859c2d0b55..ef19ced288c 100644
--- a/src/compiler/glsl/gl_nir_link_uniforms.c
+++ b/src/compiler/glsl/gl_nir_link_uniforms.c
@@ -116,20 +116,16 @@ nir_setup_uniform_remap_tables(struct gl_context *ctx,
unsigned location =
link_util_find_empty_block(prog, &prog->data->UniformStorage[i]);
- if (location == -1 || location + entries >= prog->NumUniformRemapTable) {
- unsigned new_entries = entries;
- if (location == -1)
- location = prog->NumUniformRemapTable;
- else
- new_entries = location - prog->NumUniformRemapTable + entries;
+ if (location == -1) {
+ location = prog->NumUniformRemapTable;
/* resize remap table to fit new entries */
prog->UniformRemapTable =
reralloc(prog,
prog->UniformRemapTable,
struct gl_uniform_storage *,
- prog->NumUniformRemapTable + new_entries);
- prog->NumUniformRemapTable += new_entries;
+ prog->NumUniformRemapTable + entries);
+ prog->NumUniformRemapTable += entries;
}
/* set the base location in remap table for the uniform */