Start clearly separating deprecated code

This makes a start on clearly factoring the deprecated code of core Cogl
into a deprecated/ directory. Ideally we want to get to the point where
all code here can be re-worked in terms of the public 2.0 api so that it
can be kept indefinitely for cogl 1.x api compatibility without
cluttering the core code base itself. If we can do this then we can
avoid maintaining the Cogl 1.x branches in parallel with master which
would reduce the maintenance effort.

21 files changed, 33 insertions, 23 deletions

diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index ba7239ed..bd6aa0c2 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -18,6 +18,7 @@ lib_LTLIBRARIES =
 AM_CPPFLAGS = \
 	-I$(top_srcdir)				\
 	-I$(top_builddir)			\
+	-I$(srcdir)/deprecated			\
 	-I$(srcdir)/winsys 			\
 	-I$(srcdir)/driver/gl 			\
 	-I$(srcdir)/driver/gl/gl 		\
@@ -67,21 +68,25 @@ pkgconfig_DATA = $(pc_files)
 EXTRA_DIST += cogl-1.0.pc.in cogl-$(COGL_API_VERSION)-experimental.pc.in
 DISTCLEANFILES += $(pc_files)
 
+cogl_deprecated_h = \
+	$(srcdir)/deprecated/cogl-fixed.h 		\
+	$(srcdir)/deprecated/cogl-material-compat.h 	\
+	$(srcdir)/deprecated/cogl-vertex-buffer.h 	\
+	$(srcdir)/deprecated/cogl-shader.h 		\
+	$(srcdir)/deprecated/cogl-clutter.h       	\
+	$(NULL)
+
 # public 1.x api headers
 cogl_1_public_h = \
+	$(cogl_deprecated_h)			\
 	$(srcdir)/cogl1-context.h 		\
 	$(srcdir)/cogl-bitmap.h 		\
 	$(srcdir)/cogl-color.h 			\
-	$(srcdir)/cogl-fixed.h 			\
-	$(srcdir)/cogl-material-compat.h 	\
 	$(srcdir)/cogl-matrix.h 		\
 	$(srcdir)/cogl-offscreen.h 		\
 	$(srcdir)/cogl-primitives.h 		\
-	$(srcdir)/cogl-shader.h 		\
 	$(srcdir)/cogl-texture.h 		\
 	$(srcdir)/cogl-types.h 			\
-	$(srcdir)/cogl-vertex-buffer.h 		\
-	$(srcdir)/cogl-clutter.h       		\
 	$(srcdir)/cogl.h			\
 	$(NULL)
 
@@ -261,15 +266,12 @@ cogl_sources_c = \
 	$(srcdir)/cogl2-compatibility.c			\
 	$(srcdir)/cogl-feature-private.h                \
 	$(srcdir)/cogl-feature-private.c                \
-	$(srcdir)/cogl-fixed.c		    		\
 	$(srcdir)/cogl-color-private.h    		\
 	$(srcdir)/cogl-color.c				\
 	$(srcdir)/cogl-buffer-private.h 		\
 	$(srcdir)/cogl-buffer.c				\
 	$(srcdir)/cogl-pixel-buffer-private.h		\
 	$(srcdir)/cogl-pixel-buffer.c			\
-	$(srcdir)/cogl-vertex-buffer-private.h 		\
-	$(srcdir)/cogl-vertex-buffer.c			\
 	$(srcdir)/cogl-index-buffer-private.h		\
 	$(srcdir)/cogl-index-buffer.c			\
 	$(srcdir)/cogl-attribute-buffer-private.h	\
@@ -310,9 +312,6 @@ cogl_sources_c = \
 	$(srcdir)/cogl-pipeline-cache.c			\
 	$(srcdir)/cogl-pipeline-hash-table.h		\
 	$(srcdir)/cogl-pipeline-hash-table.c		\
-	$(srcdir)/cogl-material-compat.c		\
-	$(srcdir)/cogl-program.c			\
-	$(srcdir)/cogl-program-private.h		\
 	$(srcdir)/cogl-sampler-cache.c			\
 	$(srcdir)/cogl-sampler-cache-private.h		\
 	$(srcdir)/cogl-blend-string.c			\
@@ -326,7 +325,6 @@ cogl_sources_c = \
 	$(srcdir)/cogl-texture-driver.h			\
 	$(srcdir)/cogl-sub-texture.c                    \
 	$(srcdir)/cogl-texture.c			\
-	$(srcdir)/cogl-auto-texture.c			\
 	$(srcdir)/cogl-texture-2d.c                     \
 	$(srcdir)/cogl-texture-2d-sliced.c		\
 	$(srcdir)/cogl-texture-3d.c                     \
@@ -359,12 +357,9 @@ cogl_sources_c = \
 	$(srcdir)/cogl-flags.h				\
 	$(srcdir)/cogl-bitmask.h                        \
 	$(srcdir)/cogl-bitmask.c                        \
