From 98a942896752eb80e8e261c22d0d1651e8d4d858 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 23 Sep 2011 16:43:05 +0800 Subject: [PATCH] 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 --- 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 deletion(-) diff --git a/cogl-pango/cogl-pango-render.c b/cogl-pango/cogl-pango-render.c index 9ffaf2b61..ff974d69c 100644 --- a/cogl-pango/cogl-pango-render.c +++ b/cogl-pango/cogl-pango-render.c @@ -35,6 +35,7 @@ #include #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 c2bca818f..b5d99da12 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 1eae0e0a0..3eda26a32 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 93627e4d3..e6adfca9e 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 a41e4ba6c..bc770955e 100644 --- a/cogl/cogl-pipeline-fragend-glsl.c +++ b/cogl/cogl-pipeline-fragend-glsl.c @@ -32,6 +32,7 @@ #include +#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 8b630102a..c369c6d9a 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 8c8d066c8..86cf19bf1 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 4a6fa78e1..10d92667a 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 a3d3ae4f5..3275a0689 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 b8a4535b8..ee1ec1488 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"