From 930ebb258524762c765fa864ef7063bd8bb754a1 Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Mon, 27 Jul 2015 18:34:43 +0300 Subject: [PATCH] i965/fs: Switch lower_load_payload() to the fs_builder constructor from instruction. Reviewed-by: Jason Ekstrand --- src/mesa/drivers/dri/i965/brw_fs.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 71d372c..354c45f 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -3040,7 +3040,8 @@ fs_visitor::lower_load_payload() if (dst.file == MRF) dst.reg = dst.reg & ~BRW_MRF_COMPR4; - const fs_builder hbld = bld.exec_all().group(8, 0).at(block, inst); + const fs_builder ibld(this, block, inst); + const fs_builder hbld = ibld.exec_all().group(8, 0); for (uint8_t i = 0; i < inst->header_size; i++) { if (inst->src[i].file != BAD_FILE) { @@ -3051,10 +3052,6 @@ fs_visitor::lower_load_payload() dst = offset(dst, hbld, 1); } - const fs_builder ibld = bld.exec_all(inst->force_writemask_all) - .group(inst->exec_size, inst->force_sechalf) - .at(block, inst); - if (inst->dst.file == MRF && (inst->dst.reg & BRW_MRF_COMPR4) && inst->exec_size > 8) { /* In this case, the payload portion of the LOAD_PAYLOAD isn't -- 2.7.4