diff options
| author | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-05 22:38:38 +0200 |
|---|---|---|
| committer | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-05 22:38:38 +0200 |
| commit | 2194e078c7691308e97dcde1a335f23a679d85bb (patch) | |
| tree | e5338abe9e8e6ffd88cc5969fdd27710c817d0e0 /src/gallium/drivers/r600/r600.h | |
| parent | cd114a92b996c246bb35080bca611fca3f375e94 (diff) | |
| parent | 2cf3199ee3b0014bc426bc3163dfa279c00eabb3 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Diffstat (limited to 'src/gallium/drivers/r600/r600.h')
| -rw-r--r-- | src/gallium/drivers/r600/r600.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gallium/drivers/r600/r600.h b/src/gallium/drivers/r600/r600.h index 8a2e5c514d4..630177d6add 100644 --- a/src/gallium/drivers/r600/r600.h +++ b/src/gallium/drivers/r600/r600.h @@ -152,15 +152,18 @@ static inline void r600_pipe_state_add_reg(struct r600_pipe_state *state, #define R600_BLOCK_STATUS_DIRTY (1 << 1) struct r600_block_reloc { - struct r600_bo *bo; - unsigned nreloc; - unsigned bo_pm4_index[R600_BLOCK_MAX_BO]; + struct r600_bo *bo; + unsigned flush_flags; + unsigned flush_mask; + unsigned bo_pm4_index; }; struct r600_block { + struct list_head list; unsigned status; unsigned start_offset; unsigned pm4_ndwords; + unsigned pm4_flush_ndwords; unsigned nbo; unsigned nreg; u32 *reg; @@ -218,6 +221,7 @@ struct r600_context { struct r600_range range[256]; unsigned nblocks; struct r600_block **blocks; + struct list_head dirty; unsigned pm4_ndwords; unsigned pm4_cdwords; unsigned pm4_dirty_cdwords; |