From ed09e7802304b7a9f9bcbde041b443b75f744ad3 Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Fri, 13 Jan 2017 14:16:12 -0800 Subject: [PATCH] intel/eu: Return new instruction to caller from brw_fb_WRITE(). Reviewed-by: Jason Ekstrand Reviewed-by: Matt Turner --- src/intel/compiler/brw_eu.h | 20 ++++++++++---------- src/intel/compiler/brw_eu_emit.c | 24 +++++++++++++----------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/intel/compiler/brw_eu.h b/src/intel/compiler/brw_eu.h index 0f07eeb3d6d..aad2434bcf4 100644 --- a/src/intel/compiler/brw_eu.h +++ b/src/intel/compiler/brw_eu.h @@ -328,16 +328,16 @@ void brw_svb_write(struct brw_codegen *p, unsigned binding_table_index, bool send_commit_msg); -void brw_fb_WRITE(struct brw_codegen *p, - struct brw_reg payload, - struct brw_reg implied_header, - unsigned msg_control, - unsigned binding_table_index, - unsigned msg_length, - unsigned response_length, - bool eot, - bool last_render_target, - bool header_present); +brw_inst *brw_fb_WRITE(struct brw_codegen *p, + struct brw_reg payload, + struct brw_reg implied_header, + unsigned msg_control, + unsigned binding_table_index, + unsigned msg_length, + unsigned response_length, + bool eot, + bool last_render_target, + bool header_present); brw_inst *gen9_fb_READ(struct brw_codegen *p, struct brw_reg dst, diff --git a/src/intel/compiler/brw_eu_emit.c b/src/intel/compiler/brw_eu_emit.c index d3246edde44..365630b703a 100644 --- a/src/intel/compiler/brw_eu_emit.c +++ b/src/intel/compiler/brw_eu_emit.c @@ -2285,17 +2285,17 @@ void brw_oword_block_read(struct brw_codegen *p, brw_pop_insn_state(p); } - -void brw_fb_WRITE(struct brw_codegen *p, - struct brw_reg payload, - struct brw_reg implied_header, - unsigned msg_control, - unsigned binding_table_index, - unsigned msg_length, - unsigned response_length, - bool eot, - bool last_render_target, - bool header_present) +brw_inst * +brw_fb_WRITE(struct brw_codegen *p, + struct brw_reg payload, + struct brw_reg implied_header, + unsigned msg_control, + unsigned binding_table_index, + unsigned msg_length, + unsigned response_length, + bool eot, + bool last_render_target, + bool header_present) { const struct gen_device_info *devinfo = p->devinfo; const unsigned target_cache = @@ -2344,6 +2344,8 @@ void brw_fb_WRITE(struct brw_codegen *p, response_length, eot, 0 /* send_commit_msg */); + + return insn; } brw_inst * -- 2.30.2