From 74aef85bd88a1fdb22d445ad14975232a7bebdd7 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia Date: Wed, 27 Jan 2021 13:25:54 -0800 Subject: [PATCH] xquartz: Remove support for Panther and earlier versions of macOS Signed-off-by: Jeremy Huddleston Sequoia --- hw/xquartz/xpr/dri.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/hw/xquartz/xpr/dri.c b/hw/xquartz/xpr/dri.c index 565d94f5f..67ea6a006 100644 --- a/hw/xquartz/xpr/dri.c +++ b/hw/xquartz/xpr/dri.c @@ -216,12 +216,10 @@ DRIUpdateSurface(DRIDrawablePrivPtr pDRIDrawablePriv, DrawablePtr pDraw) if (pDRIDrawablePriv->sid == 0) return; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030 wc.depth = (pDraw->bitsPerPixel == 32 ? XP_DEPTH_ARGB8888 : pDraw->bitsPerPixel == 16 ? XP_DEPTH_RGB555 : XP_DEPTH_NIL); if (wc.depth != XP_DEPTH_NIL) flags |= XP_DEPTH; -#endif if (pDraw->type == DRAWABLE_WINDOW) { WindowPtr pWin = (WindowPtr)pDraw; @@ -382,17 +380,13 @@ DRICreateSurface(ScreenPtr pScreen, Drawable id, if (NULL == pDRIDrawablePriv) return FALSE; /*error*/ - } -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030 - else if (pDrawable->type == DRAWABLE_PIXMAP) { + } else if (pDrawable->type == DRAWABLE_PIXMAP) { pDRIDrawablePriv = CreateSurfaceForPixmap(pScreen, (PixmapPtr)pDrawable); if (NULL == pDRIDrawablePriv) return FALSE; /*error*/ - } -#endif - else { + } else { /* We handle GLXPbuffers in a different way (via CGL). */ return FALSE; }