<p>This looks good to me:</p>
<p>Reviewed-by: Robert Bragg &lt;<a href="mailto:robert@linux.intel.com">robert@linux.intel.com</a>&gt;</p>
<p>Regards,<br>
Robert</p>
<div class="gmail_quote">On May 8, 2012 6:34 PM, &quot;Neil Roberts&quot; &lt;<a href="mailto:neil@linux.intel.com">neil@linux.intel.com</a>&gt; wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
This fixes a few problems that occur when only using a GLES2 header.<br>
<br>
• The use of GL_CLAMP_TO_BORDER and GL_MIRRORED_REPEAT were moved from<br>
  cogl-pipelinelayer-state.h to cogl-sampler-cache-private.h but the<br>
  corresponding defines were not.<br>
<br>
• cogl-sampler-cache.c was using GL_TEXTURE_WRAP_R but this is only<br>
  defined as GL_TEXTURE_WRAP_R_OES from the GLES2 header so it needs a<br>
  #define.<br>
<br>
• cogl-framebuffer-private.h uses GLuint but it does not include<br>
  cogl-gl-header.h. It gets away with this when GLX support is enabled<br>
  because the GL header would be included via glx.h.<br>
---<br>
 cogl/cogl-framebuffer-private.h    |    1 +<br>
 cogl/cogl-pipeline-layer-private.h |    8 --------<br>
 cogl/cogl-sampler-cache-private.h  |    8 ++++++++<br>
 cogl/cogl-sampler-cache.c          |    4 ++++<br>
 4 files changed, 13 insertions(+), 8 deletions(-)<br>
<br>
diff --git a/cogl/cogl-framebuffer-private.h b/cogl/cogl-framebuffer-private.h<br>
index 856f909..4c95f73 100644<br>
--- a/cogl/cogl-framebuffer-private.h<br>
+++ b/cogl/cogl-framebuffer-private.h<br>
@@ -31,6 +31,7 @@<br>
 #include &quot;cogl-winsys-private.h&quot;<br>
 #include &quot;cogl-attribute-private.h&quot;<br>
 #include &quot;cogl-offscreen.h&quot;<br>
+#include &quot;cogl-gl-header.h&quot;<br>
<br>
 #ifdef COGL_HAS_XLIB_SUPPORT<br>
 #include &lt;X11/Xlib.h&gt;<br>
diff --git a/cogl/cogl-pipeline-layer-private.h b/cogl/cogl-pipeline-layer-private.h<br>
index b672473..84ccd9d 100644<br>
--- a/cogl/cogl-pipeline-layer-private.h<br>
+++ b/cogl/cogl-pipeline-layer-private.h<br>
@@ -39,14 +39,6 @@<br>
<br>
 #include &lt;glib.h&gt;<br>
<br>
-/* This isn&#39;t defined in the GLES headers */<br>
-#ifndef GL_CLAMP_TO_BORDER<br>
-#define GL_CLAMP_TO_BORDER 0x812d<br>
-#endif<br>
-#ifndef GL_MIRRORED_REPEAT<br>
-#define GL_MIRRORED_REPEAT 0x8370<br>
-#endif<br>
-<br>
 typedef struct _CoglPipelineLayer     CoglPipelineLayer;<br>
 #define COGL_PIPELINE_LAYER(OBJECT) ((CoglPipelineLayer *)OBJECT)<br>
<br>
diff --git a/cogl/cogl-sampler-cache-private.h b/cogl/cogl-sampler-cache-private.h<br>
index 4eb7503..0149751 100644<br>
--- a/cogl/cogl-sampler-cache-private.h<br>
+++ b/cogl/cogl-sampler-cache-private.h<br>
@@ -28,6 +28,14 @@<br>
 #include &quot;cogl-context.h&quot;<br>
 #include &quot;cogl-gl-header.h&quot;<br>
<br>
+/* These aren&#39;t defined in the GLES headers */<br>
+#ifndef GL_CLAMP_TO_BORDER<br>
+#define GL_CLAMP_TO_BORDER 0x812d<br>
+#endif<br>
+#ifndef GL_MIRRORED_REPEAT<br>
+#define GL_MIRRORED_REPEAT 0x8370<br>
+#endif<br>
+<br>
 /* GL_ALWAYS is just used here as a value that is known not to clash<br>
  * with any valid GL wrap modes.<br>
  *<br>
diff --git a/cogl/cogl-sampler-cache.c b/cogl/cogl-sampler-cache.c<br>
index b7bb4da..f91983c 100644<br>
--- a/cogl/cogl-sampler-cache.c<br>
+++ b/cogl/cogl-sampler-cache.c<br>
@@ -31,6 +31,10 @@<br>
 #include &quot;cogl-sampler-cache-private.h&quot;<br>
 #include &quot;cogl-context-private.h&quot;<br>
<br>
+#ifndef GL_TEXTURE_WRAP_R<br>
+#define GL_TEXTURE_WRAP_R 0x8072<br>
+#endif<br>
+<br>
 struct _CoglSamplerCache<br>
 {<br>
   CoglContext *context;<br>
--<br>
1.7.3.16.g9464b<br>
<br>
_______________________________________________<br>
Cogl mailing list<br>
<a href="mailto:Cogl@lists.freedesktop.org">Cogl@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/cogl" target="_blank">http://lists.freedesktop.org/mailman/listinfo/cogl</a><br>
</blockquote></div>