diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-03-23 18:25:48 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2016-03-24 18:02:46 +0900 |
| commit | e592f32f8b5f5873fcc18b10a69dd5e4ccf11073 (patch) | |
| tree | 54e796d29b000e5c203e72e9da07153846f5b6e4 /src | |
| parent | bde466e5d44cad64b4e4eceaa5de80fdbf86356e (diff) | |
Require xserver 1.9 or newer
1.9.0 was released in August 2010.
We were already unintentionally relying on things not available in 1.8
for at least a year, and nobody has complained.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/radeon.h | 8 | ||||
| -rw-r--r-- | src/radeon_dri2.c | 14 | ||||
| -rw-r--r-- | src/radeon_glamor.c | 8 | ||||
| -rw-r--r-- | src/radeon_video.c | 2 |
4 files changed, 0 insertions, 32 deletions
diff --git a/src/radeon.h b/src/radeon.h index b9afd8ee..37d5fb60 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -272,19 +272,11 @@ struct radeon_pixmap { uint32_t handle; }; -#if HAS_DEVPRIVATEKEYREC extern DevPrivateKeyRec glamor_pixmap_index; -#else -extern int glamor_pixmap_index; -#endif static inline struct radeon_pixmap *radeon_get_pixmap_private(PixmapPtr pixmap) { -#if HAS_DEVPRIVATEKEYREC return dixGetPrivate(&pixmap->devPrivates, &glamor_pixmap_index); -#else - return dixLookupPrivate(&pixmap->devPrivates, &glamor_pixmap_index); -#endif } static inline void radeon_set_pixmap_private(PixmapPtr pixmap, struct radeon_pixmap *priv) diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c index 474611aa..73e09d01 100644 --- a/src/radeon_dri2.c +++ b/src/radeon_dri2.c @@ -70,18 +70,9 @@ struct dri2_window_priv { int vblank_delta; }; -#if HAS_DEVPRIVATEKEYREC - static DevPrivateKeyRec dri2_window_private_key_rec; #define dri2_window_private_key (&dri2_window_private_key_rec) -#else - -static int dri2_window_private_key_index; -DevPrivateKey dri2_window_private_key = &dri2_window_private_key_index; - -#endif /* HAS_DEVPRIVATEKEYREC */ - #define get_dri2_window_priv(window) \ ((struct dri2_window_priv*) \ dixLookupPrivate(&(window)->devPrivates, dri2_window_private_key)) @@ -1588,14 +1579,9 @@ radeon_dri2_screen_init(ScreenPtr pScreen) driverNames[1] = NULL; /* no VDPAU support */ if (DRI2InfoCnt == 0) { -#if HAS_DIXREGISTERPRIVATEKEY if (!dixRegisterPrivateKey(dri2_window_private_key, PRIVATE_WINDOW, sizeof(struct dri2_window_priv))) { -#else - if (!dixRequestPrivate(dri2_window_private_key, - sizeof(struct dri2_window_priv))) { -#endif xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Failed to get DRI2 window private\n"); return FALSE; diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c index cc2b1f2a..f94e0fd3 100644 --- a/src/radeon_glamor.c +++ b/src/radeon_glamor.c @@ -34,11 +34,7 @@ #include "radeon_bo_helper.h" #include "radeon_glamor.h" -#if HAS_DEVPRIVATEKEYREC DevPrivateKeyRec glamor_pixmap_index; -#else -int glamor_pixmap_index; -#endif void radeon_glamor_exchange_buffers(PixmapPtr src, @@ -370,11 +366,7 @@ radeon_glamor_init(ScreenPtr screen) return FALSE; } -#if HAS_DIXREGISTERPRIVATEKEY if (!dixRegisterPrivateKey(&glamor_pixmap_index, PRIVATE_PIXMAP, 0)) -#else - if (!dixRequestPrivate(&glamor_pixmap_index, 0)) -#endif return FALSE; if (info->shadow_primary) diff --git a/src/radeon_video.c b/src/radeon_video.c index 48b06e26..e08d8e00 100644 --- a/src/radeon_video.c +++ b/src/radeon_video.c @@ -94,9 +94,7 @@ radeon_pick_best_crtc(ScrnInfoPtr pScrn, Bool consider_disabled, best_coverage = 0; /* Prefer the CRTC of the primary output */ -#ifdef HAS_DIXREGISTERPRIVATEKEY if (dixPrivateKeyRegistered(rrPrivKey)) -#endif { primary_output = RRFirstOutput(pScrn->pScreen); } |