-	$(srcdir)/cogl-shader-private.h			\
-	$(srcdir)/cogl-shader.c                        	\
 	$(srcdir)/cogl-gtype-private.h                  \
 	$(srcdir)/cogl-point-in-poly-private.h       	\
 	$(srcdir)/cogl-point-in-poly.c       		\
-	$(srcdir)/cogl-clutter.c       			\
 	$(srcdir)/cogl-list.c				\
 	$(srcdir)/cogl-list.h				\
 	$(srcdir)/winsys/cogl-winsys-stub-private.h	\
@@ -398,6 +393,16 @@ cogl_sources_c = \
 	$(srcdir)/cogl-closure-list.c			\
 	$(srcdir)/cogl-fence.c				\
 	$(srcdir)/cogl-fence-private.h			\
+	$(srcdir)/deprecated/cogl-fixed.c		    	\
+	$(srcdir)/deprecated/cogl-vertex-buffer-private.h	\
+	$(srcdir)/deprecated/cogl-vertex-buffer.c		\
+	$(srcdir)/deprecated/cogl-material-compat.c		\
+	$(srcdir)/deprecated/cogl-program.c			\
+	$(srcdir)/deprecated/cogl-program-private.h		\
+	$(srcdir)/deprecated/cogl-auto-texture.c		\
+	$(srcdir)/deprecated/cogl-shader-private.h		\
+	$(srcdir)/deprecated/cogl-shader.c			\
+	$(srcdir)/deprecated/cogl-clutter.c       		\
 	$(NULL)
 
 if USE_GLIB
@@ -408,8 +413,9 @@ cogl_sources_c += \
 endif
 
 if SUPPORT_XLIB
+cogl_deprecated_h += \
+	$(srcdir)/deprecated/cogl-clutter-xlib.h
 cogl_1_public_h += \
-	$(srcdir)/cogl-clutter-xlib.h \
 	$(srcdir)/cogl-xlib-renderer.h
 
 cogl_experimental_h += \
@@ -548,6 +554,9 @@ cogl_headers = \
 	$(srcdir)/cogl-pango.h \
 	$(NULL)
 
+cogldeprecatedincludedir = $(includedir)/cogl/cogl/deprecated
+cogldeprecatedinclude_HEADERS = $(cogl_deprecated_h)
+
 coglincludedir = $(includedir)/cogl/cogl
 coglinclude_HEADERS = $(cogl_headers) $(cogl_experimental_h)
 nodist_coglinclude_HEADERS = $(cogl_nodist_experimental_h) cogl-defines.h cogl-enum-types.h
diff --git a/cogl/cogl-primitive.h b/cogl/cogl-primitive.h
index e0d4a6e9..1266fd27 100644
--- a/cogl/cogl-primitive.h
+++ b/cogl/cogl-primitive.h
@@ -36,7 +36,7 @@
  */
 typedef struct _CoglPrimitive CoglPrimitive;
 
-#include <cogl/cogl-vertex-buffer.h> /* for CoglVerticesMode */
+#include <cogl/cogl-types.h> /* for CoglVerticesMode */
 #include <cogl/cogl-attribute.h>
 #include <cogl/cogl-framebuffer.h>
 
diff --git a/cogl/cogl-texture.h b/cogl/cogl-texture.h
index 1528414e..b69ba0c3 100644
--- a/cogl/cogl-texture.h
+++ b/cogl/cogl-texture.h
@@ -34,6 +34,7 @@
 typedef struct _CoglTexture CoglTexture;
 
 #include <cogl/cogl-types.h>
+#include <cogl/cogl-macros.h>
 #include <cogl/cogl-defines.h>
 #if defined (COGL_ENABLE_EXPERIMENTAL_API)
 #include <cogl/cogl-pixel-buffer.h>
diff --git a/cogl/cogl-xlib.h b/cogl/cogl-xlib.h
index a2175a85..c1371589 100644
--- a/cogl/cogl-xlib.h
+++ b/cogl/cogl-xlib.h
@@ -30,7 +30,7 @@
 #define __COGL_H_INSIDE__
 
 #include <cogl/cogl-types.h>
-#include <cogl/cogl-clutter-xlib.h>
+#include <cogl/deprecated/cogl-clutter-xlib.h>
 #include <cogl/cogl-xlib-renderer.h>
 #include <cogl/cogl-macros.h>
 
diff --git a/cogl/cogl.h b/cogl/cogl.h
index d678d082..7504ff7e 100644
--- a/cogl/cogl.h
+++ b/cogl/cogl.h
@@ -65,11 +65,11 @@
  */
 #ifndef COGL_ENABLE_EXPERIMENTAL_2_0_API
 #include <cogl/cogl-clip-state.h>
-#include <cogl/cogl-vertex-buffer.h>
 #include <cogl/cogl-enum-types.h>
