[cogl/wip/cogl-2.0: 5/5] Remove the long since deprecated cogl_material api

[Robert Bragg <rbragg src gnome org>]

commit 4be1dbac8cdede5beea39e33cdc7f3f33933e8e9
Author: Robert Bragg <robert linux intel com>
Date:   Fri Apr 13 17:38:40 2012 +0100

    Remove the long since deprecated cogl_material api
    
    This removes the cogl_material api which has long since been replaced by
    the cogl_pipeline api.

 build/win32/vs10/cogl.props     |    2 -
 build/win32/vs9/cogl.vsprops    |    1 -
 cogl/Makefile.am                |    2 -
 cogl/cogl-material-compat.c     |  454 --------------
 cogl/cogl-material-compat.h     | 1275 ---------------------------------------
 cogl/cogl-texture-private.h     |    2 +-
 cogl/cogl.h                     |    1 -
 cogl/cogl.symbols               |   63 --
 doc/reference/cogl2/Makefile.am |    1 -
 9 files changed, 1 insertions(+), 1800 deletions(-)
---
diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props
index 9525bb7..df727be 100644
--- a/build/win32/vs10/cogl.props
+++ b/build/win32/vs10/cogl.props
@@ -98,8 +98,6 @@ copy ..\..\..\cogl\cogl-fixed.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
 
 copy ..\..\..\cogl\cogl-glib-source.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
 
-copy ..\..\..\cogl\cogl-material-compat.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
 copy ..\..\..\cogl\cogl-pipeline.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
 
 copy ..\..\..\cogl\cogl-vector.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops
index 608e838..4c88f33 100644
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@@ -127,7 +127,6 @@ copy ..\..\..\cogl\cogl-depth-state.h $(OutDir)\include\cogl-$(CoglApiVersion)\c
 copy ..\..\..\cogl\cogl-euler.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
 copy ..\..\..\cogl\cogl-fixed.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
 copy ..\..\..\cogl\cogl-glib-source.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-material-compat.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
 copy ..\..\..\cogl\cogl-pipeline.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
 copy ..\..\..\cogl\cogl-quaternion.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
 copy ..\..\..\cogl\cogl-vector.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index e6bb4d7..31b1e8e 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -51,7 +51,6 @@ cogl_1_public_h = \
 	$(srcdir)/cogl1-context.h 		\
 	$(srcdir)/cogl-bitmap.h 		\
 	$(srcdir)/cogl-color.h 			\
-	$(srcdir)/cogl-material-compat.h 	\
 	$(srcdir)/cogl-matrix.h 		\
 	$(srcdir)/cogl-offscreen.h 		\
 	$(srcdir)/cogl-primitives.h 		\
@@ -271,7 +270,6 @@ cogl_sources_c = \
 	$(srcdir)/cogl-pipeline-snippet.c		\
 	$(srcdir)/cogl-pipeline-cache.h			\
 	$(srcdir)/cogl-pipeline-cache.c			\
-	$(srcdir)/cogl-material-compat.c		\
 	$(srcdir)/cogl-program.c			\
 	$(srcdir)/cogl-program-private.h		\
 	$(srcdir)/cogl-sampler-cache.c			\
diff --git a/cogl/cogl-texture-private.h b/cogl/cogl-texture-private.h
index 8cec89f..505d515 100644
--- a/cogl/cogl-texture-private.h
+++ b/cogl/cogl-texture-private.h
@@ -145,7 +145,7 @@ typedef enum _CoglTextureChangeFlags
 {
   /* Whenever the internals of a texture are changed such that the
    * underlying GL textures that represent the CoglTexture change then
-   * we notify cogl-material.c via
+   * we notify cogl-pipeline.c via
    * _cogl_pipeline_texture_pre_change_notify
    */
   COGL_TEXTURE_CHANGE_GL_TEXTURES
diff --git a/cogl/cogl.h b/cogl/cogl.h
index ac27629..a1e296d 100644
--- a/cogl/cogl.h
+++ b/cogl/cogl.h
@@ -68,7 +68,6 @@
 #include <cogl/cogl-path.h>
 #include <cogl/cogl-clip-state.h>
 #include <cogl/cogl-enum-types.h>
-#include <cogl/cogl-material-compat.h>
 #include <cogl/cogl-shader.h>
 #endif
 
diff --git a/cogl/cogl.symbols b/cogl/cogl.symbols
index 978c198..6f3e83a 100644
--- a/cogl/cogl.symbols
+++ b/cogl/cogl.symbols
@@ -332,7 +332,6 @@ cogl_is_index_buffer
 /* not implemented! */
 cogl_is_indices_array
 #endif
-cogl_is_material
 cogl_is_offscreen
 cogl_is_path
 cogl_is_pipeline
@@ -357,68 +356,6 @@ cogl_is_vertex_buffer_indices
 cogl_kms_renderer_get_kms_fd
 #endif
 
-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
-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
-cogl_material_layer_get_texture
-cogl_material_layer_get_type
-cogl_material_layer_get_wrap_mode_p
-cogl_material_layer_get_wrap_mode_s
-cogl_material_layer_get_wrap_mode_t
-cogl_material_layer_type_get_type
-cogl_material_new
-cogl_material_remove_layer
-#ifndef COGL_DISABLE_DEPRECATED
-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
-cogl_material_set_layer_filters
-cogl_material_set_layer_matrix
-cogl_material_set_layer_point_sprite_coords_enabled
-cogl_material_set_layer_wrap_mode
-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
-#endif
-cogl_material_wrap_mode_get_type
-
 cogl_matrix_copy
 cogl_matrix_equal
 cogl_matrix_free
diff --git a/doc/reference/cogl2/Makefile.am b/doc/reference/cogl2/Makefile.am
index 22dd8f7..295d4e5 100644
--- a/doc/reference/cogl2/Makefile.am
+++ b/doc/reference/cogl2/Makefile.am
@@ -65,7 +65,6 @@ IGNORE_HFILES=\
 	cogl-index-array-private.h		\
 	cogl-indices-private.h			\
 	cogl-journal-private.h			\
-	cogl-material-compat.h			\
 	cogl-matrix-private.h			\
 	cogl-object-private.h			\
 	cogl-path.h				\