cogl: rename cogl-context.h cogl-context-private.h

Since we plan to add public cogl_context_* API we need to rename the
current cogl-context.h which contains private member details.

clutter/cogl/cogl/Makefile.am

@@ -161,7 +161,7 @@ cogl_sources_c = \
 	$(srcdir)/cogl-debug.h 				\
 	$(srcdir)/cogl-debug-options.h			\
 	$(srcdir)/cogl-handle.h 			\
-	$(srcdir)/cogl-context.h			\
+	$(srcdir)/cogl-context-private.h		\
 	$(srcdir)/cogl-context.c			\
 	$(srcdir)/cogl-internal.h			\
 	$(srcdir)/cogl.c				\

clutter/cogl/cogl/cogl-atlas-texture.c

@@ -36,7 +36,7 @@
 #include "cogl-atlas-texture-private.h"
 #include "cogl-texture-2d-private.h"
 #include "cogl-sub-texture-private.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-texture-driver.h"
 #include "cogl-rectangle-map.h"

clutter/cogl/cogl/cogl-atlas.c

@@ -31,7 +31,7 @@
 #include "cogl.h"
 #include "cogl-atlas.h"
 #include "cogl-rectangle-map.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-texture-private.h"
 #include "cogl-texture-2d-private.h"
 #include "cogl-texture-driver.h"

clutter/cogl/cogl/cogl-attribute.c

@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-object-private.h"
 #include "cogl-journal-private.h"
 #include "cogl-attribute.h"

clutter/cogl/cogl/cogl-blend-string.c

@@ -35,7 +35,7 @@
 
 #include "cogl.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-debug.h"
 #include "cogl-blend-string.h"
 

clutter/cogl/cogl/cogl-blit.c

@@ -32,7 +32,7 @@
 
 #include "cogl.h"
 #include "cogl-blit.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-framebuffer-private.h"
 #include "cogl-texture-2d-private.h"
 

clutter/cogl/cogl/cogl-buffer.c

@@ -41,7 +41,7 @@
 #include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-util.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-pixel-array-private.h"
 

clutter/cogl/cogl/cogl-clip-stack.c

@@ -33,7 +33,7 @@
 #include "cogl.h"
 #include "cogl-clip-stack.h"
 #include "cogl-primitives.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-internal.h"
 #include "cogl-framebuffer-private.h"
 #include "cogl-journal-private.h"

clutter/cogl/cogl/cogl-clip-state.c

@@ -33,7 +33,7 @@
 #include "cogl.h"
 #include "cogl-clip-stack.h"
 #include "cogl-clip-state-private.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-internal.h"
 #include "cogl-framebuffer-private.h"
 #include "cogl-journal-private.h"

clutter/cogl/cogl/cogl-context-private.h

@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef __COGL_CONTEXT_H
-#define __COGL_CONTEXT_H
+#ifndef __COGL_CONTEXT_PRIVATE_H
+#define __COGL_CONTEXT_PRIVATE_H
 
 #include "cogl-internal.h"
 
@@ -248,4 +248,4 @@ if (ctxvar == NULL) return retval;
 
 #define NO_RETVAL
 
-#endif /* __COGL_CONTEXT_H */
+#endif /* __COGL_CONTEXT_PRIVATE_H */

clutter/cogl/cogl/cogl-context.c

@@ -29,7 +29,7 @@
 #include "cogl-internal.h"
 #include "cogl-profile.h"
 #include "cogl-util.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-journal-private.h"
 #include "cogl-texture-private.h"
 #include "cogl-pipeline-private.h"

clutter/cogl/cogl/cogl-feature-private.c

@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include "cogl.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 
 #include "cogl-feature-private.h"
 

clutter/cogl/cogl/cogl-framebuffer.c

@@ -28,7 +28,7 @@
 #include "cogl.h"
 #include "cogl-debug.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-object-private.h"
 #include "cogl-util.h"

clutter/cogl/cogl/cogl-indices.c

@@ -31,7 +31,7 @@
 #endif
 
 #include "cogl-object-private.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-indices.h"
 #include "cogl-indices-private.h"
 #include "cogl-index-array.h"

clutter/cogl/cogl/cogl-journal.c

@@ -28,7 +28,7 @@
 #include "cogl.h"
 #include "cogl-debug.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-journal-private.h"
 #include "cogl-texture-private.h"
 #include "cogl-pipeline-private.h"

