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_funcs.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_funcs.c')
| -rw-r--r-- | src/radeon_exa_funcs.c | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c index ce6186d9..7166cd56 100644 --- a/src/radeon_exa_funcs.c +++ b/src/radeon_exa_funcs.c @@ -599,24 +599,11 @@ Bool RADEONDrawInit(ScreenPtr pScreen) info->accel_state->exa->UploadToScreen = &RADEONUploadToScreenCS; info->accel_state->exa->DownloadFromScreen = &RADEONDownloadFromScreenCS; - info->accel_state->exa->flags = EXA_OFFSCREEN_PIXMAPS; -#ifdef EXA_SUPPORTS_PREPARE_AUX - info->accel_state->exa->flags |= EXA_SUPPORTS_PREPARE_AUX; -#endif -#ifdef EXA_SUPPORTS_OFFSCREEN_OVERLAPS - /* The 2D engine supports overlapping memory areas */ - info->accel_state->exa->flags |= EXA_SUPPORTS_OFFSCREEN_OVERLAPS; -#endif + info->accel_state->exa->flags = EXA_OFFSCREEN_PIXMAPS | EXA_SUPPORTS_PREPARE_AUX | + EXA_SUPPORTS_OFFSCREEN_OVERLAPS | EXA_HANDLES_PIXMAPS | EXA_MIXED_PIXMAPS; info->accel_state->exa->pixmapOffsetAlign = RADEON_GPU_PAGE_SIZE; info->accel_state->exa->pixmapPitchAlign = 64; -#ifdef EXA_HANDLES_PIXMAPS - info->accel_state->exa->flags |= EXA_HANDLES_PIXMAPS; -#ifdef EXA_MIXED_PIXMAPS - info->accel_state->exa->flags |= EXA_MIXED_PIXMAPS; -#endif -#endif - #ifdef RENDER if (info->RenderAccel) { if (IS_R300_3D || IS_R500_3D) { @@ -647,30 +634,20 @@ Bool RADEONDrawInit(ScreenPtr pScreen) } #endif -#if (EXA_VERSION_MAJOR == 2 && EXA_VERSION_MINOR >= 4) info->accel_state->exa->CreatePixmap = RADEONEXACreatePixmap; info->accel_state->exa->DestroyPixmap = RADEONEXADestroyPixmap; info->accel_state->exa->PixmapIsOffscreen = RADEONEXAPixmapIsOffscreen; info->accel_state->exa->PrepareAccess = RADEONPrepareAccess_CS; info->accel_state->exa->FinishAccess = RADEONFinishAccess_CS; -#if (EXA_VERSION_MAJOR == 2 && EXA_VERSION_MINOR >= 5) info->accel_state->exa->CreatePixmap2 = RADEONEXACreatePixmap2; #if (EXA_VERSION_MAJOR == 2 && EXA_VERSION_MINOR >= 6) info->accel_state->exa->SharePixmapBacking = RADEONEXASharePixmapBacking; info->accel_state->exa->SetSharedPixmapBacking = RADEONEXASetSharedPixmapBacking; #endif -#endif -#endif -#if EXA_VERSION_MAJOR > 2 || (EXA_VERSION_MAJOR == 2 && EXA_VERSION_MINOR >= 3) - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Setting EXA maxPitchBytes\n"); - info->accel_state->exa->maxPitchBytes = 16320; info->accel_state->exa->maxX = 8191; -#else - info->accel_state->exa->maxX = 16320 / 4; -#endif info->accel_state->exa->maxY = 8191; if (xf86ReturnOptValBool(info->Options, OPTION_EXA_VSYNC, FALSE)) { |