diff options
| author | Marek Olšák <[email protected]> | 2013-08-14 01:04:39 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-08-31 01:34:30 +0200 |
| commit | a81c3e00fee0626e63b1fb8ebb4c2cef3fb23367 (patch) | |
| tree | 663b943d05880c68b9d7f9d6d5ef26bdd7a5aed9 /src/gallium/drivers/radeonsi/radeonsi_pm4.h | |
| parent | d5b23dfc1c07f98afe749053b9cb4b69829fe3d4 (diff) | |
radeonsi: use r600_common_context, r600_common_screen, r600_resource
Also r600_hw_context_priv.h and si_state_streamout.c are removed, because
they are no longer needed.
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/radeonsi/radeonsi_pm4.h')
| -rw-r--r-- | src/gallium/drivers/radeonsi/radeonsi_pm4.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeonsi/radeonsi_pm4.h b/src/gallium/drivers/radeonsi/radeonsi_pm4.h index 68aa36a773f..b74db083949 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_pm4.h +++ b/src/gallium/drivers/radeonsi/radeonsi_pm4.h @@ -55,7 +55,7 @@ struct si_pm4_state /* BO's referenced by this state */ unsigned nbo; - struct si_resource *bo[SI_PM4_MAX_BO]; + struct r600_resource *bo[SI_PM4_MAX_BO]; enum radeon_bo_usage bo_usage[SI_PM4_MAX_BO]; /* relocs for shader data */ @@ -71,7 +71,7 @@ void si_pm4_cmd_end(struct si_pm4_state *state, bool predicate); void si_pm4_set_reg(struct si_pm4_state *state, unsigned reg, uint32_t val); void si_pm4_add_bo(struct si_pm4_state *state, - struct si_resource *bo, + struct r600_resource *bo, enum radeon_bo_usage usage); void si_pm4_sh_data_begin(struct si_pm4_state *state); |