-#include <cogl/cogl-fixed.h>
-#include <cogl/cogl-material-compat.h>
-#include <cogl/cogl-shader.h>
+#include <cogl/deprecated/cogl-vertex-buffer.h>
+#include <cogl/deprecated/cogl-fixed.h>
+#include <cogl/deprecated/cogl-material-compat.h>
+#include <cogl/deprecated/cogl-shader.h>
 #endif
 
 /*
@@ -122,7 +122,7 @@
 #endif
 /* XXX: This will definitly go away once all the Clutter winsys
  * code has been migrated down into Cogl! */
-#include <cogl/cogl-clutter.h>
+#include <cogl/deprecated/cogl-clutter.h>
 #endif
 #ifdef COGL_HAS_SDL_SUPPORT
 #include <cogl/cogl-sdl.h>
diff --git a/cogl/cogl-auto-texture.c b/cogl/deprecated/cogl-auto-texture.c
index b92212da..b92212da 100644
--- a/cogl/cogl-auto-texture.c
+++ b/cogl/deprecated/cogl-auto-texture.c
diff --git a/cogl/cogl-clutter-xlib.h b/cogl/deprecated/cogl-clutter-xlib.h
index 67c27b65..67c27b65 100644
--- a/cogl/cogl-clutter-xlib.h
+++ b/cogl/deprecated/cogl-clutter-xlib.h
diff --git a/cogl/cogl-clutter.c b/cogl/deprecated/cogl-clutter.c
index b00e5101..b00e5101 100644
--- a/cogl/cogl-clutter.c
+++ b/cogl/deprecated/cogl-clutter.c
diff --git a/cogl/cogl-clutter.h b/cogl/deprecated/cogl-clutter.h
index 22b84f39..22b84f39 100644
--- a/cogl/cogl-clutter.h
+++ b/cogl/deprecated/cogl-clutter.h
diff --git a/cogl/cogl-fixed.c b/cogl/deprecated/cogl-fixed.c
index 4d921554..4d921554 100644
--- a/cogl/cogl-fixed.c
+++ b/cogl/deprecated/cogl-fixed.c
diff --git a/cogl/cogl-fixed.h b/cogl/deprecated/cogl-fixed.h
index 05120867..05120867 100644
--- a/cogl/cogl-fixed.h
+++ b/cogl/deprecated/cogl-fixed.h
diff --git a/cogl/cogl-material-compat.c b/cogl/deprecated/cogl-material-compat.c
index af562236..af562236 100644
--- a/cogl/cogl-material-compat.c
+++ b/cogl/deprecated/cogl-material-compat.c
diff --git a/cogl/cogl-material-compat.h b/cogl/deprecated/cogl-material-compat.h
index 8d2551ca..8d2551ca 100644
--- a/cogl/cogl-material-compat.h
+++ b/cogl/deprecated/cogl-material-compat.h
diff --git a/cogl/cogl-program-private.h b/cogl/deprecated/cogl-program-private.h
index 989f6795..989f6795 100644
--- a/cogl/cogl-program-private.h
+++ b/cogl/deprecated/cogl-program-private.h
diff --git a/cogl/cogl-program.c b/cogl/deprecated/cogl-program.c
index 70a94b34..70a94b34 100644
--- a/cogl/cogl-program.c
+++ b/cogl/deprecated/cogl-program.c
diff --git a/cogl/cogl-shader-private.h b/cogl/deprecated/cogl-shader-private.h
index 8ad8335f..8ad8335f 100644
--- a/cogl/cogl-shader-private.h
+++ b/cogl/deprecated/cogl-shader-private.h
diff --git a/cogl/cogl-shader.c b/cogl/deprecated/cogl-shader.c
index c28d4a22..c28d4a22 100644
--- a/cogl/cogl-shader.c
+++ b/cogl/deprecated/cogl-shader.c
diff --git a/cogl/cogl-shader.h b/cogl/deprecated/cogl-shader.h
index e77ac74d..e77ac74d 100644
--- a/cogl/cogl-shader.h
+++ b/cogl/deprecated/cogl-shader.h
diff --git a/cogl/cogl-vertex-buffer-private.h b/cogl/deprecated/cogl-vertex-buffer-private.h
index 7c800a9c..7c800a9c 100644
--- a/cogl/cogl-vertex-buffer-private.h
+++ b/cogl/deprecated/cogl-vertex-buffer-private.h
diff --git a/cogl/cogl-vertex-buffer.c b/cogl/deprecated/cogl-vertex-buffer.c
index 20f327fd..20f327fd 100644
--- a/cogl/cogl-vertex-buffer.c
+++ b/cogl/deprecated/cogl-vertex-buffer.c
diff --git a/cogl/cogl-vertex-buffer.h b/cogl/deprecated/cogl-vertex-buffer.h
index bd28836b..bd28836b 100644
--- a/cogl/cogl-vertex-buffer.h
+++ b/cogl/deprecated/cogl-vertex-buffer.h