diff options
| author | Henri Verbeet <[email protected]> | 2011-07-09 17:18:59 +0200 |
|---|---|---|
| committer | Henri Verbeet <[email protected]> | 2011-07-09 18:12:50 +0200 |
| commit | 89dc31a28d8e5607989ec11cfd29310c1c97f6ac (patch) | |
| tree | a11a4f0fe9975edfd132bc676146c0d7dbcbc482 /src/gallium/drivers/r600/r600_opcodes.h | |
| parent | 4f7dfd8ad3185f006e7ae8ed86bafd4d66ebc903 (diff) | |
r600g: Replace the CHIPREV_* defines with the chip_class enum.
Signed-off-by: Henri Verbeet <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_opcodes.h')
| -rw-r--r-- | src/gallium/drivers/r600/r600_opcodes.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/gallium/drivers/r600/r600_opcodes.h b/src/gallium/drivers/r600/r600_opcodes.h index 184f32c9960..7ae091ea5cd 100644 --- a/src/gallium/drivers/r600/r600_opcodes.h +++ b/src/gallium/drivers/r600/r600_opcodes.h @@ -409,14 +409,8 @@ #define EG_V_SQ_CF_ALLOC_EXPORT_WORD1_SQ_CF_INST_MEM_EXPORT_COMBINED 0x0000005B #define EG_V_SQ_CF_ALLOC_EXPORT_WORD1_SQ_CF_INST_MEM_RAT_COMBINED_CACHELESS 0x0000005C +#define BC_INST(bc, x) ((bc)->chip_class >= EVERGREEN ? EG_##x : x) -#define CHIPREV_R600 0 -#define CHIPREV_R700 1 -#define CHIPREV_EVERGREEN 2 -#define CHIPREV_CAYMAN 3 - -#define BC_INST(bc, x) ((bc)->chiprev >= CHIPREV_EVERGREEN ? EG_##x : x) - -#define CTX_INST(x) (ctx->bc->chiprev >= CHIPREV_EVERGREEN ? EG_##x : x) +#define CTX_INST(x) (ctx->bc->chip_class >= EVERGREEN ? EG_##x : x) #endif |