From: Samuel Iglesias Gonsálvez Date: Mon, 20 Jun 2016 10:13:14 +0000 (+0200) Subject: i965/fs: do not require force_writemask_all with exec_size 4 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9979a3f2ac8271221fe7d636f893c0c04315ceb6;p=mesa.git i965/fs: do not require force_writemask_all with exec_size 4 So far we only used instructions with this size in situations where we did not operate per-channel and we wanted to ignore the execution mask, but gen7 fp64 will need to emit code with a width of 4 that needs normal execution masking. v2: - Modify the assert instead of deleting it (Curro) Reviewed-by: Francisco Jerez --- diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp index d25d26a9140..ce1ec0a5885 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp @@ -1649,7 +1649,7 @@ fs_generator::generate_code(const cfg_t *cfg, int dispatch_width) brw_set_default_acc_write_control(p, inst->writes_accumulator); brw_set_default_exec_size(p, cvt(inst->exec_size) - 1); - assert(inst->force_writemask_all || inst->exec_size >= 8); + assert(inst->force_writemask_all || inst->exec_size >= 4); assert(inst->force_writemask_all || inst->group % inst->exec_size == 0); assert(inst->base_mrf + inst->mlen <= BRW_MAX_MRF(devinfo->gen)); assert(inst->mlen <= BRW_MAX_MSG_LENGTH);