From 3428633cb30159bdfd3671e6834a4a9792fe8246 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@linux.intel.com>
Date: Fri, 2 Jul 2010 01:07:36 +0100
Subject: [PATCH] build: Fix GLES builds since the material backend split

The commit to split the fragment processing backends out from
cogl-material.c (3e1323a6362906a95) broke the GLES 1 and 2 builds the
fix was to guard the code in each backend according to the
COGL_MATERIAL_BACKEND_XYZ defines which are setup in
cogl-material-private.h.
---
 cogl/cogl-material-arbfp.c   | 7 ++++++-
 cogl/cogl-material-fixed.c   | 7 ++++++-
 cogl/cogl-material-glsl.c    | 7 ++++++-
 cogl/cogl-material-private.h | 2 ++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/cogl/cogl-material-arbfp.c b/cogl/cogl-material-arbfp.c
index bbc510e4a..cdf54e199 100644
--- a/cogl/cogl-material-arbfp.c
+++ b/cogl/cogl-material-arbfp.c
@@ -29,12 +29,15 @@
 #include "config.h"
 #endif
 
+#include "cogl-material-private.h"
+
+#ifdef COGL_MATERIAL_BACKEND_ARBFP
+
 #include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-context.h"
 #include "cogl-handle.h"
 
-#include "cogl-material-private.h"
 #include "cogl-texture-private.h"
 #include "cogl-blend-string.h"
 #include "cogl-journal-private.h"
@@ -1027,3 +1030,5 @@ const CoglMaterialBackend _cogl_material_arbfp_backend =
   NULL
 };
 
+#endif /* COGL_MATERIAL_BACKEND_ARBFP */
+
diff --git a/cogl/cogl-material-fixed.c b/cogl/cogl-material-fixed.c
index bc2bea1ec..d2348715e 100644
--- a/cogl/cogl-material-fixed.c
+++ b/cogl/cogl-material-fixed.c
@@ -29,12 +29,15 @@
 #include "config.h"
 #endif
 
+#include "cogl-material-private.h"
+
+#ifdef COGL_MATERIAL_BACKEND_FIXED
+
 #include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-context.h"
 #include "cogl-handle.h"
 
-#include "cogl-material-private.h"
 #include "cogl-texture-private.h"
 #include "cogl-blend-string.h"
 #include "cogl-profile.h"
@@ -199,3 +202,5 @@ const CoglMaterialBackend _cogl_material_fixed_backend =
   NULL /* free_priv */
 };
 
+#endif /* COGL_MATERIAL_BACKEND_FIXED */
+
diff --git a/cogl/cogl-material-glsl.c b/cogl/cogl-material-glsl.c
index 341e86d4a..74d2dbe9e 100644
--- a/cogl/cogl-material-glsl.c
+++ b/cogl/cogl-material-glsl.c
@@ -29,12 +29,15 @@
 #include "config.h"
 #endif
 
+#include "cogl-material-private.h"
+
+#ifdef COGL_MATERIAL_BACKEND_GLSL
+
 #include "cogl.h"
 #include "cogl-internal.h"
 #include "cogl-context.h"
 #include "cogl-handle.h"
 
-#include "cogl-material-private.h"
 #ifndef HAVE_COGL_GLES
 #include "cogl-program.h"
 #endif
@@ -121,3 +124,5 @@ const CoglMaterialBackend _cogl_material_glsl_backend =
   NULL, /* free_priv */
 };
 
+#endif /* COGL_MATERIAL_BACKEND_GLSL */
+
diff --git a/cogl/cogl-material-private.h b/cogl/cogl-material-private.h
index 330d39c51..b6a3524b3 100644
--- a/cogl/cogl-material-private.h
+++ b/cogl/cogl-material-private.h
@@ -28,6 +28,8 @@
 #ifndef __COGL_MATERIAL_PRIVATE_H
 #define __COGL_MATERIAL_PRIVATE_H
 
+#include "cogl.h"
+
 #include "cogl-material.h"
 #include "cogl-matrix.h"
 #include "cogl-matrix-stack.h"