Mesa (master): i965/fs: Remove one more fixed brw_null_reg() from the visitor.

[Francisco Jerez]

Module: Mesa
Branch: master
Commit: 8d3c48eed24f351c86361707978647c78010bb7f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d3c48eed24f351c86361707978647c78010bb7f

Author: Francisco Jerez <currojerez at riseup.net>
Date:   Wed Jun 10 14:40:33 2015 +0300

i965/fs: Remove one more fixed brw_null_reg() from the visitor.

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.palli at intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand at 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));
          }