<div dir="ltr">Sure, my fault. <div class="gmail_quote"><div dir="ltr">чт, 4 окт. 2018 г. в 10:27, Tapani Pälli <<a href="mailto:tapani.palli@intel.com" target="_blank">tapani.palli@intel.com</a>>: </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Reviewed-by: Tapani Pälli <<a href="mailto:tapani.palli@intel.com" target="_blank">tapani.palli@intel.com</a>> In the future, please remember update patch version when making changes and posting patch again, easiest way is to give '-v2' to git-format-patch and then update commit message with information what was changed. This will help the review process. Otherwise it may not be obvious what got changed. On 10/3/18 11:39 AM, Vadym Shovkoplias wrote: > From Section 6.1.2 (Subroutines) of the GLSL 4.00 specification > > "A program will fail to compile or link if any shader > or stage contains two or more functions with the same > name if the name is associated with a subroutine type." > > Fixes: > * no-overloads.vert > > Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=108109" rel="noreferrer" target="_blank">https://bugs.freedesktop.org/show_bug.cgi?id=108109</a> > Signed-off-by: Vadym Shovkoplias <<a href="mailto:vadym.shovkoplias@globallogic.com" target="_blank">vadym.shovkoplias@globallogic.com</a>> > --- > src/compiler/glsl/linker.cpp | 40 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 40 insertions(+) > > diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp > index 3fde7e78d3..aca5488a1e 100644 > --- a/src/compiler/glsl/linker.cpp > +++ b/src/compiler/glsl/linker.cpp > @@ -4639,6 +4639,45 @@ link_assign_subroutine_types(struct gl_shader_program *prog) > } > } > > +static void > +verify_subroutine_associated_funcs(struct gl_shader_program *prog) > +{ > + unsigned mask = prog->data->linked_stages; > + while (mask) { > + const int i = u_bit_scan(&mask); > + gl_program *p = prog->_LinkedShaders[i]->Program; > + glsl_symbol_table *symbols = prog->_LinkedShaders[i]->symbols; > + > + /* > + * From OpenGL ES Shading Language 4.00 specification > + * (6.1.2 Subroutines): > + * "A program will fail to compile or link if any shader > + * or stage contains two or more functions with the same > + * name if the name is associated with a subroutine type." > + */ > + for (unsigned j = 0; j < p->sh.NumSubroutineFunctions; j++) { > + unsigned definitions = 0; > + char *name = p->sh.SubroutineFunctions[j].name; > + ir_function *fn = symbols->get_function(name); > + > + /* Calculate number of function definitions with the same name */ > + foreach_in_list(ir_function_signature, sig, &fn->signatures) { > + if (sig->is_defined) { > + if (++definitions > 1) { > + linker_error(prog, "%s shader contains two or more function " > + "definitions with name `%s', which is " > + "associated with a subroutine type.\n", > + _mesa_shader_stage_to_string(i), > + fn->name); > + return; > + } > + } > + } > + } > + } > +} > + > + > static void > set_always_active_io(exec_list *ir, ir_variable_mode io_mode) > { > @@ -5024,6 +5063,7 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog) > > check_explicit_uniform_locations(ctx, prog); > link_assign_subroutine_types(prog); > + verify_subroutine_associated_funcs(prog); > > if (!prog->data->LinkStatus) > goto done; > </blockquote></div></div>