From 3f9c5d04d4de845abb36a00e67c6a7a45f86a3b7 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 22 Oct 2019 21:53:35 -0400 Subject: [PATCH] cogl: Remove old workaround for software Mesa The comment says this was fixed in 10.1, which is over five years old now. Please use a newer Mesa already. https://gitlab.gnome.org/GNOME/mutter/merge_requests/900 --- cogl/cogl/winsys/cogl-winsys-glx.c | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/cogl/cogl/winsys/cogl-winsys-glx.c b/cogl/cogl/winsys/cogl-winsys-glx.c index d0c09d9bf..378fec7be 100644 --- a/cogl/cogl/winsys/cogl-winsys-glx.c +++ b/cogl/cogl/winsys/cogl-winsys-glx.c @@ -826,33 +826,7 @@ update_winsys_features (CoglContext *context, GError **error) sizeof (context->winsys_features)); if (glx_renderer->glXCopySubBuffer || context->glBlitFramebuffer) - { - CoglGpuInfo *info = &context->gpu; - CoglGpuInfoArchitecture arch = info->architecture; - - COGL_FLAGS_SET (context->winsys_features, COGL_WINSYS_FEATURE_SWAP_REGION, TRUE); - - /* - * "The "drisw" binding in Mesa for loading sofware renderers is - * broken, and neither glBlitFramebuffer nor glXCopySubBuffer - * work correctly." - * - ajax - * - https://bugzilla.gnome.org/show_bug.cgi?id=674208 - * - * This is broken in software Mesa at least as of 7.10 and got - * fixed in Mesa 10.1 - */ - - if (info->driver_package == COGL_GPU_INFO_DRIVER_PACKAGE_MESA && - info->driver_package_version < COGL_VERSION_ENCODE (10, 1, 0) && - (arch == COGL_GPU_INFO_ARCHITECTURE_LLVMPIPE || - arch == COGL_GPU_INFO_ARCHITECTURE_SOFTPIPE || - arch == COGL_GPU_INFO_ARCHITECTURE_SWRAST)) - { - COGL_FLAGS_SET (context->winsys_features, - COGL_WINSYS_FEATURE_SWAP_REGION, FALSE); - } - } + COGL_FLAGS_SET (context->winsys_features, COGL_WINSYS_FEATURE_SWAP_REGION, TRUE); /* Note: glXCopySubBuffer and glBlitFramebuffer won't be throttled * by the SwapInterval so we have to throttle swap_region requests