diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-07-06 15:10:29 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-07-06 15:10:29 +1000 |
| commit | e1200cb89218930d01330ba0114e013438655cce (patch) | |
| tree | 44fe2f178da72bf0520d500259050206c058f252 /src/radeon.h | |
| parent | 11cf8a28eb46f48d101888552266921bee8b63fc (diff) | |
Revert "KMS CS fixes."
This reverts commit 11cf8a28eb46f48d101888552266921bee8b63fc.
I'll bring this back in a few minutes, I've got a big change introducing
a new cs space accounting scheme which this messes up and I think
probably conflicts with what I've done.
I promise i'll go over this and pick the bits that are still useful :)
Diffstat (limited to 'src/radeon.h')
| -rw-r--r-- | src/radeon.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/radeon.h b/src/radeon.h index ad62a613..82136c83 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -672,15 +672,9 @@ struct radeon_accel_state { #define EXA_ENGINEMODE_2D 1 #define EXA_ENGINEMODE_3D 2 - int composite_op; - PicturePtr dst_pic; - PicturePtr msk_pic; - PicturePtr src_pic; - PixmapPtr dst_pix; - PixmapPtr msk_pix; - PixmapPtr src_pix; Bool is_transform[2]; PictTransform *transform[2]; + Bool has_mask; /* Whether we are tiling horizontally and vertically */ Bool need_src_tile_x; Bool need_src_tile_y; @@ -1519,10 +1513,8 @@ do { \ uint32_t flush = 0; \ switch (info->accel_state->engineMode) { \ case EXA_ENGINEMODE_UNKNOWN: \ - flush = 1; \ - break; \ case EXA_ENGINEMODE_3D: \ - flush = info->cs == NULL || info->cs->cdw > 15 * 1024; \ + flush = 1; \ case EXA_ENGINEMODE_2D: \ break; \ } \ @@ -1540,10 +1532,8 @@ do { \ uint32_t flush = 0; \ switch (info->accel_state->engineMode) { \ case EXA_ENGINEMODE_UNKNOWN: \ - flush = 1; \ - break; \ case EXA_ENGINEMODE_2D: \ - flush = info->cs == NULL || info->cs->cdw > 15 * 1024; \ + flush = 1; \ case EXA_ENGINEMODE_3D: \ break; \ } \ @@ -1552,9 +1542,8 @@ do { \ radeon_cs_flush_indirect(pScrn); \ else if (info->directRenderingEnabled) \ RADEONCPFlushIndirect(pScrn, 1); \ - } \ - if (!info->accel_state->XInited3D) \ RADEONInit3DEngine(pScrn); \ + } \ info->accel_state->engineMode = EXA_ENGINEMODE_3D; \ } while (0); #else |