Reviewed-by: Timothy Arceri <timothy.arc...@collabora.com>
On Thu, 2017-01-05 at 12:05 -0800, Kenneth Graunke wrote: > A while ago, we stopped using Luca's GLSL IR lower_jumps pass in > favor > of nir_lower_returns(). Marek's commit > d3cb79e043338b0e55a3fba8df652f3 > put it in do_common_optimization, which resulted in us calling it > again. > > Dropping the EmitNoMainReturn setting makes us skip that pass again. > > Apparently that pass doesn't work properly, because this fixes > Piglit's > tests/spec/glsl-1.10/execution/vs-nested-return-sibling-loop. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99287 > Signed-off-by: Kenneth Graunke <kenn...@whitecape.org> > --- > src/mesa/drivers/dri/i965/brw_compiler.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/src/mesa/drivers/dri/i965/brw_compiler.c > b/src/mesa/drivers/dri/i965/brw_compiler.c > index fa8a772a104..f3dafecae04 100644 > --- a/src/mesa/drivers/dri/i965/brw_compiler.c > +++ b/src/mesa/drivers/dri/i965/brw_compiler.c > @@ -126,7 +126,6 @@ brw_compiler_create(void *mem_ctx, const struct > gen_device_info *devinfo) > compiler->glsl_compiler_options[i].MaxIfDepth = > devinfo->gen < 6 ? 16 : UINT_MAX; > > - compiler->glsl_compiler_options[i].EmitNoMainReturn = true; > compiler->glsl_compiler_options[i].EmitNoIndirectInput = true; > compiler->glsl_compiler_options[i].EmitNoIndirectUniform = > false; > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev