Also perform arithmetic on char* rather than void* since the latter is a
GNU C extension not available in C++.
---
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 8ce31a1..3c89365 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 a357d5d..38d327a 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c
@@ -2383,17 +2383,6 @@ void brw_urb_WRITE(struct brw_compile *p,
}
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)
{
int offset;
--
1.8.3.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
