[cogl] cogl-pipeline/cogl-pango: Added forgotten includes
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl] cogl-pipeline/cogl-pango: Added forgotten includes
- Date: Mon, 26 Sep 2011 14:54:53 +0000 (UTC)
commit 98a942896752eb80e8e261c22d0d1651e8d4d858
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Sep 23 16:43:05 2011 +0800
cogl-pipeline/cogl-pango: Added forgotten includes
It seems that cogl-context-private.h needs to be included before including
any of the pipeline-related stuff to avoid build errors on C89 compilers.
This is due to the recent cogl-pipeline decoupling, seems like.
Reviewed-by: Robert Bragg <robert linux intel com>
cogl-pango/cogl-pango-render.c | 1 +
cogl/cogl-pipeline-cache.c | 2 +-
cogl/cogl-pipeline-fragend-arbfp.c | 1 +
cogl/cogl-pipeline-fragend-fixed.c | 1 +
cogl/cogl-pipeline-fragend-glsl.c | 1 +
cogl/cogl-pipeline-layer-state.c | 1 +
cogl/cogl-pipeline-layer.c | 3 +++
cogl/cogl-pipeline-progend-glsl.c | 1 +
cogl/cogl-pipeline-vertend-fixed.c | 1 +
cogl/cogl-pipeline-vertend-glsl.c | 1 +
10 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/cogl-pango/cogl-pango-render.c b/cogl-pango/cogl-pango-render.c
index 9ffaf2b..ff974d6 100644
--- a/cogl-pango/cogl-pango-render.c
+++ b/cogl-pango/cogl-pango-render.c
@@ -35,6 +35,7 @@
#include <cairo.h>
#include "cogl/cogl-debug.h"
+#include "cogl/cogl-context-private.h"
#include "cogl/cogl-texture-private.h"
#include "cogl-pango-private.h"
#include "cogl-pango-glyph-cache.h"
diff --git a/cogl/cogl-pipeline-cache.c b/cogl/cogl-pipeline-cache.c
index c2bca81..b5d99da 100644
--- a/cogl/cogl-pipeline-cache.c
+++ b/cogl/cogl-pipeline-cache.c
@@ -29,9 +29,9 @@
#include "config.h"
#endif
+#include "cogl-context-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-cache.h"
-#include "cogl-context-private.h"
struct _CoglPipelineCache
{
diff --git a/cogl/cogl-pipeline-fragend-arbfp.c b/cogl/cogl-pipeline-fragend-arbfp.c
index 1eae0e0..3eda26a 100644
--- a/cogl/cogl-pipeline-fragend-arbfp.c
+++ b/cogl/cogl-pipeline-fragend-arbfp.c
@@ -30,6 +30,7 @@
#endif
#include "cogl-debug.h"
+#include "cogl-context-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-layer-private.h"
diff --git a/cogl/cogl-pipeline-fragend-fixed.c b/cogl/cogl-pipeline-fragend-fixed.c
index 93627e4..e6adfca 100644
--- a/cogl/cogl-pipeline-fragend-fixed.c
+++ b/cogl/cogl-pipeline-fragend-fixed.c
@@ -29,6 +29,7 @@
#include "config.h"
#endif
+#include "cogl-context-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-opengl-private.h"
diff --git a/cogl/cogl-pipeline-fragend-glsl.c b/cogl/cogl-pipeline-fragend-glsl.c
index a41e4ba..bc77095 100644
--- a/cogl/cogl-pipeline-fragend-glsl.c
+++ b/cogl/cogl-pipeline-fragend-glsl.c
@@ -32,6 +32,7 @@
#include <string.h>
+#include "cogl-context-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-layer-private.h"
#include "cogl-shader-private.h"
diff --git a/cogl/cogl-pipeline-layer-state.c b/cogl/cogl-pipeline-layer-state.c
index 8b63010..c369c6d 100644
--- a/cogl/cogl-pipeline-layer-state.c
+++ b/cogl/cogl-pipeline-layer-state.c
@@ -29,6 +29,7 @@
#include "config.h"
#endif
+#include "cogl-context-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-blend-string.h"
#include "cogl-util.h"
diff --git a/cogl/cogl-pipeline-layer.c b/cogl/cogl-pipeline-layer.c
index 8c8d066..86cf19b 100644
--- a/cogl/cogl-pipeline-layer.c
+++ b/cogl/cogl-pipeline-layer.c
@@ -29,6 +29,9 @@
#include "config.h"
#endif
+#include "cogl-context-private.h"
+#include "cogl-texture-private.h"
+
#include "cogl-pipeline.h"
#include "cogl-pipeline-layer-private.h"
#include "cogl-pipeline-layer-state-private.h"
diff --git a/cogl/cogl-pipeline-progend-glsl.c b/cogl/cogl-pipeline-progend-glsl.c
index 4a6fa78..10d9266 100644
--- a/cogl/cogl-pipeline-progend-glsl.c
+++ b/cogl/cogl-pipeline-progend-glsl.c
@@ -29,6 +29,7 @@
#include "config.h"
#endif
+#include "cogl-context-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-opengl-private.h"
diff --git a/cogl/cogl-pipeline-vertend-fixed.c b/cogl/cogl-pipeline-vertend-fixed.c
index a3d3ae4..3275a06 100644
--- a/cogl/cogl-pipeline-vertend-fixed.c
+++ b/cogl/cogl-pipeline-vertend-fixed.c
@@ -29,6 +29,7 @@
#include "config.h"
#endif
+#include "cogl-context-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-opengl-private.h"
diff --git a/cogl/cogl-pipeline-vertend-glsl.c b/cogl/cogl-pipeline-vertend-glsl.c
index b8a4535..ee1ec14 100644
--- a/cogl/cogl-pipeline-vertend-glsl.c
+++ b/cogl/cogl-pipeline-vertend-glsl.c
@@ -29,6 +29,7 @@
#include "config.h"
#endif
+#include "cogl-context-private.h"
#include "cogl-pipeline-private.h"
#include "cogl-pipeline-opengl-private.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]