From 9b16b74b5d8c814af0b3812d909c23d676558be4 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 22 Oct 2019 13:47:12 -0400 Subject: [PATCH] cogl: Remove unused stuff from cogl-material-compat.[ch] You could probably move (most of) what's left into a static-inline kind of header that only gets consumed by the tests. https://gitlab.gnome.org/GNOME/mutter/merge_requests/922 --- cogl/cogl/deprecated/cogl-material-compat.c | 220 -------- cogl/cogl/deprecated/cogl-material-compat.h | 549 -------------------- 2 files changed, 769 deletions(-) diff --git a/cogl/cogl/deprecated/cogl-material-compat.c b/cogl/cogl/deprecated/cogl-material-compat.c index b4fafdad4..23c03ea0a 100644 --- a/cogl/cogl/deprecated/cogl-material-compat.c +++ b/cogl/cogl/deprecated/cogl-material-compat.c @@ -48,30 +48,6 @@ cogl_material_new (void) return COGL_MATERIAL (cogl_pipeline_new (ctx)); } -CoglMaterial * -cogl_material_copy (CoglMaterial *source) -{ - return COGL_MATERIAL (cogl_pipeline_copy (COGL_PIPELINE (source))); -} - -CoglHandle -cogl_material_ref (CoglHandle handle) -{ - return cogl_object_ref (handle); -} - -void -cogl_material_unref (CoglHandle handle) -{ - cogl_object_unref (handle); -} - -gboolean -cogl_is_material (CoglHandle handle) -{ - return cogl_is_pipeline (handle); -} - void cogl_material_set_color (CoglMaterial *material, const CoglColor *color) @@ -90,34 +66,6 @@ cogl_material_set_color4ub (CoglMaterial *material, red, green, blue, alpha); } -void -cogl_material_set_color4f (CoglMaterial *material, - float red, - float green, - float blue, - float alpha) -{ - cogl_pipeline_set_color4f (COGL_PIPELINE (material), - red, green, blue, alpha); -} - -void -cogl_material_get_color (CoglMaterial *material, - CoglColor *color) -{ - cogl_pipeline_get_color (COGL_PIPELINE (material), color); -} - -void -cogl_material_set_alpha_test_function (CoglMaterial *material, - CoglMaterialAlphaFunc alpha_func, - float alpha_reference) -{ - cogl_pipeline_set_alpha_test_function (COGL_PIPELINE (material), - alpha_func, - alpha_reference); -} - gboolean cogl_material_set_blend (CoglMaterial *material, const char *blend_string, @@ -142,18 +90,6 @@ cogl_material_set_point_size (CoglMaterial *material, cogl_pipeline_set_point_size (COGL_PIPELINE (material), point_size); } -float -cogl_material_get_point_size (CoglMaterial *material) -{ - return cogl_pipeline_get_point_size (COGL_PIPELINE (material)); -} - -CoglHandle -cogl_material_get_user_program (CoglMaterial *material) -{ - return cogl_pipeline_get_user_program (COGL_PIPELINE (material)); -} - void cogl_material_set_user_program (CoglMaterial *material, CoglHandle program) @@ -170,13 +106,6 @@ cogl_material_set_layer (CoglMaterial *material, layer_index, texture); } -void -cogl_material_remove_layer (CoglMaterial *material, - int layer_index) -{ - cogl_pipeline_remove_layer (COGL_PIPELINE (material), layer_index); -} - gboolean cogl_material_set_layer_combine (CoglMaterial *material, int layer_index, @@ -208,42 +137,6 @@ cogl_material_set_layer_matrix (CoglMaterial *material, layer_index, matrix); } -const GList * -cogl_material_get_layers (CoglMaterial *material) -{ - return _cogl_pipeline_get_layers (COGL_PIPELINE (material)); -} - -int -cogl_material_get_n_layers (CoglMaterial *material) -{ - return cogl_pipeline_get_n_layers (COGL_PIPELINE (material)); -} - -CoglMaterialLayerType -cogl_material_layer_get_type (CoglMaterialLayer *layer) -{ - return COGL_MATERIAL_LAYER_TYPE_TEXTURE; -} - -CoglHandle -cogl_material_layer_get_texture (CoglMaterialLayer *layer) -{ - return _cogl_pipeline_layer_get_texture (COGL_PIPELINE_LAYER (layer)); -} - -CoglMaterialFilter -cogl_material_layer_get_min_filter (CoglMaterialLayer *layer) -{ - return _cogl_pipeline_layer_get_min_filter (COGL_PIPELINE_LAYER (layer)); -} - -CoglMaterialFilter -cogl_material_layer_get_mag_filter (CoglMaterialLayer *layer) -{ - return _cogl_pipeline_layer_get_mag_filter (COGL_PIPELINE_LAYER (layer)); -} - void cogl_material_set_layer_filters (CoglMaterial *material, int layer_index, @@ -268,116 +161,3 @@ cogl_material_set_layer_point_sprite_coords_enabled (CoglMaterial *material, enable, error); } - -gboolean -cogl_material_get_layer_point_sprite_coords_enabled (CoglMaterial *material, - int layer_index) -{ - CoglPipeline *pipeline = COGL_PIPELINE (material); - return cogl_pipeline_get_layer_point_sprite_coords_enabled (pipeline, - layer_index); -} - -CoglMaterialWrapMode -cogl_material_get_layer_wrap_mode_s (CoglMaterial *material, - int layer_index) -{ - return cogl_pipeline_get_layer_wrap_mode_s (COGL_PIPELINE (material), - layer_index); -} - -void -cogl_material_set_layer_wrap_mode_s (CoglMaterial *material, - int layer_index, - CoglMaterialWrapMode mode) -{ - cogl_pipeline_set_layer_wrap_mode_s (COGL_PIPELINE (material), layer_index, - mode); -} - -CoglMaterialWrapMode -cogl_material_get_layer_wrap_mode_t (CoglMaterial *material, - int layer_index) -{ - return cogl_pipeline_get_layer_wrap_mode_t (COGL_PIPELINE (material), - layer_index); -} - -void -cogl_material_set_layer_wrap_mode_t (CoglMaterial *material, - int layer_index, - CoglMaterialWrapMode mode) -{ - cogl_pipeline_set_layer_wrap_mode_t (COGL_PIPELINE (material), layer_index, - mode); -} - -CoglMaterialWrapMode -cogl_material_get_layer_wrap_mode_p (CoglMaterial *material, - int layer_index) -{ - return cogl_pipeline_get_layer_wrap_mode_p (COGL_PIPELINE (material), - layer_index); -} - -void -cogl_material_set_layer_wrap_mode_p (CoglMaterial *material, - int layer_index, - CoglMaterialWrapMode mode) -{ - cogl_pipeline_set_layer_wrap_mode_p (COGL_PIPELINE (material), layer_index, - mode); -} - -void -cogl_material_set_layer_wrap_mode (CoglMaterial *material, - int layer_index, - CoglMaterialWrapMode mode) -{ - cogl_pipeline_set_layer_wrap_mode (COGL_PIPELINE (material), layer_index, - mode); -} - -CoglMaterialWrapMode -cogl_material_layer_get_wrap_mode_s (CoglMaterialLayer *layer) -{ - return _cogl_pipeline_layer_get_wrap_mode_s (COGL_PIPELINE_LAYER (layer)); -} - -CoglMaterialWrapMode -cogl_material_layer_get_wrap_mode_t (CoglMaterialLayer *layer) -{ - return _cogl_pipeline_layer_get_wrap_mode_t (COGL_PIPELINE_LAYER (layer)); -} - -CoglMaterialWrapMode -cogl_material_layer_get_wrap_mode_p (CoglMaterialLayer *layer) -{ - return _cogl_pipeline_layer_get_wrap_mode_p (COGL_PIPELINE_LAYER (layer)); -} - -void -cogl_material_foreach_layer (CoglMaterial *material, - CoglMaterialLayerCallback callback, - void *user_data) -{ - cogl_pipeline_foreach_layer (COGL_PIPELINE (material), - (CoglPipelineLayerCallback)callback, user_data); -} - -gboolean -cogl_material_set_depth_state (CoglMaterial *material, - const CoglDepthState *state, - GError **error) -{ - return cogl_pipeline_set_depth_state (COGL_PIPELINE (material), - state, error); -} - -void -cogl_material_get_depth_state (CoglMaterial *material, - CoglDepthState *state_out) -{ - cogl_pipeline_get_depth_state (COGL_PIPELINE (material), state_out); -} - diff --git a/cogl/cogl/deprecated/cogl-material-compat.h b/cogl/cogl/deprecated/cogl-material-compat.h index 94ae20d57..8e678bad8 100644 --- a/cogl/cogl/deprecated/cogl-material-compat.h +++ b/cogl/cogl/deprecated/cogl-material-compat.h @@ -153,72 +153,6 @@ COGL_DEPRECATED_FOR (cogl_pipeline_new) CoglMaterial * cogl_material_new (void); -/** - * cogl_material_copy: - * @source: a #CoglMaterial object to copy - * - * Creates a new material with the configuration copied from the - * source material. - * - * We would strongly advise developers to always aim to use - * cogl_material_copy() instead of cogl_material_new() whenever there will - * be any similarity between two materials. Copying a material helps Cogl - * keep track of a materials ancestry which we may use to help minimize GPU - * state changes. - * - * Returns: a pointer to the newly allocated #CoglMaterial - * - * Since: 1.2 - * Deprecated: 1.16: Use cogl_pipeline_copy() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_copy) -CoglMaterial * -cogl_material_copy (CoglMaterial *source); - -/** - * cogl_material_ref: - * @material: a #CoglMaterial object. - * - * Increment the reference count for a #CoglMaterial. - * - * Return value: the @material. - * - * Since: 1.0 - * - * Deprecated: 1.2: Use cogl_object_ref() instead - */ -COGL_DEPRECATED -CoglHandle -cogl_material_ref (CoglHandle material); - -/** - * cogl_material_unref: - * @material: a #CoglMaterial object. - * - * Decrement the reference count for a #CoglMaterial. - * - * Since: 1.0 - * - * Deprecated: 1.2: Use cogl_object_unref() instead - */ -COGL_DEPRECATED -void -cogl_material_unref (CoglHandle material); - -/** - * cogl_is_material: - * @handle: A CoglHandle - * - * Gets whether the given handle references an existing material object. - * - * Return value: %TRUE if the handle references a #CoglMaterial, - * %FALSE otherwise - * Deprecated: 1.16: Use cogl_is_pipeline() instead - */ -COGL_DEPRECATED_FOR (cogl_is_pipeline) -gboolean -cogl_is_material (CoglHandle handle); - /** * cogl_material_set_color: * @material: A #CoglMaterial object @@ -264,44 +198,6 @@ cogl_material_set_color4ub (CoglMaterial *material, uint8_t blue, uint8_t alpha); -/** - * cogl_material_set_color4f: - * @material: A #CoglMaterial object - * @red: The red component - * @green: The green component - * @blue: The blue component - * @alpha: The alpha component - * - * Sets the basic color of the material, used when no lighting is enabled. - * - * The default value is (1.0, 1.0, 1.0, 1.0) - * - * Since: 1.0 - * Deprecated: 1.16: Use cogl_pipeline_set_color4f() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_set_color4f) -void -cogl_material_set_color4f (CoglMaterial *material, - float red, - float green, - float blue, - float alpha); - -/** - * cogl_material_get_color: - * @material: A #CoglMaterial object - * @color: (out): The location to store the color - * - * Retrieves the current material color. - * - * Since: 1.0 - * Deprecated: 1.16: Use cogl_pipeline_get_color() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_get_color) -void -cogl_material_get_color (CoglMaterial *material, - CoglColor *color); - /** * CoglMaterialAlphaFunc: * @COGL_MATERIAL_ALPHA_FUNC_NEVER: Never let the fragment through. @@ -488,39 +384,6 @@ void cogl_material_set_point_size (CoglMaterial *material, float point_size); -/** - * cogl_material_get_point_size: - * @material: a #CoglHandle to a material. - * - * Get the size of points drawn when %COGL_VERTICES_MODE_POINTS is - * used with the vertex buffer API. - * - * Return value: the point size of the material. - * - * Since: 1.4 - * Deprecated: 1.16: Use cogl_pipeline_get_point_size() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_get_point_size) -float -cogl_material_get_point_size (CoglMaterial *material); - -/** - * cogl_material_get_user_program: - * @material: a #CoglMaterial object. - * - * Queries what user program has been associated with the given - * @material using cogl_material_set_user_program(). - * - * Return value: (transfer none): The current user program - * or %NULL. - * - * Since: 1.4 - * Deprecated: 1.16: Use #CoglSnippet api instead instead - */ -COGL_DEPRECATED_FOR (cogl_snippet_) -CoglHandle -cogl_material_get_user_program (CoglMaterial *material); - /** * cogl_material_set_user_program: * @material: a #CoglMaterial object. @@ -595,20 +458,6 @@ cogl_material_set_layer (CoglMaterial *material, int layer_index, CoglHandle texture); -/** - * cogl_material_remove_layer: - * @material: A #CoglMaterial object - * @layer_index: Specifies the layer you want to remove - * - * This function removes a layer from your material - * Deprecated: 1.16: Use cogl_pipeline_remove_layer() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_remove_layer) -void -cogl_material_remove_layer (CoglMaterial *material, - int layer_index); - - /** * cogl_material_set_layer_combine: * @material: A #CoglMaterial object @@ -745,126 +594,6 @@ cogl_material_set_layer_matrix (CoglMaterial *material, int layer_index, const CoglMatrix *matrix); -/** - * cogl_material_get_layers: - * @material: A #CoglMaterial object - * - * This function lets you access a material's internal list of layers - * for iteration. - * - * You should avoid using this API if possible since it was only - * made public by mistake and will be deprecated when we have - * suitable alternative. - * - * It's important to understand that the list returned may not - * remain valid if you modify the material or any of the layers in any - * way and so you would have to re-get the list in that - * situation. - * - * Return value: (element-type CoglMaterialLayer) (transfer none): A - * list of #CoglMaterialLayer's that can be passed to the - * cogl_material_layer_* functions. The list is owned by Cogl and it - * should not be modified or freed - * Deprecated: 1.16: Use cogl_pipeline_get_layers() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_get_layers) -const GList * -cogl_material_get_layers (CoglMaterial *material); - -/** - * cogl_material_get_n_layers: - * @material: A #CoglMaterial object - * - * Retrieves the number of layers defined for the given @material - * - * Return value: the number of layers - * - * Since: 1.0 - * Deprecated: 1.16: Use cogl_pipeline_get_n_layers() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_get_n_layers) -int -cogl_material_get_n_layers (CoglMaterial *material); - -/** - * CoglMaterialLayerType: - * @COGL_MATERIAL_LAYER_TYPE_TEXTURE: The layer represents a - * texture - * - * Available types of layers for a #CoglMaterial. This enumeration - * might be expanded in later versions. - * - * Since: 1.0 - */ -typedef enum -{ - COGL_MATERIAL_LAYER_TYPE_TEXTURE -} CoglMaterialLayerType; - - -/** - * cogl_material_layer_get_type: - * @layer: A #CoglMaterialLayer object - * - * Retrieves the type of the layer - * - * Currently there is only one type of layer defined: - * %COGL_MATERIAL_LAYER_TYPE_TEXTURE, but considering we may add purely GLSL - * based layers in the future, you should write code that checks the type - * first. - * - * Return value: the type of the layer - * Deprecated: 1.16: No replacement - */ -COGL_DEPRECATED -CoglMaterialLayerType -cogl_material_layer_get_type (CoglMaterialLayer *layer); - -/** - * cogl_material_layer_get_texture: - * @layer: A #CoglMaterialLayer object - * - * Extracts a texture handle for a specific layer. - * - * In the future Cogl may support purely GLSL based layers; for those - * layers this function which will likely return %NULL if you - * try to get the texture handle from them. Considering this scenario, you - * should call cogl_material_layer_get_type() first in order check it is of - * type %COGL_MATERIAL_LAYER_TYPE_TEXTURE before calling this function. - * - * Return value: (transfer none): a #CoglHandle for the texture inside the layer - * Deprecated: 1.16: No replacement - */ -COGL_DEPRECATED -CoglHandle -cogl_material_layer_get_texture (CoglMaterialLayer *layer); - -/** - * cogl_material_layer_get_min_filter: - * @layer: a #CoglHandle for a material layer - * - * Queries the currently set downscaling filter for a material layer - * - * Return value: the current downscaling filter - * Deprecated: 1.16: No replacement - */ -COGL_DEPRECATED -CoglMaterialFilter -cogl_material_layer_get_min_filter (CoglMaterialLayer *layer); - -/** - * cogl_material_layer_get_mag_filter: - * @layer: A #CoglMaterialLayer object - * - * Queries the currently set downscaling filter for a material later - * - * Return value: the current downscaling filter - * Deprecated: 1.16: No replacement - */ -COGL_DEPRECATED -CoglMaterialFilter -cogl_material_layer_get_mag_filter (CoglMaterialLayer *layer); - /** * cogl_material_set_layer_filters: * @material: A #CoglMaterial object @@ -909,284 +638,6 @@ cogl_material_set_layer_point_sprite_coords_enabled (CoglMaterial *material, gboolean enable, GError **error); -/** - * cogl_material_get_layer_point_sprite_coords_enabled: - * @material: a #CoglHandle to a material. - * @layer_index: the layer number to check. - * - * Gets whether point sprite coordinate generation is enabled for this - * texture layer. - * - * Return value: whether the texture coordinates will be replaced with - * point sprite coordinates. - * - * Since: 1.4 - * Deprecated: 1.16: Use cogl_pipeline_get_layer_point_sprite_coords_enabled() - * instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_get_layer_point_sprite_coords_enabled) -gboolean -cogl_material_get_layer_point_sprite_coords_enabled (CoglMaterial *material, - int layer_index); - -/** - * cogl_material_get_layer_wrap_mode_s: - * @material: A #CoglMaterial object - * @layer_index: the layer number to change. - * - * Returns the wrap mode for the 's' coordinate of texture lookups on this - * layer. - * - * Return value: the wrap mode for the 's' coordinate of texture lookups on - * this layer. - * - * Since: 1.6 - * Deprecated: 1.16: Use cogl_pipeline_get_layer_wrap_mode_s() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_get_layer_wrap_mode_s) -CoglMaterialWrapMode -cogl_material_get_layer_wrap_mode_s (CoglMaterial *material, - int layer_index); - -/** - * cogl_material_set_layer_wrap_mode_s: - * @material: A #CoglMaterial object - * @layer_index: the layer number to change. - * @mode: the new wrap mode - * - * Sets the wrap mode for the 's' coordinate of texture lookups on this layer. - * - * Since: 1.4 - * Deprecated: 1.16: Use cogl_pipeline_set_layer_wrap_mode_s() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_set_layer_wrap_mode_s) -void -cogl_material_set_layer_wrap_mode_s (CoglMaterial *material, - int layer_index, - CoglMaterialWrapMode mode); - -/** - * cogl_material_get_layer_wrap_mode_t: - * @material: A #CoglMaterial object - * @layer_index: the layer number to change. - * - * Returns the wrap mode for the 't' coordinate of texture lookups on this - * layer. - * - * Return value: the wrap mode for the 't' coordinate of texture lookups on - * this layer. - * - * Since: 1.6 - * Deprecated: 1.16: Use cogl_pipeline_get_layer_wrap_mode_t() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_get_layer_wrap_mode_t) -CoglMaterialWrapMode -cogl_material_get_layer_wrap_mode_t (CoglMaterial *material, - int layer_index); - - -/** - * cogl_material_set_layer_wrap_mode_t: - * @material: A #CoglMaterial object - * @layer_index: the layer number to change. - * @mode: the new wrap mode - * - * Sets the wrap mode for the 't' coordinate of texture lookups on this layer. - * - * Since: 1.4 - * Deprecated: 1.16: Use cogl_pipeline_set_layer_wrap_mode_t() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_set_layer_wrap_mode_t) -void -cogl_material_set_layer_wrap_mode_t (CoglMaterial *material, - int layer_index, - CoglMaterialWrapMode mode); - -/** - * cogl_material_get_layer_wrap_mode_p: - * @material: A #CoglMaterial object - * @layer_index: the layer number to change. - * - * Returns the wrap mode for the 'p' coordinate of texture lookups on this - * layer. - * - * Return value: the wrap mode for the 'p' coordinate of texture lookups on - * this layer. - * - * Since: 1.6 - * Deprecated: 1.16: Use cogl_pipeline_get_layer_wrap_mode_p() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_get_layer_wrap_mode_p) -CoglMaterialWrapMode -cogl_material_get_layer_wrap_mode_p (CoglMaterial *material, - int layer_index); - -/** - * cogl_material_set_layer_wrap_mode_p: - * @material: A #CoglMaterial object - * @layer_index: the layer number to change. - * @mode: the new wrap mode - * - * Sets the wrap mode for the 'p' coordinate of texture lookups on - * this layer. 'p' is the third coordinate. - * - * Since: 1.4 - * Deprecated: 1.16: Use cogl_pipeline_set_layer_wrap_mode_p() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_set_layer_wrap_mode_p) -void -cogl_material_set_layer_wrap_mode_p (CoglMaterial *material, - int layer_index, - CoglMaterialWrapMode mode); - -/** - * cogl_material_set_layer_wrap_mode: - * @material: A #CoglMaterial object - * @layer_index: the layer number to change. - * @mode: the new wrap mode - * - * Sets the wrap mode for all three coordinates of texture lookups on - * this layer. This is equivalent to calling - * cogl_material_set_layer_wrap_mode_s(), - * cogl_material_set_layer_wrap_mode_t() and - * cogl_material_set_layer_wrap_mode_p() separately. - * - * Since: 1.4 - * Deprecated: 1.16: Use cogl_pipeline_set_layer_wrap_mode() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_set_layer_wrap_mode) -void -cogl_material_set_layer_wrap_mode (CoglMaterial *material, - int layer_index, - CoglMaterialWrapMode mode); - -/** - * cogl_material_layer_get_wrap_mode_s: - * @layer: A #CoglMaterialLayer object - * - * Gets the wrap mode for the 's' coordinate of texture lookups on this layer. - * - * Return value: the wrap mode value for the s coordinate. - * - * Since: 1.4 - * Deprecated: 1.16: Use cogl_pipeline_layer_get_wrap_mode_s() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_layer_get_wrap_mode_s) -CoglMaterialWrapMode -cogl_material_layer_get_wrap_mode_s (CoglMaterialLayer *layer); - -/** - * cogl_material_layer_get_wrap_mode_t: - * @layer: A #CoglMaterialLayer object - * - * Gets the wrap mode for the 't' coordinate of texture lookups on this layer. - * - * Return value: the wrap mode value for the t coordinate. - * - * Since: 1.4 - * Deprecated: 1.16: Use cogl_pipeline_layer_get_wrap_mode_t() instead - */ - -COGL_DEPRECATED_FOR (cogl_pipeline_layer_get_wrap_mode_t) -CoglMaterialWrapMode -cogl_material_layer_get_wrap_mode_t (CoglMaterialLayer *layer); - -/** - * cogl_material_layer_get_wrap_mode_p: - * @layer: A #CoglMaterialLayer object - * - * Gets the wrap mode for the 'p' coordinate of texture lookups on - * this layer. 'p' is the third coordinate. - * - * Return value: the wrap mode value for the p coordinate. - * - * Since: 1.4 - * Deprecated: 1.16: Use cogl_pipeline_layer_get_wrap_mode_p() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_layer_get_wrap_mode_p) -CoglMaterialWrapMode -cogl_material_layer_get_wrap_mode_p (CoglMaterialLayer *layer); - -/** - * cogl_material_set_depth_state: (skip) - * @material: A #CoglMaterial object - * @state: A #CoglDepthState struct - * @error: A #GError to report failures to setup the given @state. - * - * This commits all the depth state configured in @state struct to the - * given @material. The configuration values are copied into the - * material so there is no requirement to keep the #CoglDepthState - * struct around if you don't need it any more. - * - * Note: Since some platforms do not support the depth range feature - * it is possible for this function to fail and report an @error. - * - * Returns: TRUE if the GPU supports all the given @state else %FALSE - * and returns an @error. - * - * Since: 1.8 - * Stability: Unstable - * Deprecated: 1.16: Use cogl_pipeline_set_depth_state() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_set_depth_state) -gboolean -cogl_material_set_depth_state (CoglMaterial *material, - const CoglDepthState *state, - GError **error); - -/** - * cogl_material_get_depth_state: (skip) - * @material: A #CoglMaterial object - * @state_out: A destination #CoglDepthState struct - * - * Retrieves the current depth state configuration for the given - * @pipeline as previously set using cogl_pipeline_set_depth_state(). - * - * Since: 2.0 - * Stability: Unstable - * Deprecated: 1.16: Use cogl_pipeline_get_depth_state() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_get_depth_state) -void -cogl_material_get_depth_state (CoglMaterial *material, - CoglDepthState *state_out); - -/** - * CoglMaterialLayerCallback: - * @material: The #CoglMaterial whos layers are being iterated - * @layer_index: The current layer index - * @user_data: The private data passed to cogl_material_foreach_layer() - * - * The callback prototype used with cogl_material_foreach_layer() for - * iterating all the layers of a @material. - * - * Since: 1.4 - * Stability: Unstable - * Deprecated: 1.16 - */ -typedef gboolean (*CoglMaterialLayerCallback) (CoglMaterial *material, - int layer_index, - void *user_data); - -/** - * cogl_material_foreach_layer: - * @material: A #CoglMaterial object - * @callback: (scope call): A #CoglMaterialLayerCallback to be called for each - * layer index - * @user_data: Private data that will be passed to the callback - * - * Iterates all the layer indices of the given @material. - * - * Since: 1.4 - * Stability: Unstable - * Deprecated: 1.16: No replacement - */ -COGL_DEPRECATED -void -cogl_material_foreach_layer (CoglMaterial *material, - CoglMaterialLayerCallback callback, - void *user_data); - G_END_DECLS #endif /* __COGL_MATERIAL_H__ */