[mutter] cogl: Drop cogl_texture_new_from_data
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cogl: Drop cogl_texture_new_from_data
- Date: Wed, 1 Jun 2022 11:14:58 +0000 (UTC)
commit 2c520f76b5e5ac2db62fbf03512d0f8b2d0850ba
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Thu Mar 31 13:11:44 2022 -0300
cogl: Drop cogl_texture_new_from_data
And, since this is the last public function of cogl-auto-texture.h,
drop the files entirely too.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2355>
cogl/cogl/cogl-primitive.h | 88 ++++++------
cogl/cogl/cogl-types.h | 24 ----
cogl/cogl/cogl.h | 1 -
cogl/cogl/deprecated/cogl-auto-texture.c | 227 -------------------------------
cogl/cogl/deprecated/cogl-auto-texture.h | 77 -----------
cogl/cogl/meson.build | 2 -
6 files changed, 40 insertions(+), 379 deletions(-)
---
diff --git a/cogl/cogl/cogl-primitive.h b/cogl/cogl/cogl-primitive.h
index 5b3a70c88e..722ee8deef 100644
--- a/cogl/cogl/cogl-primitive.h
+++ b/cogl/cogl/cogl-primitive.h
@@ -317,12 +317,11 @@ cogl_primitive_new_with_attributes (CoglVerticesMode mode,
* <note>The primitive API doesn't support drawing with sliced
* textures (since switching between slices implies changing state and
- * so that implies multiple primitives need to be submitted). You
- * should pass the %COGL_TEXTURE_NO_SLICING flag to all textures that
- * might be used while drawing with this API. If your hardware doesn't
- * support non-power of two textures (For example you are using GLES
- * 1.1) then you will need to make sure your assets are resized to a
- * power-of-two size (though they don't have to be square)</note>
+ * so that implies multiple primitives need to be submitted). If your
+ * hardware doesn't support non-power of two textures (For example you
+ * are using GLES 1.1) then you will need to make sure your assets are
+ * resized to a power-of-two size (though they don't have to be square)
+ * </note>
*
* Return value: (transfer full): A newly allocated #CoglPrimitive
* with a reference of 1. This can be freed using cogl_object_unref().
@@ -371,12 +370,11 @@ cogl_primitive_new_p2 (CoglContext *context,
* <note>The primitive API doesn't support drawing with sliced
* textures (since switching between slices implies changing state and
- * so that implies multiple primitives need to be submitted). You
- * should pass the %COGL_TEXTURE_NO_SLICING flag to all textures that
- * might be used while drawing with this API. If your hardware doesn't
- * support non-power of two textures (For example you are using GLES
- * 1.1) then you will need to make sure your assets are resized to a
- * power-of-two size (though they don't have to be square)</note>
+ * so that implies multiple primitives need to be submitted). If your
+ * hardware doesn't support non-power of two textures (For example you
+ * are using GLES 1.1) then you will need to make sure your assets are
+ * resized to a power-of-two size (though they don't have to be square)
+ * </note>
*
* Return value: (transfer full): A newly allocated #CoglPrimitive
* with a reference of 1. This can be freed using cogl_object_unref().
@@ -427,12 +425,11 @@ cogl_primitive_new_p3 (CoglContext *context,
* <note>The primitive API doesn't support drawing with sliced
* textures (since switching between slices implies changing state and
- * so that implies multiple primitives need to be submitted). You
- * should pass the %COGL_TEXTURE_NO_SLICING flag to all textures that
- * might be used while drawing with this API. If your hardware doesn't
- * support non-power of two textures (For example you are using GLES
- * 1.1) then you will need to make sure your assets are resized to a
- * power-of-two size (though they don't have to be square)</note>
+ * so that implies multiple primitives need to be submitted). If your
+ * hardware doesn't support non-power of two textures (For example you
+ * are using GLES 1.1) then you will need to make sure your assets are
+ * resized to a power-of-two size (though they don't have to be square)
+ * </note>
*
* Return value: (transfer full): A newly allocated #CoglPrimitive
* with a reference of 1. This can be freed using cogl_object_unref().
@@ -483,12 +480,11 @@ cogl_primitive_new_p2c4 (CoglContext *context,
* <note>The primitive API doesn't support drawing with sliced
* textures (since switching between slices implies changing state and
- * so that implies multiple primitives need to be submitted). You
- * should pass the %COGL_TEXTURE_NO_SLICING flag to all textures that
- * might be used while drawing with this API. If your hardware doesn't
- * support non-power of two textures (For example you are using GLES
- * 1.1) then you will need to make sure your assets are resized to a
- * power-of-two size (though they don't have to be square)</note>
+ * so that implies multiple primitives need to be submitted). If your
+ * hardware doesn't support non-power of two textures (For example you
+ * are using GLES 1.1) then you will need to make sure your assets are
+ * resized to a power-of-two size (though they don't have to be square)
+ * </note>
*
* Return value: (transfer full): A newly allocated #CoglPrimitive
* with a reference of 1. This can be freed using cogl_object_unref().
@@ -539,12 +535,11 @@ cogl_primitive_new_p3c4 (CoglContext *context,
* <note>The primitive API doesn't support drawing with sliced
* textures (since switching between slices implies changing state and
- * so that implies multiple primitives need to be submitted). You
- * should pass the %COGL_TEXTURE_NO_SLICING flag to all textures that
- * might be used while drawing with this API. If your hardware doesn't
- * support non-power of two textures (For example you are using GLES
- * 1.1) then you will need to make sure your assets are resized to a
- * power-of-two size (though they don't have to be square)</note>
+ * so that implies multiple primitives need to be submitted). If your
+ * hardware doesn't support non-power of two textures (For example you
+ * are using GLES 1.1) then you will need to make sure your assets are
+ * resized to a power-of-two size (though they don't have to be square)
+ * </note>
*
* Return value: (transfer full): A newly allocated #CoglPrimitive
* with a reference of 1. This can be freed using cogl_object_unref().
@@ -595,12 +590,11 @@ cogl_primitive_new_p2t2 (CoglContext *context,
* <note>The primitive API doesn't support drawing with sliced
* textures (since switching between slices implies changing state and
- * so that implies multiple primitives need to be submitted). You
- * should pass the %COGL_TEXTURE_NO_SLICING flag to all textures that
- * might be used while drawing with this API. If your hardware doesn't
- * support non-power of two textures (For example you are using GLES
- * 1.1) then you will need to make sure your assets are resized to a
- * power-of-two size (though they don't have to be square)</note>
+ * so that implies multiple primitives need to be submitted). If your
+ * hardware doesn't support non-power of two textures (For example you
+ * are using GLES 1.1) then you will need to make sure your assets are
+ * resized to a power-of-two size (though they don't have to be square)
+ * </note>
*
* Return value: (transfer full): A newly allocated #CoglPrimitive
* with a reference of 1. This can be freed using cogl_object_unref().
@@ -651,12 +645,11 @@ cogl_primitive_new_p3t2 (CoglContext *context,
* <note>The primitive API doesn't support drawing with sliced
* textures (since switching between slices implies changing state and
- * so that implies multiple primitives need to be submitted). You
- * should pass the %COGL_TEXTURE_NO_SLICING flag to all textures that
- * might be used while drawing with this API. If your hardware doesn't
- * support non-power of two textures (For example you are using GLES
- * 1.1) then you will need to make sure your assets are resized to a
- * power-of-two size (though they don't have to be square)</note>
+ * so that implies multiple primitives need to be submitted). If your
+ * hardware doesn't support non-power of two textures (For example you
+ * are using GLES 1.1) then you will need to make sure your assets are
+ * resized to a power-of-two size (though they don't have to be square)
+ * </note>
*
* Return value: (transfer full): A newly allocated #CoglPrimitive
* with a reference of 1. This can be freed using cogl_object_unref().
@@ -707,12 +700,11 @@ cogl_primitive_new_p2t2c4 (CoglContext *context,
* <note>The primitive API doesn't support drawing with sliced
* textures (since switching between slices implies changing state and
- * so that implies multiple primitives need to be submitted). You
- * should pass the %COGL_TEXTURE_NO_SLICING flag to all textures that
- * might be used while drawing with this API. If your hardware doesn't
- * support non-power of two textures (For example you are using GLES
- * 1.1) then you will need to make sure your assets are resized to a
- * power-of-two size (though they don't have to be square)</note>
+ * so that implies multiple primitives need to be submitted). If your
+ * hardware doesn't support non-power of two textures (For example you
+ * are using GLES 1.1) then you will need to make sure your assets are
+ * resized to a power-of-two size (though they don't have to be square)
+ * </note>
*
* Return value: (transfer full): A newly allocated #CoglPrimitive
* with a reference of 1. This can be freed using cogl_object_unref().
diff --git a/cogl/cogl/cogl-types.h b/cogl/cogl/cogl-types.h
index c55ad1f4cd..2392b450e3 100644
--- a/cogl/cogl/cogl-types.h
+++ b/cogl/cogl/cogl-types.h
@@ -184,30 +184,6 @@ struct _CoglTextureVertex
};
COGL_STRUCT_SIZE_ASSERT (CoglTextureVertex, 36);
-/**
- * CoglTextureFlags:
- * @COGL_TEXTURE_NONE: No flags specified
- * @COGL_TEXTURE_NO_AUTO_MIPMAP: Disables the automatic generation of
- * the mipmap pyramid from the base level image whenever it is
- * updated. The mipmaps are only generated when the texture is
- * rendered with a mipmap filter so it should be free to leave out
- * this flag when using other filtering modes
- * @COGL_TEXTURE_NO_SLICING: Disables the slicing of the texture
- * @COGL_TEXTURE_NO_ATLAS: Disables the insertion of the texture inside
- * the texture atlas used by Cogl
- *
- * Flags to pass to the cogl_texture_new_* family of functions.
- *
- * Since: 1.0
- */
-typedef enum
-{
- COGL_TEXTURE_NONE = 0,
- COGL_TEXTURE_NO_AUTO_MIPMAP = 1 << 0,
- COGL_TEXTURE_NO_SLICING = 1 << 1,
- COGL_TEXTURE_NO_ATLAS = 1 << 2
-} CoglTextureFlags;
-
/**
* COGL_BLEND_STRING_ERROR:
*
diff --git a/cogl/cogl/cogl.h b/cogl/cogl/cogl.h
index 5c13614d4f..dad3b93f39 100644
--- a/cogl/cogl/cogl.h
+++ b/cogl/cogl/cogl.h
@@ -83,7 +83,6 @@
* they enable the experimental api... */
#include <cogl/deprecated/cogl-type-casts.h>
-#include <cogl/deprecated/cogl-auto-texture.h>
#include <cogl/deprecated/cogl-shader.h>
#ifdef COGL_ENABLE_MUTTER_API
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index 3618524a9e..0bbf58bb97 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -65,7 +65,6 @@ cogl_deprecated_headers = [
'deprecated/cogl-shader.h',
'deprecated/cogl-clutter.h',
'deprecated/cogl-type-casts.h',
- 'deprecated/cogl-auto-texture.h',
]
cogl_headers = [
@@ -349,7 +348,6 @@ cogl_sources = [
'cogl-scanout.c',
'deprecated/cogl-program.c',
'deprecated/cogl-program-private.h',
- 'deprecated/cogl-auto-texture.c',
'deprecated/cogl-shader-private.h',
'deprecated/cogl-shader.c',
'deprecated/cogl-clutter.c',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]