From 40a975495343159bd73ee7325c748b56a2e792e1 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 16 Jun 2014 16:34:57 -0700 Subject: [PATCH] i965: Pass brw to brw_try_compact_instruction(). Signed-off-by: Matt Turner Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_eu.h | 2 +- src/mesa/drivers/dri/i965/brw_eu_compact.c | 5 ++--- src/mesa/drivers/dri/i965/test_eu_compact.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_eu.h b/src/mesa/drivers/dri/i965/brw_eu.h index e06d832933e..59b9232feed 100644 --- a/src/mesa/drivers/dri/i965/brw_eu.h +++ b/src/mesa/drivers/dri/i965/brw_eu.h @@ -412,7 +412,7 @@ void brw_compact_instructions(struct brw_compile *p, int start_offset, int num_annotations, struct annotation *annotation); void brw_uncompact_instruction(struct brw_context *brw, brw_inst *dst, brw_compact_inst *src); -bool brw_try_compact_instruction(struct brw_compile *p, brw_compact_inst *dst, +bool brw_try_compact_instruction(struct brw_context *brw, brw_compact_inst *dst, brw_inst *src); void brw_debug_compact_uncompact(struct brw_context *brw, brw_inst *orig, diff --git a/src/mesa/drivers/dri/i965/brw_eu_compact.c b/src/mesa/drivers/dri/i965/brw_eu_compact.c index a7d3595e3bd..b9a6500ecda 100644 --- a/src/mesa/drivers/dri/i965/brw_eu_compact.c +++ b/src/mesa/drivers/dri/i965/brw_eu_compact.c @@ -459,10 +459,9 @@ is_compactable_immediate(unsigned imm) * brw_compact_instructions(). */ bool -brw_try_compact_instruction(struct brw_compile *p, brw_compact_inst *dst, +brw_try_compact_instruction(struct brw_context *brw, brw_compact_inst *dst, brw_inst *src) { - struct brw_context *brw = p->brw; brw_compact_inst temp; if (brw_inst_opcode(brw, src) == BRW_OPCODE_IF || @@ -728,7 +727,7 @@ brw_compact_instructions(struct brw_compile *p, int start_offset, brw_inst saved = *src; if (!brw_inst_cmpt_control(brw, src) && - brw_try_compact_instruction(p, dst, src)) { + brw_try_compact_instruction(brw, dst, src)) { compacted_count++; if (INTEL_DEBUG) { diff --git a/src/mesa/drivers/dri/i965/test_eu_compact.c b/src/mesa/drivers/dri/i965/test_eu_compact.c index b7737c758e6..92b6dd5497c 100644 --- a/src/mesa/drivers/dri/i965/test_eu_compact.c +++ b/src/mesa/drivers/dri/i965/test_eu_compact.c @@ -36,7 +36,7 @@ test_compact_instruction(struct brw_compile *p, brw_inst src) brw_compact_inst dst; memset(&dst, 0xd0, sizeof(dst)); - if (brw_try_compact_instruction(p, &dst, &src)) { + if (brw_try_compact_instruction(brw, &dst, &src)) { brw_inst uncompacted; brw_uncompact_instruction(brw, &uncompacted, &dst); -- 2.30.2