From 4f91f8dd6057b73d05454fc626985183d00e5236 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 9 Nov 2012 21:20:05 -0800 Subject: [PATCH] i965: Move BRW_MAX_GRF and similar defines to brw_reg.h. These don't really belong in brw_structs.h. Reviewed-by: Eric Anholt --- src/mesa/drivers/dri/i965/brw_reg.h | 17 +++++++++++++++++ src/mesa/drivers/dri/i965/brw_structs.h | 18 ------------------ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_reg.h b/src/mesa/drivers/dri/i965/brw_reg.h index c66ccc2..9ac2544 100644 --- a/src/mesa/drivers/dri/i965/brw_reg.h +++ b/src/mesa/drivers/dri/i965/brw_reg.h @@ -50,6 +50,23 @@ extern "C" { #endif +/** Number of general purpose registers (VS, WM, etc) */ +#define BRW_MAX_GRF 128 + +/** + * First GRF used for the MRF hack. + * + * On gen7, MRFs are no longer used, and contiguous GRFs are used instead. We + * haven't converted our compiler to be aware of this, so it asks for MRFs and + * brw_eu_emit.c quietly converts them to be accesses of the top GRFs. The + * register allocators have to be careful of this to avoid corrupting the "MRF"s + * with actual GRF allocations. + */ +#define GEN7_MRF_HACK_START 112 + +/** Number of message register file registers */ +#define BRW_MAX_MRF 16 + #define BRW_SWIZZLE4(a,b,c,d) (((a)<<0) | ((b)<<2) | ((c)<<4) | ((d)<<6)) #define BRW_GET_SWZ(swz, idx) (((swz) >> ((idx)*2)) & 0x3) diff --git a/src/mesa/drivers/dri/i965/brw_structs.h b/src/mesa/drivers/dri/i965/brw_structs.h index a8196b6..a72e944 100644 --- a/src/mesa/drivers/dri/i965/brw_structs.h +++ b/src/mesa/drivers/dri/i965/brw_structs.h @@ -33,24 +33,6 @@ #ifndef BRW_STRUCTS_H #define BRW_STRUCTS_H - -/** Number of general purpose registers (VS, WM, etc) */ -#define BRW_MAX_GRF 128 - -/** - * First GRF used for the MRF hack. - * - * On gen7, MRFs are no longer used, and contiguous GRFs are used instead. We - * haven't converted our compiler to be aware of this, so it asks for MRFs and - * brw_eu_emit.c quietly converts them to be accesses of the top GRFs. The - * register allocators have to be careful of this to avoid corrupting the "MRF"s - * with actual GRF allocations. - */ -#define GEN7_MRF_HACK_START 112. - -/** Number of message register file registers */ -#define BRW_MAX_MRF 16 - /* These seem to be passed around as function args, so it works out * better to keep them as #defines: */ -- 2.7.4