From 673f4295e8d7e9d6444a98ad5a9e892e1e16410a Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 17 Oct 2019 20:57:26 -0400 Subject: [PATCH] cogl: Remove unused COGL_FEATURE_ID_OFFSCREEN_MULTISAMPLE This is a _little_ strange, as we still fill in the vtable slot for glRenderbufferStorageMultisampleIMG, and can in principle still call it. But that feature was weird to begin with as we were only checking for that function in big-GL contexts despite that its extension is for GLES. I'll leave cleaning that up to a future pass. https://gitlab.gnome.org/GNOME/mutter/merge_requests/866 --- cogl/cogl/cogl-context.h | 3 --- cogl/cogl/driver/gl/gl/cogl-driver-gl.c | 6 ------ 2 files changed, 9 deletions(-) diff --git a/cogl/cogl/cogl-context.h b/cogl/cogl/cogl-context.h index 6a3fc8ae9..c4854041f 100644 --- a/cogl/cogl/cogl-context.h +++ b/cogl/cogl/cogl-context.h @@ -177,8 +177,6 @@ cogl_is_context (void *object); * @COGL_FEATURE_ID_TEXTURE_RG: Support for * %COGL_TEXTURE_COMPONENTS_RG as the internal components of a * texture. - * @COGL_FEATURE_ID_OFFSCREEN_MULTISAMPLE: Multisample support for - * offscreen framebuffers * @COGL_FEATURE_ID_UNSIGNED_INT_INDICES: Set if * %COGL_INDICES_TYPE_UNSIGNED_INT is supported in * cogl_indices_new(). @@ -203,7 +201,6 @@ cogl_is_context (void *object); */ typedef enum _CoglFeatureID { - COGL_FEATURE_ID_OFFSCREEN_MULTISAMPLE, 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/driver/gl/gl/cogl-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c index 29c078c8d..c399fa9aa 100644 --- a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c +++ b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c @@ -422,12 +422,6 @@ _cogl_driver_update_features (CoglContext *ctx, COGL_FLAGS_SET (private_features, COGL_PRIVATE_FEATURE_BLIT_FRAMEBUFFER, TRUE); - if (ctx->glRenderbufferStorageMultisampleIMG) - { - COGL_FLAGS_SET (ctx->features, - COGL_FEATURE_ID_OFFSCREEN_MULTISAMPLE, TRUE); - } - COGL_FLAGS_SET (private_features, COGL_PRIVATE_FEATURE_PBOS, TRUE); COGL_FLAGS_SET (ctx->features, COGL_FEATURE_ID_MAP_BUFFER_FOR_READ, TRUE);