From 5442712c6dae60529ceed0ea199751da7c9dd8e7 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 5 Mar 2020 14:51:20 +1100 Subject: [PATCH] Revert "glsl: fix resizing of the uniform remap table" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e0aa0a839f9c168784a1f50013c83877cc876094. Instead we fix it correctly in the following patch. Reviewed-by: Alejandro Piñeiro Part-of: --- src/compiler/glsl/gl_nir_link_uniforms.c | 12 ++++-------- 1 file 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 */