From aa29298416a6323fad1681a019dbcd54867b66c4 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 26 Feb 2018 15:26:35 -0500 Subject: [PATCH] glamor: unifdef XORG_VERSION_CURRENT This is always true now that glamor is in-tree. Signed-off-by: Adam Jackson Reviewed-by: Alex Deucher --- glamor/glamor_utils.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/glamor/glamor_utils.h b/glamor/glamor_utils.h index 7597b92dc..84371f769 100644 --- a/glamor/glamor_utils.h +++ b/glamor/glamor_utils.h @@ -601,10 +601,8 @@ format_for_depth(int depth) default: case 24: return PICT_x8r8g8b8; -#if XORG_VERSION_CURRENT >= 10699900 case 30: return PICT_x2r10g10b10; -#endif case 32: return PICT_a8r8g8b8; } @@ -669,7 +667,6 @@ glamor_get_rgba_from_pixel(CARD32 pixel, gshift = rbits; bshift = gshift + gbits; ashift = bshift + bbits; -#if XORG_VERSION_CURRENT >= 10699900 } else if (PICT_FORMAT_TYPE(format) == PICT_TYPE_BGRA) { ashift = 0; @@ -678,7 +675,6 @@ glamor_get_rgba_from_pixel(CARD32 pixel, rshift = PICT_FORMAT_BPP(format) - (rbits + gbits + bbits); gshift = rshift + rbits; bshift = gshift + gbits; -#endif } else { return FALSE;