From ba7b8a5de335ae9f34c4640c71faeca58dc34ca9 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 17 Oct 2019 21:16:13 -0400 Subject: [PATCH] cogl: Remove unused COGL_FEATURE_TEXTURE_YUV https://gitlab.gnome.org/GNOME/mutter/merge_requests/866 --- clutter/clutter/clutter-enums.h | 2 -- clutter/clutter/clutter-feature.c | 3 --- cogl/cogl/cogl-types.h | 2 -- 3 files changed, 7 deletions(-) diff --git a/clutter/clutter/clutter-enums.h b/clutter/clutter/clutter-enums.h index e5ea7e3c7..23b0ab2e1 100644 --- a/clutter/clutter/clutter-enums.h +++ b/clutter/clutter/clutter-enums.h @@ -970,7 +970,6 @@ typedef enum /** * ClutterFeatureFlags: * @CLUTTER_FEATURE_SWAP_THROTTLE: Set if backend throttles buffer swaps. - * @CLUTTER_FEATURE_TEXTURE_YUV: Set if YUV based textures supported. * @CLUTTER_FEATURE_STAGE_STATIC: Set if stage size if fixed (i.e framebuffer) * @CLUTTER_FEATURE_STAGE_CURSOR: Set if stage has a graphical cursor. * @CLUTTER_FEATURE_SHADERS_GLSL: Set if the backend supports GLSL shaders. @@ -986,7 +985,6 @@ typedef enum typedef enum { CLUTTER_FEATURE_SWAP_THROTTLE = (1 << 3), - CLUTTER_FEATURE_TEXTURE_YUV = (1 << 4), CLUTTER_FEATURE_STAGE_STATIC = (1 << 6), CLUTTER_FEATURE_STAGE_CURSOR = (1 << 8), CLUTTER_FEATURE_SHADERS_GLSL = (1 << 9), diff --git a/clutter/clutter/clutter-feature.c b/clutter/clutter/clutter-feature.c index b3c9fade8..db99dcec3 100644 --- a/clutter/clutter/clutter-feature.c +++ b/clutter/clutter/clutter-feature.c @@ -64,9 +64,6 @@ clutter_features_from_cogl (guint cogl_flags) { ClutterFeatureFlags clutter_flags = 0; - if (cogl_flags & COGL_FEATURE_TEXTURE_YUV) - clutter_flags |= CLUTTER_FEATURE_TEXTURE_YUV; - clutter_flags |= CLUTTER_FEATURE_SHADERS_GLSL; clutter_flags |= CLUTTER_FEATURE_OFFSCREEN; diff --git a/cogl/cogl/cogl-types.h b/cogl/cogl/cogl-types.h index 8d1c1bcfd..f5693a27f 100644 --- a/cogl/cogl/cogl-types.h +++ b/cogl/cogl/cogl-types.h @@ -112,7 +112,6 @@ typedef struct _CoglTextureVertex CoglTextureVertex; /** * CoglFeatureFlags: - * @COGL_FEATURE_TEXTURE_YUV: ycbcr conversion support * @COGL_FEATURE_PBOS: PBO support * * Flags for the supported features. @@ -121,7 +120,6 @@ typedef struct _CoglTextureVertex CoglTextureVertex; */ typedef enum { - COGL_FEATURE_TEXTURE_YUV = (1 << 3), COGL_FEATURE_PBOS = (1 << 12), } CoglFeatureFlags;