diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2013-01-10 12:10:52 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2013-01-10 12:10:52 +0100 |
| commit | 4e35b2f530e2ca8c7b7220cacd05c661de43d20d (patch) | |
| tree | 845f6d7b671a3ec668d4229bb56799fc9f0a6167 /src/radeon_exa.c | |
| parent | 857d729eb3672443f89c0516f8226eacb37dad2b (diff) | |
Drop support for X servers older than 1.7.
The main purpose is to drop DRI2 compatibility code paths which are getting
awkward to deal with and at this point are probably only tested lightly if at
all. xserver 1.7 was released more than 3 years ago, and 1.6.2 was already
required before.
Mostly mechanical, there's probably potential for more cleanups.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Diffstat (limited to 'src/radeon_exa.c')
| -rw-r--r-- | src/radeon_exa.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/src/radeon_exa.c b/src/radeon_exa.c index 0c427355..22e2cefb 100644 --- a/src/radeon_exa.c +++ b/src/radeon_exa.c @@ -166,13 +166,8 @@ Bool RADEONPrepareAccess_CS(PixmapPtr pPix, int index) struct radeon_exa_pixmap_priv *driver_priv; uint32_t possible_domains = ~0U; uint32_t current_domain = 0; -#ifdef EXA_MIXED_PIXMAPS Bool can_fail = !(pPix->drawable.bitsPerPixel < 8) && - pPix != pScreen->GetScreenPixmap(pScreen) && - (info->accel_state->exa->flags & EXA_MIXED_PIXMAPS); -#else - Bool can_fail = FALSE; -#endif + pPix != pScreen->GetScreenPixmap(pScreen); Bool flush = FALSE; int ret; @@ -248,13 +243,9 @@ void *RADEONEXACreatePixmap(ScreenPtr pScreen, int size, int align) RADEONInfoPtr info = RADEONPTR(pScrn); struct radeon_exa_pixmap_priv *new_priv; -#ifdef EXA_MIXED_PIXMAPS - if (info->accel_state->exa->flags & EXA_MIXED_PIXMAPS) { - if (size != 0 && !info->exa_force_create && - info->exa_pixmaps == FALSE) - return NULL; - } -#endif + if (size != 0 && !info->exa_force_create && + info->exa_pixmaps == FALSE) + return NULL; new_priv = calloc(1, sizeof(struct radeon_exa_pixmap_priv)); if (!new_priv) @@ -283,13 +274,9 @@ void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height, RADEONInfoPtr info = RADEONPTR(pScrn); struct radeon_exa_pixmap_priv *new_priv; -#ifdef EXA_MIXED_PIXMAPS - if (info->accel_state->exa->flags & EXA_MIXED_PIXMAPS) { - if (width != 0 && height != 0 && !info->exa_force_create && - info->exa_pixmaps == FALSE) - return NULL; - } -#endif + if (width != 0 && height != 0 && !info->exa_force_create && + info->exa_pixmaps == FALSE) + return NULL; new_priv = calloc(1, sizeof(struct radeon_exa_pixmap_priv)); if (!new_priv) { |