From 0731eb629c1008f17c01c955b8c8815668c92183 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 17 Oct 2019 19:51:50 -0400 Subject: [PATCH] cogl: Remove unused COGL_FEATURE_MAP_BUFFER_FOR_{READ,WRITE} https://gitlab.gnome.org/GNOME/mutter/merge_requests/866 --- cogl/cogl/cogl-types.h | 6 ------ cogl/cogl/driver/gl/gl/cogl-driver-gl.c | 2 -- cogl/cogl/driver/gl/gles/cogl-driver-gles.c | 3 --- 3 files changed, 11 deletions(-) diff --git a/cogl/cogl/cogl-types.h b/cogl/cogl/cogl-types.h index 28a0b78aa..c27bc8d93 100644 --- a/cogl/cogl/cogl-types.h +++ b/cogl/cogl/cogl-types.h @@ -121,10 +121,6 @@ typedef struct _CoglTextureVertex CoglTextureVertex; * @COGL_FEATURE_UNSIGNED_INT_INDICES: Set if * %COGL_INDICES_TYPE_UNSIGNED_INT is supported in * cogl_vertex_buffer_indices_new(). - * @COGL_FEATURE_MAP_BUFFER_FOR_READ: Whether cogl_buffer_map() is - * supported with CoglBufferAccess including read support. - * @COGL_FEATURE_MAP_BUFFER_FOR_WRITE: Whether cogl_buffer_map() is - * supported with CoglBufferAccess including write support. * * Flags for the supported features. * @@ -139,8 +135,6 @@ typedef enum COGL_FEATURE_STENCIL_BUFFER = (1 << 10), COGL_FEATURE_PBOS = (1 << 12), COGL_FEATURE_UNSIGNED_INT_INDICES = (1 << 13), - COGL_FEATURE_MAP_BUFFER_FOR_READ = (1 << 21), - COGL_FEATURE_MAP_BUFFER_FOR_WRITE = (1 << 22), } CoglFeatureFlags; /** diff --git a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c index 72ed61332..d0152f702 100644 --- a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c +++ b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c @@ -432,8 +432,6 @@ _cogl_driver_update_features (CoglContext *ctx, COGL_FLAGS_SET (private_features, COGL_PRIVATE_FEATURE_PBOS, TRUE); - flags |= (COGL_FEATURE_MAP_BUFFER_FOR_READ | - COGL_FEATURE_MAP_BUFFER_FOR_WRITE); COGL_FLAGS_SET (ctx->features, COGL_FEATURE_ID_MAP_BUFFER_FOR_READ, TRUE); COGL_FLAGS_SET (ctx->features, COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE, TRUE); diff --git a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c index 483f6f987..67ec2917f 100644 --- a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c +++ b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c @@ -322,7 +322,6 @@ _cogl_driver_update_features (CoglContext *context, { /* The GL_OES_mapbuffer extension doesn't support mapping for read */ - flags |= COGL_FEATURE_MAP_BUFFER_FOR_WRITE; COGL_FLAGS_SET (context->features, COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE, TRUE); } @@ -330,8 +329,6 @@ _cogl_driver_update_features (CoglContext *context, if (context->glMapBufferRange) { /* MapBufferRange in ES3+ does support mapping for read */ - flags |= (COGL_FEATURE_MAP_BUFFER_FOR_WRITE | - COGL_FEATURE_MAP_BUFFER_FOR_READ); COGL_FLAGS_SET(context->features, COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE, TRUE); COGL_FLAGS_SET(context->features,