diff options
| author | Marek Olšák <[email protected]> | 2013-08-13 21:49:59 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-08-31 01:34:30 +0200 |
| commit | d5b23dfc1c07f98afe749053b9cb4b69829fe3d4 (patch) | |
| tree | 4b3bc4c8b7a65485fef4d2ab7a0cad511b6c5018 /src/gallium/drivers/r600/evergreend.h | |
| parent | 13a1a8b877e109f423090de8c2807d5c3d9cf95a (diff) | |
r600g: move streamout state to drivers/radeon
This streamout state code will be used by radeonsi.
There are new structures r600_common_context and r600_common_screen.
What is inherited by what is shown here:
pipe_context -> r600_common_context -> r600_context
pipe_screen -> r600_common_screen -> r600_screen
The common structures reside in drivers/radeon. Currently they only contain
enough functionality to be able to handle streamout. Eventually I'd like
the whole pipe_screen implementation to be shared and some of the context
stuff too.
This is quite big, but most changes are because of the new structures and
the fact r600_write_value is replaced by radeon_emit.
Thanks to Tom Stellard for fixing the build for r600g/compute.
Reviewed-by: Michel Dänzer <[email protected]>
Reviewed-by: Christian König <[email protected]>
Tested-by: Tom Stellard <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/evergreend.h')
| -rw-r--r-- | src/gallium/drivers/r600/evergreend.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/drivers/r600/evergreend.h b/src/gallium/drivers/r600/evergreend.h index 8990d6c3fad..2f2e1455d59 100644 --- a/src/gallium/drivers/r600/evergreend.h +++ b/src/gallium/drivers/r600/evergreend.h @@ -161,7 +161,7 @@ #define PKT3_CP_DMA_CMD_DAIC (1 << 29) /* Registers */ -#define R_0084FC_CP_STRMOUT_CNTL 0x000084FC +#define R_0084FC_CP_STRMOUT_CNTL 0x0084FC #define S_0084FC_OFFSET_UPDATE_DONE(x) (((x) & 0x1) << 0) #define R_008960_VGT_STRMOUT_BUFFER_FILLED_SIZE_0 0x008960 /* read-only */ #define R_008964_VGT_STRMOUT_BUFFER_FILLED_SIZE_1 0x008964 /* read-only */ @@ -1997,17 +1997,17 @@ #define S_028B8C_OFFSET(x) (((x) & 0xFFFFFFFF) << 0) #define G_028B8C_OFFSET(x) (((x) >> 0) & 0xFFFFFFFF) #define C_028B8C_OFFSET 0x00000000 -#define R_028B94_VGT_STRMOUT_CONFIG 0x00028B94 +#define R_028B94_VGT_STRMOUT_CONFIG 0x028B94 #define S_028B94_STREAMOUT_0_EN(x) (((x) & 0x1) << 0) #define S_028B94_STREAMOUT_1_EN(x) (((x) & 0x1) << 1) #define S_028B94_STREAMOUT_2_EN(x) (((x) & 0x1) << 2) #define S_028B94_STREAMOUT_3_EN(x) (((x) & 0x1) << 3) -#define S_028B94_RAST_STREAM(x) (((x) & 0x7) << 4) -#define R_028B98_VGT_STRMOUT_BUFFER_CONFIG 0x00028B98 -#define S_028B98_STREAM_0_BUFFER_EN(x) (((x) & 0xf) << 0) -#define S_028B98_STREAM_1_BUFFER_EN(x) (((x) & 0xf) << 4) -#define S_028B98_STREAM_2_BUFFER_EN(x) (((x) & 0xf) << 8) -#define S_028B98_STREAM_3_BUFFER_EN(x) (((x) & 0xf) << 12) +#define S_028B94_RAST_STREAM(x) (((x) & 0x07) << 4) +#define R_028B98_VGT_STRMOUT_BUFFER_CONFIG 0x028B98 +#define S_028B98_STREAM_0_BUFFER_EN(x) (((x) & 0x0F) << 0) +#define S_028B98_STREAM_1_BUFFER_EN(x) (((x) & 0x0F) << 4) +#define S_028B98_STREAM_2_BUFFER_EN(x) (((x) & 0x0F) << 8) +#define S_028B98_STREAM_3_BUFFER_EN(x) (((x) & 0x0F) << 12) #define R_028C00_PA_SC_LINE_CNTL 0x00028C00 #define S_028C00_EXPAND_LINE_WIDTH(x) (((x) & 0x1) << 9) #define G_028C00_EXPAND_LINE_WIDTH(x) (((x) >> 9) & 0x1) |