[mutter] cogl: Remove unused deprecated material lighting API
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cogl: Remove unused deprecated material lighting API
- Date: Wed, 30 Oct 2019 02:26:17 +0000 (UTC)
commit 6b8ee80fd07b3afef0daa164bdbe5697b77fcf21
Author: Adam Jackson <ajax redhat com>
Date: Tue Oct 29 14:25:43 2019 -0400
cogl: Remove unused deprecated material lighting API
https://gitlab.gnome.org/GNOME/mutter/merge_requests/904
cogl/cogl/cogl.symbols | 11 --
cogl/cogl/deprecated/cogl-material-compat.c | 79 -----------
cogl/cogl/deprecated/cogl-material-compat.h | 194 ----------------------------
3 files changed, 284 deletions(-)
---
diff --git a/cogl/cogl/cogl.symbols b/cogl/cogl/cogl.symbols
index 5cedeecae..c61e186b7 100644
--- a/cogl/cogl/cogl.symbols
+++ b/cogl/cogl/cogl.symbols
@@ -371,11 +371,8 @@ cogl_material_alpha_func_get_type
cogl_material_copy
cogl_material_filter_get_type
cogl_material_foreach_layer
-cogl_material_get_ambient
cogl_material_get_color
cogl_material_get_depth_state
-cogl_material_get_diffuse
-cogl_material_get_emission
cogl_material_get_layers
cogl_material_get_layer_point_sprite_coords_enabled
cogl_material_get_layer_wrap_mode_p
@@ -383,8 +380,6 @@ cogl_material_get_layer_wrap_mode_s
cogl_material_get_layer_wrap_mode_t
cogl_material_get_n_layers
cogl_material_get_point_size
-cogl_material_get_shininess
-cogl_material_get_specular
cogl_material_get_user_program
cogl_material_layer_get_mag_filter
cogl_material_layer_get_min_filter
@@ -400,16 +395,12 @@ cogl_material_remove_layer
cogl_material_ref
#endif
cogl_material_set_alpha_test_function
-cogl_material_set_ambient
-cogl_material_set_ambient_and_diffuse
cogl_material_set_blend
cogl_material_set_blend_constant
cogl_material_set_color
cogl_material_set_color4f
cogl_material_set_color4ub
cogl_material_set_depth_state
-cogl_material_set_diffuse
-cogl_material_set_emission
cogl_material_set_layer
cogl_material_set_layer_combine
cogl_material_set_layer_combine_constant
@@ -421,8 +412,6 @@ cogl_material_set_layer_wrap_mode_p
cogl_material_set_layer_wrap_mode_s
cogl_material_set_layer_wrap_mode_t
cogl_material_set_point_size
-cogl_material_set_shininess
-cogl_material_set_specular
cogl_material_set_user_program
#ifndef COGL_DISABLE_DEPRECATED
cogl_material_unref
diff --git a/cogl/cogl/deprecated/cogl-material-compat.c b/cogl/cogl/deprecated/cogl-material-compat.c
index 35607d1dc..b4fafdad4 100644
--- a/cogl/cogl/deprecated/cogl-material-compat.c
+++ b/cogl/cogl/deprecated/cogl-material-compat.c
@@ -108,85 +108,6 @@ cogl_material_get_color (CoglMaterial *material,
cogl_pipeline_get_color (COGL_PIPELINE (material), color);
}
-void
-cogl_material_set_ambient (CoglMaterial *material,
- const CoglColor *ambient)
-{
- cogl_pipeline_set_ambient (COGL_PIPELINE (material), ambient);
-}
-
-void
-cogl_material_get_ambient (CoglMaterial *material,
- CoglColor *ambient)
-{
- cogl_pipeline_get_ambient (COGL_PIPELINE (material), ambient);
-}
-
-void
-cogl_material_set_diffuse (CoglMaterial *material,
- const CoglColor *diffuse)
-{
- cogl_pipeline_set_diffuse (COGL_PIPELINE (material), diffuse);
-}
-
-void
-cogl_material_get_diffuse (CoglMaterial *material,
- CoglColor *diffuse)
-{
- cogl_pipeline_get_diffuse (COGL_PIPELINE (material), diffuse);
-}
-
-void
-cogl_material_set_ambient_and_diffuse (CoglMaterial *material,
- const CoglColor *color)
-{
- cogl_pipeline_set_ambient_and_diffuse (COGL_PIPELINE (material), color);
-
-}
-
-void
-cogl_material_set_specular (CoglMaterial *material,
- const CoglColor *specular)
-{
- cogl_pipeline_set_specular (COGL_PIPELINE (material), specular);
-}
-
-void
-cogl_material_get_specular (CoglMaterial *material,
- CoglColor *specular)
-{
- cogl_pipeline_get_specular (COGL_PIPELINE (material), specular);
-}
-
-void
-cogl_material_set_shininess (CoglMaterial *material,
- float shininess)
-{
- cogl_pipeline_set_shininess (COGL_PIPELINE (material), shininess);
-}
-
-float
-cogl_material_get_shininess (CoglMaterial *material)
-{
- return cogl_pipeline_get_shininess (COGL_PIPELINE (material));
-}
-
-void
-cogl_material_set_emission (CoglMaterial *material,
- const CoglColor *emission)
-{
- cogl_pipeline_set_emission (COGL_PIPELINE (material), emission);
-
-}
-
-void
-cogl_material_get_emission (CoglMaterial *material,
- CoglColor *emission)
-{
- cogl_pipeline_get_emission (COGL_PIPELINE (material), emission);
-
-}
-
void
cogl_material_set_alpha_test_function (CoglMaterial *material,
CoglMaterialAlphaFunc alpha_func,
diff --git a/cogl/cogl/deprecated/cogl-material-compat.h b/cogl/cogl/deprecated/cogl-material-compat.h
index a03e7193e..94ae20d57 100644
--- a/cogl/cogl/deprecated/cogl-material-compat.h
+++ b/cogl/cogl/deprecated/cogl-material-compat.h
@@ -302,200 +302,6 @@ void
cogl_material_get_color (CoglMaterial *material,
CoglColor *color);
-/**
- * cogl_material_set_ambient:
- * @material: A #CoglMaterial object
- * @ambient: The components of the desired ambient color
- *
- * Sets the material's ambient color, in the standard OpenGL lighting
- * model. The ambient color affects the overall color of the object.
- *
- * Since the diffuse color will be intense when the light hits the surface
- * directly, the ambient will be most apparent where the light hits at a
- * slant.
- *
- * The default value is (0.2, 0.2, 0.2, 1.0)
- *
- * Since: 1.0
- * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting
- */
-COGL_DEPRECATED_FOR (cogl_snippet_)
-void
-cogl_material_set_ambient (CoglMaterial *material,
- const CoglColor *ambient);
-
-/**
- * cogl_material_get_ambient:
- * @material: A #CoglMaterial object
- * @ambient: The location to store the ambient color
- *
- * Retrieves the current ambient color for @material
- *
- * Since: 1.0
- * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting
- */
-COGL_DEPRECATED_FOR (cogl_snippet_)
-void
-cogl_material_get_ambient (CoglMaterial *material,
- CoglColor *ambient);
-
-/**
- * cogl_material_set_diffuse:
- * @material: A #CoglMaterial object
- * @diffuse: The components of the desired diffuse color
- *
- * Sets the material's diffuse color, in the standard OpenGL lighting
- * model. The diffuse color is most intense where the light hits the
- * surface directly - perpendicular to the surface.
- *
- * The default value is (0.8, 0.8, 0.8, 1.0)
- *
- * Since: 1.0
- * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting
- */
-COGL_DEPRECATED_FOR (cogl_snippet_)
-void
-cogl_material_set_diffuse (CoglMaterial *material,
- const CoglColor *diffuse);
-
-/**
- * cogl_material_get_diffuse:
- * @material: A #CoglMaterial object
- * @diffuse: The location to store the diffuse color
- *
- * Retrieves the current diffuse color for @material
- *
- * Since: 1.0
- * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting
- */
-COGL_DEPRECATED_FOR (cogl_snippet_)
-void
-cogl_material_get_diffuse (CoglMaterial *material,
- CoglColor *diffuse);
-
-/**
- * cogl_material_set_ambient_and_diffuse:
- * @material: A #CoglMaterial object
- * @color: The components of the desired ambient and diffuse colors
- *
- * Conveniently sets the diffuse and ambient color of @material at the same
- * time. See cogl_material_set_ambient() and cogl_material_set_diffuse().
- *
- * The default ambient color is (0.2, 0.2, 0.2, 1.0)
- *
- * The default diffuse color is (0.8, 0.8, 0.8, 1.0)
- *
- * Since: 1.0
- * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting
- */
-COGL_DEPRECATED_FOR (cogl_snippet_)
-void
-cogl_material_set_ambient_and_diffuse (CoglMaterial *material,
- const CoglColor *color);
-
-/**
- * cogl_material_set_specular:
- * @material: A #CoglMaterial object
- * @specular: The components of the desired specular color
- *
- * Sets the material's specular color, in the standard OpenGL lighting
- * model. The intensity of the specular color depends on the viewport
- * position, and is brightest along the lines of reflection.
- *
- * The default value is (0.0, 0.0, 0.0, 1.0)
- *
- * Since: 1.0
- * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting
- */
-COGL_DEPRECATED_FOR (cogl_snippet_)
-void
-cogl_material_set_specular (CoglMaterial *material,
- const CoglColor *specular);
-
-/**
- * cogl_material_get_specular:
- * @material: A #CoglMaterial object
- * @specular: The location to store the specular color
- *
- * Retrieves the materials current specular color.
- *
- * Since: 1.0
- * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting
- */
-COGL_DEPRECATED_FOR (cogl_snippet_)
-void
-cogl_material_get_specular (CoglMaterial *material,
- CoglColor *specular);
-
-/**
- * cogl_material_set_shininess:
- * @material: A #CoglMaterial object
- * @shininess: The desired shininess; must be >= 0.0
- *
- * Sets the shininess of the material, in the standard OpenGL lighting
- * model, which determines the size of the specular highlights. A
- * higher @shininess will produce smaller highlights which makes the
- * object appear more shiny.
- *
- * The default value is 0.0
- *
- * Since: 1.0
- * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting
- */
-COGL_DEPRECATED_FOR (cogl_snippet_)
-void
-cogl_material_set_shininess (CoglMaterial *material,
- float shininess);
-
-/**
- * cogl_material_get_shininess:
- * @material: A #CoglMaterial object
- *
- * Retrieves the materials current emission color.
- *
- * Return value: The materials current shininess value
- *
- * Since: 1.0
- * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting
- */
-COGL_DEPRECATED_FOR (cogl_snippet_)
-float
-cogl_material_get_shininess (CoglMaterial *material);
-
-/**
- * cogl_material_set_emission:
- * @material: A #CoglMaterial object
- * @emission: The components of the desired emissive color
- *
- * Sets the material's emissive color, in the standard OpenGL lighting
- * model. It will look like the surface is a light source emitting this
- * color.
- *
- * The default value is (0.0, 0.0, 0.0, 1.0)
- *
- * Since: 1.0
- * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting
- */
-COGL_DEPRECATED_FOR (cogl_snippet_)
-void
-cogl_material_set_emission (CoglMaterial *material,
- const CoglColor *emission);
-
-/**
- * cogl_material_get_emission:
- * @material: A #CoglMaterial object
- * @emission: The location to store the emission color
- *
- * Retrieves the materials current emission color.
- *
- * Since: 1.0
- * Deprecated: 1.16: Use the #CoglSnippet shader api for lighting
- */
-COGL_DEPRECATED_FOR (cogl_snippet_)
-void
-cogl_material_get_emission (CoglMaterial *material,
- CoglColor *emission);
-
/**
* CoglMaterialAlphaFunc:
* @COGL_MATERIAL_ALPHA_FUNC_NEVER: Never let the fragment through.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]