The patch looks good to me. Just to note that on the same file NULL checks are sometimes done with a explicit != NULL as you are doing, and other times they not (ie: lines 2585, 7165). It would be good to know if one of the options is the preferred one and use it, although I guess that at this point is hard/impossible to know.
In any case: Reviewed-by: Alejandro Piñeiro <[email protected]> On 20/05/16 17:58, Mark Janes wrote: > This trivially corrects mesa 3ca1c221, which introduced a check that > crashes when a match is not found. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95005 > Fixes: > piglit.spec.glsl-1_50.compiler.interface-blocks-name-reused-globally-4.vert > --- > src/compiler/glsl/ast_to_hir.cpp | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/compiler/glsl/ast_to_hir.cpp > b/src/compiler/glsl/ast_to_hir.cpp > index ecfe684..a524fbd 100644 > --- a/src/compiler/glsl/ast_to_hir.cpp > +++ b/src/compiler/glsl/ast_to_hir.cpp > @@ -6920,7 +6920,7 @@ ast_struct_specifier::hir(exec_list *instructions, > if (!state->symbols->add_type(name, t)) { > const glsl_type *match = state->symbols->get_type(name); > /* allow struct matching for desktop GL - older UE4 does this */ > - if (state->is_version(130, 0) && match->record_compare(t, false)) > + if (match != NULL && state->is_version(130, 0) && > match->record_compare(t, false)) > _mesa_glsl_warning(& loc, state, "struct `%s' previously defined", > name); > else > _mesa_glsl_error(& loc, state, "struct `%s' previously defined", > name); _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
