Synchronize r300_reg.h.
Fix unportable whitespace before preprocessor commands.
This commit is contained in:
parent
150ed2e43d
commit
cb77dcf0b9
|
@ -1048,8 +1048,7 @@ I am fairly certain that they are correct unless stated otherwise in comments.
|
|||
# define R300_COLOR_ENDIAN_NO_SWAP (0 << 18) /* GUESS */
|
||||
# define R300_COLOR_ENDIAN_WORD_SWAP (1 << 18) /* GUESS */
|
||||
# define R300_COLOR_ENDIAN_DWORD_SWAP (2 << 18) /* GUESS */
|
||||
# define R300_COLOR_UNKNOWN_22_23 (3 << 22) /* GUESS: Format? */
|
||||
/* if format then it is (6<<21) - RGBA8 */
|
||||
# define R300_COLOR_UNKNOWN_22_23 (3 << 22) /* GUESS: Format? - (6<<21) for RGBA? */
|
||||
#define R300_RB3D_COLORPITCH1 0x4E3C /* GUESS */
|
||||
#define R300_RB3D_COLORPITCH2 0x4E40 /* GUESS */
|
||||
#define R300_RB3D_COLORPITCH3 0x4E44 /* GUESS */
|
||||
|
@ -1070,12 +1069,11 @@ I am fairly certain that they are correct unless stated otherwise in comments.
|
|||
# define R300_RB3D_Z_TEST 0x00000012
|
||||
# define R300_RB3D_Z_TEST_AND_WRITE 0x00000016
|
||||
# define R300_RB3D_Z_WRITE_ONLY 0x00000006
|
||||
# define R300_STENCIL_ENABLE 0x00000000 /* UNKNOWN yet.. */
|
||||
|
||||
# define R300_RB3D_Z_TEST 0x00000012
|
||||
# define R300_RB3D_Z_TEST_AND_WRITE 0x00000016
|
||||
# define R300_RB3D_Z_WRITE_ONLY 0x00000006
|
||||
# define R300_STENCIL_ENABLE (0<<1) /* UNKNOWN yet.. */
|
||||
# define R300_RB3D_STENCIL_ENABLE (0<<1) /* UNKNOWN yet.. */
|
||||
|
||||
#define R300_RB3D_ZSTENCIL_CNTL_1 0x4F04
|
||||
/* functions */
|
||||
|
@ -1098,11 +1096,9 @@ I am fairly certain that they are correct unless stated otherwise in comments.
|
|||
# define R300_ZS_INCR_WRAP 6
|
||||
# define R300_ZS_DECR_WRAP 7
|
||||
|
||||
|
||||
# define R300_RB3D_ZS1_DEPTH_FUNC_SHIFT 0
|
||||
/* front and back refer to operations done for front
|
||||
and back faces - newer Radeons can perform different
|
||||
functions */
|
||||
and back faces, i.e. separate stencil function support */
|
||||
# define R300_RB3D_ZS1_DEPTH_FUNC_SHIFT 0
|
||||
# define R300_RB3D_ZS1_FRONT_FUNC_SHIFT 3
|
||||
# define R300_RB3D_ZS1_FRONT_FAIL_OP_SHIFT 6
|
||||
# define R300_RB3D_ZS1_FRONT_ZPASS_OP_SHIFT 9
|
||||
|
@ -1219,4 +1215,54 @@ I am fairly certain that they are correct unless stated otherwise in comments.
|
|||
#define R300_VPI_IN_NEG_W (1 << 28)
|
||||
/* END */
|
||||
|
||||
//BEGIN: Packet 3 commands
|
||||
|
||||
// A primitive emission dword.
|
||||
#define R300_PRIM_TYPE_NONE (0 << 0)
|
||||
#define R300_PRIM_TYPE_POINT (1 << 0)
|
||||
#define R300_PRIM_TYPE_LINE (2 << 0)
|
||||
#define R300_PRIM_TYPE_LINE_STRIP (3 << 0)
|
||||
#define R300_PRIM_TYPE_TRI_LIST (4 << 0)
|
||||
#define R300_PRIM_TYPE_TRI_FAN (5 << 0)
|
||||
#define R300_PRIM_TYPE_TRI_STRIP (6 << 0)
|
||||
#define R300_PRIM_TYPE_TRI_TYPE2 (7 << 0)
|
||||
#define R300_PRIM_TYPE_RECT_LIST (8 << 0)
|
||||
#define R300_PRIM_TYPE_3VRT_POINT_LIST (9 << 0)
|
||||
#define R300_PRIM_TYPE_3VRT_LINE_LIST (10 << 0)
|
||||
#define R300_PRIM_TYPE_POINT_SPRITES (11 << 0) // GUESS (based on r200)
|
||||
#define R300_PRIM_TYPE_LINE_LOOP (12 << 0)
|
||||
#define R300_PRIM_TYPE_QUADS (13 << 0)
|
||||
#define R300_PRIM_TYPE_QUAD_STRIP (14 << 0)
|
||||
#define R300_PRIM_TYPE_POLYGON (15 << 0)
|
||||
#define R300_PRIM_TYPE_MASK 0xF
|
||||
#define R300_PRIM_WALK_IND (1 << 4)
|
||||
#define R300_PRIM_WALK_LIST (2 << 4)
|
||||
#define R300_PRIM_WALK_RING (3 << 4)
|
||||
#define R300_PRIM_WALK_MASK (3 << 4)
|
||||
#define R300_PRIM_COLOR_ORDER_BGRA (0 << 6) // GUESS (based on r200)
|
||||
#define R300_PRIM_COLOR_ORDER_RGBA (1 << 6) // GUESS
|
||||
#define R300_PRIM_NUM_VERTICES_SHIFT 16
|
||||
|
||||
// Draw a primitive from vertex data in arrays loaded via 3D_LOAD_VBPNTR.
|
||||
// Two parameter dwords:
|
||||
// 0. The first parameter appears to be always 0
|
||||
// 1. The second parameter is a standard primitive emission dword.
|
||||
#define R300_PACKET3_3D_DRAW_VBUF 0x00002800
|
||||
|
||||
// Specify the full set of vertex arrays as (address, stride).
|
||||
// The first parameter is the number of vertex arrays specified.
|
||||
// The rest of the command is a variable length list of blocks, where
|
||||
// each block is three dwords long and specifies two arrays.
|
||||
// The first dword of a block is split into two words, the lower significant
|
||||
// word refers to the first array, the more significant word to the second
|
||||
// array in the block.
|
||||
// The low byte of each word contains the size of an array entry in dwords,
|
||||
// the high byte contains the stride of the array.
|
||||
// The second dword of a block contains the pointer to the first array,
|
||||
// the third dword of a block contains the pointer to the second array.
|
||||
// Note that if the total number of arrays is odd, the third dword of
|
||||
// the last block is omitted.
|
||||
#define R300_PACKET3_3D_LOAD_VBPNTR 0x00002F00
|
||||
//END
|
||||
|
||||
#endif /* _R300_REG_H */
|
||||
|
|
Loading…
Reference in New Issue