clutter/cogl/cogl/cogl-material-compat.c

@@ -32,7 +32,7 @@
 #include <cogl-pipeline-private.h>
 #include <cogl-types.h>
 #include <cogl-matrix.h>
-#include <cogl-context.h>
+#include <cogl-context-private.h>
 
 CoglMaterial *
 cogl_material_new (void)

clutter/cogl/cogl/cogl-matrix-stack.c

@@ -30,7 +30,7 @@
 #endif
 
 #include "cogl.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-internal.h"
 #include "cogl-matrix-stack.h"
 #include "cogl-framebuffer-private.h"

clutter/cogl/cogl/cogl-path.c

@@ -29,7 +29,7 @@
 
 #include "cogl.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl2-path.h"
 
 #include <string.h>

clutter/cogl/cogl/cogl-pipeline-fragend-arbfp.c

@@ -36,7 +36,7 @@
 
 #include "cogl.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 
 #include "cogl-texture-private.h"

clutter/cogl/cogl/cogl-pipeline-fragend-fixed.c

@@ -36,7 +36,7 @@
 
 #include "cogl.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 
 #include "cogl-texture-private.h"

clutter/cogl/cogl/cogl-pipeline-fragend-glsl.c

@@ -40,7 +40,7 @@
 
 #include "cogl.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-shader-private.h"
 #include "cogl-program-private.h"

clutter/cogl/cogl/cogl-pipeline-opengl.c

@@ -34,7 +34,7 @@
 #include "cogl-debug.h"
 #include "cogl-pipeline-opengl-private.h"
 #include "cogl-pipeline-private.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-texture-private.h"
 
 /* This is needed to set the color attribute on GLES2 */

clutter/cogl/cogl/cogl-pipeline-progend-glsl.c

@@ -36,7 +36,7 @@
 
 #include "cogl.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-program-private.h"
 #include "cogl-pipeline-fragend-glsl-private.h"

clutter/cogl/cogl/cogl-pipeline-vertend-fixed.c

@@ -36,7 +36,7 @@
 
 #include "cogl.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-program-private.h"
 

clutter/cogl/cogl/cogl-pipeline-vertend-glsl.c

@@ -36,7 +36,7 @@
 
 #include "cogl.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-program-private.h"
 #include "cogl-pipeline-vertend-glsl-private.h"

clutter/cogl/cogl/cogl-pipeline.c

@@ -32,7 +32,7 @@
 #include "cogl.h"
 #include "cogl-debug.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-object.h"
 
 #include "cogl-pipeline-private.h"

clutter/cogl/cogl/cogl-pixel-array.c

@@ -41,7 +41,7 @@
 #include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-util.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-object.h"
 #include "cogl-pixel-array-private.h"
 #include "cogl-pixel-array.h"

clutter/cogl/cogl/cogl-primitives.c

@@ -28,7 +28,7 @@
 #include "cogl.h"
 #include "cogl-debug.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-journal-private.h"
 #include "cogl-texture-private.h"
 #include "cogl-pipeline-private.h"

clutter/cogl/cogl/cogl-program.c

@@ -28,7 +28,7 @@
 #include "cogl.h"
 
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 
 #include "cogl-shader-private.h"

clutter/cogl/cogl/cogl-shader.c

@@ -29,7 +29,7 @@
 #include "cogl-shader-private.h"
 #include "cogl-shader-boilerplate.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 
 #include <glib.h>

clutter/cogl/cogl/cogl-sub-texture.c

@@ -33,7 +33,7 @@
 #include "cogl-util.h"
 #include "cogl-texture-private.h"
 #include "cogl-sub-texture-private.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-texture-driver.h"
 

clutter/cogl/cogl/cogl-texture-2d-sliced.c

@@ -40,7 +40,7 @@
 #include "cogl-texture-2d-private.h"
 #include "cogl-texture-2d-sliced-private.h"
 #include "cogl-texture-driver.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-spans.h"
 #include "cogl-journal-private.h"

clutter/cogl/cogl/cogl-texture-2d.c

@@ -34,7 +34,7 @@
 #include "cogl-texture-private.h"
 #include "cogl-texture-2d-private.h"
 #include "cogl-texture-driver.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-journal-private.h"
 #include "cogl-pipeline-opengl-private.h"

