diff options
| author | Oliver McFadden <z3ro.geek@gmail.com> | 2007-05-28 00:16:50 +0000 |
|---|---|---|
| committer | Oliver McFadden <z3ro.geek@gmail.com> | 2007-05-30 03:19:26 +0000 |
| commit | 1baef2f080b2afe806e9dc85a5930cb0dfb4c66e (patch) | |
| tree | 72e2584bc56f7f1c390fc627ee9e2d4e8182ef51 /src/mesa/drivers/dri/r300/r300_emit.h | |
| parent | 3e5f8a6c894b7e818443ac08dada65e57610fa69 (diff) | |
| download | external_mesa3d-1baef2f080b2afe806e9dc85a5930cb0dfb4c66e.zip external_mesa3d-1baef2f080b2afe806e9dc85a5930cb0dfb4c66e.tar.gz external_mesa3d-1baef2f080b2afe806e9dc85a5930cb0dfb4c66e.tar.bz2 | |
r300: Use the CP_PACKET3 macro for Type 3 packets.
I haven't converted all of the Type 3 packets to the CP_PACKET3 macro yet
because some of the Type 3 packet defines are missing from the R300 register
definition file.
These defines need to be copied from DRM and Mesa into the R300 register
definition file then copied into both DRM and Mesa.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_emit.h')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_emit.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_emit.h b/src/mesa/drivers/dri/r300/r300_emit.h index 4f841a5..2f79ee3 100644 --- a/src/mesa/drivers/dri/r300/r300_emit.h +++ b/src/mesa/drivers/dri/r300/r300_emit.h @@ -44,20 +44,11 @@ #include "r300_cmdbuf.h" #include "radeon_reg.h" -/* - * CP type-3 packets - */ -#define RADEON_CP_PACKET3_UNK1B 0xC0001B00 -#define RADEON_CP_PACKET3_INDX_BUFFER 0xC0003300 -#define RADEON_CP_PACKET3_3D_DRAW_VBUF_2 0xC0003400 -#define RADEON_CP_PACKET3_3D_DRAW_IMMD_2 0xC0003500 -#define RADEON_CP_PACKET3_3D_DRAW_INDX_2 0xC0003600 -#define RADEON_CP_PACKET3_3D_LOAD_VBPNTR 0xC0002F00 -#define RADEON_CP_PACKET3_3D_CLEAR_ZMASK 0xC0003202 -#define RADEON_CP_PACKET3_3D_CLEAR_CMASK 0xC0003802 -#define RADEON_CP_PACKET3_3D_CLEAR_HIZ 0xC0003702 - +/* TODO: move these defines (and the ones from DRM) into r300_reg.h and sync up + * with DRM */ #define CP_PACKET0(reg, n) (RADEON_CP_PACKET0 | ((n)<<16) | ((reg)>>2)) +#define CP_PACKET3( pkt, n ) \ + (RADEON_CP_PACKET3 | (pkt) | ((n) << 16)) static inline uint32_t cmdpacket0(int reg, int count) { |