diff options
| author | Matt Turner <[email protected]> | 2015-11-22 17:58:51 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2015-11-24 10:05:33 -0800 |
| commit | 6b525d9f2babfaf97bb002c06c810874bf152a8c (patch) | |
| tree | 04d156be027da2346fc9323bac845c1edbd15ace | |
| parent | 76732932ec3918bb9cc04ccd37bc1a8c37051683 (diff) | |
i965: Move MRF macros from brw_inst.h to brw_eu.h.
brw_inst.h is only for the brw_inst/brw_compact_inst functions.
Reviewed-by: Ian Romanick <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_eu.h | 9 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_inst.h | 9 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_eu.h b/src/mesa/drivers/dri/i965/brw_eu.h index 829e39330f2..81d4ef9ad63 100644 --- a/src/mesa/drivers/dri/i965/brw_eu.h +++ b/src/mesa/drivers/dri/i965/brw_eu.h @@ -543,6 +543,15 @@ is_3src(enum opcode opcode) return opcode_descs[opcode].nsrc == 3; } +/** Maximum SEND message length */ +#define BRW_MAX_MSG_LENGTH 15 + +/** First MRF register used by pull loads */ +#define FIRST_SPILL_MRF(gen) ((gen) == 6 ? 21 : 13) + +/** First MRF register used by spills */ +#define FIRST_PULL_LOAD_MRF(gen) ((gen) == 6 ? 16 : 13) + #ifdef __cplusplus } #endif diff --git a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp index 1b61f9fe01c..ef59c240139 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp @@ -25,6 +25,7 @@ * */ +#include "brw_eu.h" #include "brw_fs.h" #include "brw_cfg.h" #include "glsl/nir/glsl_types.h" diff --git a/src/mesa/drivers/dri/i965/brw_inst.h b/src/mesa/drivers/dri/i965/brw_inst.h index cd9f6ef591d..0e5f61389df 100644 --- a/src/mesa/drivers/dri/i965/brw_inst.h +++ b/src/mesa/drivers/dri/i965/brw_inst.h @@ -39,15 +39,6 @@ extern "C" { #endif -/** Maximum SEND message length */ -#define BRW_MAX_MSG_LENGTH 15 - -/** First MRF register used by pull loads */ -#define FIRST_SPILL_MRF(gen) ((gen) == 6 ? 21 : 13) - -/** First MRF register used by spills */ -#define FIRST_PULL_LOAD_MRF(gen) ((gen) == 6 ? 16 : 13) - /* brw_context.h has a forward declaration of brw_inst, so name the struct. */ typedef struct brw_inst { uint64_t data[2]; |