clutter/cogl/cogl/cogl-texture-3d.c

@@ -32,7 +32,7 @@
 #include "cogl-texture-private.h"
 #include "cogl-texture-3d-private.h"
 #include "cogl-texture-driver.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-journal-private.h"
 #include "cogl-pipeline-private.h"

clutter/cogl/cogl/cogl-texture-rectangle.c

@@ -34,7 +34,7 @@
 #include "cogl-texture-private.h"
 #include "cogl-texture-rectangle-private.h"
 #include "cogl-texture-driver.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-journal-private.h"
 #include "cogl-pipeline-opengl-private.h"

clutter/cogl/cogl/cogl-texture.c

@@ -47,7 +47,7 @@
 #include "cogl-sub-texture-private.h"
 #include "cogl-atlas-texture-private.h"
 #include "cogl-pipeline.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-object-private.h"
 #include "cogl-primitives.h"

clutter/cogl/cogl/cogl-vertex-buffer.c

@@ -99,7 +99,7 @@
 #include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-util.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-vertex-buffer-private.h"
 #include "cogl-texture-private.h"

clutter/cogl/cogl/cogl.c

@@ -35,7 +35,7 @@
 #include "cogl-debug.h"
 #include "cogl-internal.h"
 #include "cogl-util.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-pipeline-private.h"
 #include "cogl-pipeline-opengl-private.h"
 #include "cogl-winsys.h"

clutter/cogl/cogl/cogl2-path.c

@@ -33,7 +33,7 @@
 #include "cogl.h"
 #include "cogl-object.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-journal-private.h"
 #include "cogl-pipeline-private.h"
 #include "cogl-pipeline-opengl-private.h"

clutter/cogl/cogl/driver/gl/cogl-context-driver-gl.c

@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 
 #define COGL_FEATURE_BEGIN(a, b, c, d, e, f, g)
 #define COGL_FEATURE_FUNCTION(ret, name, args) \

clutter/cogl/cogl/driver/gl/cogl-gl.c

@@ -30,7 +30,7 @@
 #include "cogl.h"
 
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-feature-private.h"
 
 #ifdef HAVE_CLUTTER_OSX

clutter/cogl/cogl/driver/gl/cogl-texture-driver-gl.c

@@ -37,7 +37,7 @@
 #include "cogl-bitmap-private.h"
 #include "cogl-texture-private.h"
 #include "cogl-pipeline.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-primitives.h"
 #include "cogl-pipeline-opengl-private.h"

clutter/cogl/cogl/driver/gles/cogl-context-driver-gles.c

@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 
 #define COGL_FEATURE_BEGIN(a, b, c, d, e, f, g)
 #define COGL_FEATURE_FUNCTION(ret, name, args) \

clutter/cogl/cogl/driver/gles/cogl-gles.c

@@ -29,7 +29,7 @@
 
 #include "cogl.h"
 #include "cogl-internal.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-feature-private.h"
 
 gboolean

clutter/cogl/cogl/driver/gles/cogl-texture-driver-gles.c

@@ -38,7 +38,7 @@
 #include "cogl-texture-private.h"
 #include "cogl-pipeline.h"
 #include "cogl-pipeline-opengl-private.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-primitives.h"
 

clutter/cogl/cogl/winsys/cogl-context-winsys.c

@@ -29,7 +29,7 @@
 #include <GL/glx.h>
 #endif
 
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-feature-private.h"
 
 /* Define a set of arrays containing the functions required from GL

clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c

@@ -40,7 +40,7 @@
 #include "cogl-texture-driver.h"
 #include "cogl-texture-2d-private.h"
 #include "cogl-texture-rectangle-private.h"
-#include "cogl-context.h"
+#include "cogl-context-private.h"
 #include "cogl-handle.h"
 #include "cogl-xlib.h"
 #include "cogl-pipeline-opengl-private.h"

clutter/cogl/cogl/winsys/cogl-xlib.c

@@ -32,7 +32,7 @@
 #include <cogl.h>
 #include <cogl-internal.h>
 #include <cogl-handle.h>
-#include <cogl-context.h>
+#include <cogl-context-private.h>
 #include <cogl-framebuffer-private.h>
 
 #include <X11/Xlib.h>