diff options
Diffstat (limited to 'driver/xf86-video-ati/src/radeon_glamor.c')
| -rw-r--r-- | driver/xf86-video-ati/src/radeon_glamor.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/driver/xf86-video-ati/src/radeon_glamor.c b/driver/xf86-video-ati/src/radeon_glamor.c index b0da8537f..eae351fbf 100644 --- a/driver/xf86-video-ati/src/radeon_glamor.c +++ b/driver/xf86-video-ati/src/radeon_glamor.c @@ -109,9 +109,14 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn) "glamor may not work (well) with GPUs < RV515.\n"); } +#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,20,99,0,0) if (scrn->depth < 24) { +#else + if (scrn->depth < 15) { +#endif xf86DrvMsg(scrn->scrnIndex, s ? X_ERROR : X_WARNING, - "glamor requires depth >= 24, disabling.\n"); + "Depth %d not supported with glamor, disabling\n", + scrn->depth); return FALSE; } @@ -233,7 +238,7 @@ radeon_glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth, if (info->shadow_primary) { if (usage != CREATE_PIXMAP_USAGE_BACKING_PIXMAP) return fbCreatePixmap(screen, w, h, depth, usage); - } else { + } else if (usage != CREATE_PIXMAP_USAGE_BACKING_PIXMAP) { pixmap = glamor_create_pixmap(screen, w, h, depth, usage); if (pixmap) return pixmap; |