[mutter] cogl: Remove cogl_pipeline_set_layer
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cogl: Remove cogl_pipeline_set_layer
- Date: Tue, 7 Dec 2021 16:02:29 +0000 (UTC)
commit a14d3d6e1707592eaf7d4e306d4ab1962b82d0c5
Author: Fernando Monteiro <fr02monteiro gmail com>
Date: Mon Oct 18 22:44:34 2021 +0100
cogl: Remove cogl_pipeline_set_layer
This function is deprecated and must be replaced to the alternative.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2058>
cogl/cogl/deprecated/cogl-material-compat.c | 9 ---------
cogl/cogl/deprecated/cogl-material-compat.h | 26 --------------------------
2 files changed, 35 deletions(-)
---
diff --git a/cogl/cogl/deprecated/cogl-material-compat.c b/cogl/cogl/deprecated/cogl-material-compat.c
index ac59a3af7a..8c94016bb2 100644
--- a/cogl/cogl/deprecated/cogl-material-compat.c
+++ b/cogl/cogl/deprecated/cogl-material-compat.c
@@ -95,12 +95,3 @@ cogl_material_set_user_program (CoglMaterial *material,
{
cogl_pipeline_set_user_program (COGL_PIPELINE (material), program);
}
-
-void
-cogl_material_set_layer (CoglMaterial *material,
- int layer_index,
- CoglHandle texture)
-{
- cogl_pipeline_set_layer_texture (COGL_PIPELINE (material),
- layer_index, texture);
-}
diff --git a/cogl/cogl/deprecated/cogl-material-compat.h b/cogl/cogl/deprecated/cogl-material-compat.h
index cfe483b0b3..6ce3548777 100644
--- a/cogl/cogl/deprecated/cogl-material-compat.h
+++ b/cogl/cogl/deprecated/cogl-material-compat.h
@@ -393,32 +393,6 @@ COGL_EXPORT void
cogl_material_set_user_program (CoglMaterial *material,
CoglHandle program);
-/**
- * cogl_material_set_layer:
- * @material: A #CoglMaterial object
- * @layer_index: the index of the layer
- * @texture: a #CoglHandle for the layer object
- *
- * In addition to the standard OpenGL lighting model a Cogl material may have
- * one or more layers comprised of textures that can be blended together in
- * order, with a number of different texture combine modes. This function
- * defines a new texture layer.
- *
- * The index values of multiple layers do not have to be consecutive; it is
- * only their relative order that is important.
- *
- * <note>In the future, we may define other types of material layers, such
- * as purely GLSL based layers.</note>
- *
- * Since: 1.0
- * Deprecated: 1.16: Use cogl_pipeline_set_layer() instead
- */
-COGL_DEPRECATED_FOR (cogl_pipeline_set_layer)
-COGL_EXPORT void
-cogl_material_set_layer (CoglMaterial *material,
- int layer_index,
- CoglHandle texture);
-
G_END_DECLS
#endif /* __COGL_MATERIAL_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]