summaryrefslogtreecommitdiff
path: root/src/radeon_dri2.c
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2016-03-23 18:25:48 +0900
committerMichel Dänzer <michel@daenzer.net>2016-03-24 18:02:46 +0900
commite592f32f8b5f5873fcc18b10a69dd5e4ccf11073 (patch)
tree54e796d29b000e5c203e72e9da07153846f5b6e4 /src/radeon_dri2.c
parentbde466e5d44cad64b4e4eceaa5de80fdbf86356e (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/radeon_dri2.c')
-rw-r--r--src/radeon_dri2.c14
1 files changed, 0 insertions, 14 deletions
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;