From 34a38827b79318dae67b857de70becfb69bdcf83 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 17 Oct 2019 19:50:20 -0400 Subject: [PATCH] cogl: Remove unused COGL_FEATURE_ID_ONSCREEN_MULTIPLE https://gitlab.gnome.org/GNOME/mutter/merge_requests/866 --- cogl/cogl/cogl-context.h | 3 --- cogl/cogl/winsys/cogl-winsys-egl-x11.c | 2 -- cogl/cogl/winsys/cogl-winsys-glx.c | 3 --- 3 files changed, 8 deletions(-) diff --git a/cogl/cogl/cogl-context.h b/cogl/cogl/cogl-context.h index f4fd7be57..6a3fc8ae9 100644 --- a/cogl/cogl/cogl-context.h +++ b/cogl/cogl/cogl-context.h @@ -179,8 +179,6 @@ cogl_is_context (void *object); * texture. * @COGL_FEATURE_ID_OFFSCREEN_MULTISAMPLE: Multisample support for * offscreen framebuffers - * @COGL_FEATURE_ID_ONSCREEN_MULTIPLE: Multiple onscreen framebuffers - * supported. * @COGL_FEATURE_ID_UNSIGNED_INT_INDICES: Set if * %COGL_INDICES_TYPE_UNSIGNED_INT is supported in * cogl_indices_new(). @@ -206,7 +204,6 @@ cogl_is_context (void *object); typedef enum _CoglFeatureID { COGL_FEATURE_ID_OFFSCREEN_MULTISAMPLE, - COGL_FEATURE_ID_ONSCREEN_MULTIPLE, COGL_FEATURE_ID_UNSIGNED_INT_INDICES, COGL_FEATURE_ID_MAP_BUFFER_FOR_READ, COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE, diff --git a/cogl/cogl/winsys/cogl-winsys-egl-x11.c b/cogl/cogl/winsys/cogl-winsys-egl-x11.c index 194fc15a8..dafe7a6a7 100644 --- a/cogl/cogl/winsys/cogl-winsys-egl-x11.c +++ b/cogl/cogl/winsys/cogl-winsys-egl-x11.c @@ -387,8 +387,6 @@ _cogl_winsys_egl_context_init (CoglContext *context, event_filter_cb, context); - COGL_FLAGS_SET (context->features, - COGL_FEATURE_ID_ONSCREEN_MULTIPLE, TRUE); COGL_FLAGS_SET (context->winsys_features, COGL_WINSYS_FEATURE_MULTIPLE_ONSCREEN, TRUE); diff --git a/cogl/cogl/winsys/cogl-winsys-glx.c b/cogl/cogl/winsys/cogl-winsys-glx.c index b36d3ef57..6b8239db1 100644 --- a/cogl/cogl/winsys/cogl-winsys-glx.c +++ b/cogl/cogl/winsys/cogl-winsys-glx.c @@ -832,9 +832,6 @@ update_winsys_features (CoglContext *context, GError **error) context->feature_flags |= glx_renderer->legacy_feature_flags; - COGL_FLAGS_SET (context->features, - COGL_FEATURE_ID_ONSCREEN_MULTIPLE, TRUE); - if (glx_renderer->glXCopySubBuffer || context->glBlitFramebuffer) { CoglGpuInfo *info = &context->gpu;