[mutter] clutter: Remove unused deprecated clutter_texture_set_from_yuv_data



commit d54c548aacb4714530149ca2dc45fcd934a58880
Author: Adam Jackson <ajax redhat com>
Date:   Thu Oct 17 21:14:12 2019 -0400

    clutter: Remove unused deprecated clutter_texture_set_from_yuv_data
    
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/866

 clutter/clutter/clutter-enums.h              |  3 +-
 clutter/clutter/clutter-texture.h            |  3 +-
 clutter/clutter/deprecated/clutter-texture.c | 61 ----------------------------
 clutter/clutter/deprecated/clutter-texture.h |  8 ----
 4 files changed, 2 insertions(+), 73 deletions(-)
---
diff --git a/clutter/clutter/clutter-enums.h b/clutter/clutter/clutter-enums.h
index 10f8d345f..e5ea7e3c7 100644
--- a/clutter/clutter/clutter-enums.h
+++ b/clutter/clutter/clutter-enums.h
@@ -1215,8 +1215,7 @@ typedef enum
  * @CLUTTER_TEXTURE_RGB_FLAG_PREMULT: Unused flag
  * @CLUTTER_TEXTURE_YUV_FLAG_YUV2: Unused flag
  *
- * Flags for clutter_texture_set_from_rgb_data() and
- * clutter_texture_set_from_yuv_data().
+ * Flags for clutter_texture_set_from_rgb_data().
  *
  * Since: 0.4
  *
diff --git a/clutter/clutter/clutter-texture.h b/clutter/clutter/clutter-texture.h
index 8473c05e0..00f9237c0 100644
--- a/clutter/clutter/clutter-texture.h
+++ b/clutter/clutter/clutter-texture.h
@@ -46,8 +46,7 @@ G_BEGIN_DECLS
  * @CLUTTER_TEXTURE_ERROR_NO_YUV: YUV operation attempted but no YUV support
  *   found
  * @CLUTTER_TEXTURE_ERROR_BAD_FORMAT: The requested format for
- * clutter_texture_set_from_rgb_data or
- * clutter_texture_set_from_yuv_data is unsupported.
+ * clutter_texture_set_from_rgb_data is unsupported.
  *
  * Error enumeration for #ClutterTexture
  *
diff --git a/clutter/clutter/deprecated/clutter-texture.c b/clutter/clutter/deprecated/clutter-texture.c
index b53a2dee1..9cbbb6fd4 100644
--- a/clutter/clutter/deprecated/clutter-texture.c
+++ b/clutter/clutter/deprecated/clutter-texture.c
@@ -1595,67 +1595,6 @@ clutter_texture_set_from_rgb_data (ClutterTexture       *texture,
                                        error);
 }
 
-/**
- * clutter_texture_set_from_yuv_data:
- * @texture: A #ClutterTexture
- * @data: (array): Image data in YUV type colorspace.
- * @width: Width in pixels of image data.
- * @height: Height in pixels of image data
- * @flags: #ClutterTextureFlags
- * @error: Return location for a #GError, or %NULL.
- *
- * Sets a #ClutterTexture from YUV image data. If an error occurred,
- * %FALSE is returned and @error is set.
- *
- * The YUV support depends on the driver; the format supported by the
- * few drivers exposing this capability are not really useful.
- *
- * The proper way to convert image data in any YUV colorspace to any
- * RGB colorspace is to use a fragment shader associated with the
- * #ClutterTexture material.
- *
- * Return value: %TRUE if the texture was successfully updated
- *
- * Since: 0.4
- *
- * Deprecated: 1.10: Use a custom #ClutterContent implementation and
- *   set up the Cogl pipeline using a #ClutterPipelineNode with a
- *   fragment shader instead.
- */
-gboolean
-clutter_texture_set_from_yuv_data (ClutterTexture     *texture,
-                                  const guchar       *data,
-                                  gint                width,
-                                  gint                height,
-                                  ClutterTextureFlags flags,
-                                  GError            **error)
-{
-  g_return_val_if_fail (CLUTTER_IS_TEXTURE (texture), FALSE);
-
-  if (!clutter_feature_available (CLUTTER_FEATURE_TEXTURE_YUV))
-    {
-      g_set_error (error, CLUTTER_TEXTURE_ERROR,
-                   CLUTTER_TEXTURE_ERROR_NO_YUV,
-                   "YUV textures are not supported");
-      return FALSE;
-    }
-
-  /* Convert the flags to a CoglPixelFormat */
-  if ((flags & CLUTTER_TEXTURE_YUV_FLAG_YUV2))
-    {
-      g_set_error (error, CLUTTER_TEXTURE_ERROR,
-                  CLUTTER_TEXTURE_ERROR_BAD_FORMAT,
-                  "YUV2 textures are not supported");
-      return FALSE;
-    }
-
-  return clutter_texture_set_from_data (texture, data,
-                                       COGL_PIXEL_FORMAT_YUV,
-                                       width, height,
-                                       width * 3, 3,
-                                       error);
-}
-
 /*
  * clutter_texture_async_load_complete:
  * @self: a #ClutterTexture
diff --git a/clutter/clutter/deprecated/clutter-texture.h b/clutter/clutter/deprecated/clutter-texture.h
index 5dfda27b2..37316303e 100644
--- a/clutter/clutter/deprecated/clutter-texture.h
+++ b/clutter/clutter/deprecated/clutter-texture.h
@@ -123,14 +123,6 @@ gboolean                clutter_texture_get_pick_with_alpha     (ClutterTexture
 CLUTTER_DEPRECATED_FOR(ClutterOffscreenEffect)
 ClutterActor *          clutter_texture_new_from_actor          (ClutterActor           *actor);
 
-CLUTTER_DEPRECATED
-gboolean                clutter_texture_set_from_yuv_data       (ClutterTexture         *texture,
-                                                                 const guchar           *data,
-                                                                 gint                    width,
-                                                                 gint                    height,
-                                                                 ClutterTextureFlags     flags,
-                                                                 GError                **error);
-
 G_END_DECLS
 
 #endif /* __CLUTTER_TEXTURE_DEPRECATED_H__ */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]