From f4f7096c1d68746a1833ba1b19d8a290a83cbdde Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Fri, 23 Jun 2017 20:20:31 +0200 Subject: [PATCH] glsl: simplify add_uniform_to_shader::visit_field Each field gets a distinct name, so we should never hit the case where the name already exists in the parameter list. Reviewed-by: Timothy Arceri --- src/mesa/program/ir_to_mesa.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 93c6946..ac12b59 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -2450,13 +2450,12 @@ add_uniform_to_shader::visit_field(const glsl_type *type, const char *name, if (type->contains_opaque() && !var->data.bindless) return; - int index = _mesa_lookup_parameter_index(params, name); - if (index < 0) { - unsigned size = type_size(type) * 4; + assert(_mesa_lookup_parameter_index(params, name) < 0); - index = _mesa_add_parameter(params, PROGRAM_UNIFORM, name, size, - type->gl_type, NULL, NULL); - } + unsigned size = type_size(type) * 4; + + int index = _mesa_add_parameter(params, PROGRAM_UNIFORM, name, size, + type->gl_type, NULL, NULL); /* The first part of the uniform that's processed determines the base * location of the whole uniform (for structures). -- 2.7.4