From 392cbc2f930b2505520e85b97b407cb6d4e17548 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sat, 17 May 2014 13:00:12 -0700 Subject: [PATCH] i965: Move next_offset() to brw_eu.h for use elsewhere. Also perform arithmetic on char* rather than void* since the latter is a GNU C extension not available in C++. Reviewed-by: Eric Anholt --- src/mesa/drivers/dri/i965/brw_eu.h | 12 ++++++++++++ src/mesa/drivers/dri/i965/brw_eu_emit.c | 11 ----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_eu.h b/src/mesa/drivers/dri/i965/brw_eu.h index 8ce31a1d3b9..3c89365e3a4 100644 --- a/src/mesa/drivers/dri/i965/brw_eu.h +++ b/src/mesa/drivers/dri/i965/brw_eu.h @@ -424,6 +424,18 @@ void brw_debug_compact_uncompact(struct brw_context *brw, struct brw_instruction *orig, struct brw_instruction *uncompacted); +static inline int +next_offset(void *store, int offset) +{ + struct brw_instruction *insn = + (struct brw_instruction *)((char *)store + offset); + + if (insn->header.cmpt_control) + return offset + 8; + else + return offset + 16; +} + #ifdef __cplusplus } #endif diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c index a357d5d6aab..38d327afc72 100644 --- a/src/mesa/drivers/dri/i965/brw_eu_emit.c +++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c @@ -2382,17 +2382,6 @@ void brw_urb_WRITE(struct brw_compile *p, swizzle); } -static int -next_offset(void *store, int offset) -{ - struct brw_instruction *insn = (void *)store + offset; - - if (insn->header.cmpt_control) - return offset + 8; - else - return offset + 16; -} - static int brw_find_next_block_end(struct brw_compile *p, int start_offset) { -- 2.30.2