LGTM Reviewed-by: Jason Ekstrand <jason.ekstr...@intel.com> On Jun 10, 2015 7:39 AM, "Francisco Jerez" <curroje...@riseup.net> wrote:
> Instead use fs_builder::null_reg_f() which has the correct register > width. Avoids the assertion failure in fs_builder::emit() hit by the > "ES3-CTS.shaders.loops.for_dynamic_iterations.unconditional_break_fragment" > GLES3 conformance test introduced by > 4af4cfba9ee1014baa4a777660fc9d53d57e4c82. > > Reported-and-reviewed-by: Tapani Pälli <tapani.pa...@intel.com> > --- > src/mesa/drivers/dri/i965/brw_fs.cpp | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp > b/src/mesa/drivers/dri/i965/brw_fs.cpp > index 7789ca7..5563c5a 100644 > --- a/src/mesa/drivers/dri/i965/brw_fs.cpp > +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp > @@ -3234,7 +3234,7 @@ fs_visitor::lower_integer_multiplication() > ibld.ADD(dst, low, high); > > if (inst->conditional_mod) { > - fs_reg null(retype(brw_null_reg(), inst->dst.type)); > + fs_reg null(retype(ibld.null_reg_f(), inst->dst.type)); > set_condmod(inst->conditional_mod, > ibld.MOV(null, inst->dst)); > } > -- > 2.3.5 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev >
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev