diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-11-30 15:32:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-01 13:40:45 +1000 |
| commit | 88a50a30df11a06263209340a42251851f8e2334 (patch) | |
| tree | 7a8ee4323f5f9ed91ff96e73986343315e0232e0 /src/r600_state.h | |
| parent | b2597deea3a3953ff50d54ff37e3c043eac409f4 (diff) | |
r600: fix multi-operation in single batch support.
This ports the mesa DMA buffer handling with the 3 lists,
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/r600_state.h')
| -rw-r--r-- | src/r600_state.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/r600_state.h b/src/r600_state.h index 6cd47dcc..0ee480bc 100644 --- a/src/r600_state.h +++ b/src/r600_state.h @@ -206,7 +206,7 @@ do { \ } \ } while (0) #else -#define BEGIN_BATCH(n) do {} while(0) +#define BEGIN_BATCH(n) do {(void)info;} while(0) #define END_BATCH() do {} while(0) #define RELOC_BATCH(bo, wd, rd) do {} while(0) #define E32(ib, dword) \ @@ -336,24 +336,4 @@ extern struct radeon_bo *radeon_get_pixmap_bo(PixmapPtr pPix); extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix); -static inline float * -r600_vb_space(ScrnInfoPtr pScrn, int vert_size) -{ - RADEONInfoPtr info = RADEONPTR(pScrn); - struct radeon_accel_state *accel_state = info->accel_state; - float *vb; - - if ((accel_state->vb_offset + (3 * vert_size)) > accel_state->vb_total) { - r600_finish_op(pScrn, vert_size); - if (info->cs) - radeon_cs_flush_indirect(pScrn); - r600_cp_start(pScrn); - } - vb = (pointer)((char *)accel_state->vb_ptr + accel_state->vb_offset); - return vb; -} - -#define r600_vb_update(accel_state, vert_size) do { (accel_state)->vb_offset += (3 * (vert_size)); } while(0) - - #endif |