summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Roberts <neil@linux.intel.com>2012-10-01 15:30:20 +0100
committerNeil Roberts <neil@linux.intel.com>2012-10-01 17:25:29 +0100
commit34143bc6f1239c9cb22ba613521ba9ee7ec7059a (patch)
treeb2311a1c80a87af7ff463af6cf7bb354ae23d1d4
parent5469a25413883080df75a80153accf5d9124f716 (diff)
downloadcogl-34143bc6f1239c9cb22ba613521ba9ee7ec7059a.tar.gz
Fix a warning when building without GLES2 support
Since commit 2701b93f cogl-pipeline-opengl.c always has code which calls _cogl_pipeline_progend_glsl_get_attrib_location but the header declaring this function was only included if GLES2 support was enabled. This was making it give an annoying warning so let's just unconditionally include it. Reviewed-by: Robert Bragg <robert@linux.intel.com>
-rw-r--r--cogl/driver/gl/cogl-pipeline-opengl.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/cogl/driver/gl/cogl-pipeline-opengl.c b/cogl/driver/gl/cogl-pipeline-opengl.c
index fe4558b1..a65caf9a 100644
--- a/cogl/driver/gl/cogl-pipeline-opengl.c
+++ b/cogl/driver/gl/cogl-pipeline-opengl.c
@@ -37,10 +37,7 @@
#include "cogl-framebuffer-private.h"
#include "cogl-offscreen.h"
-/* This is needed to set the color attribute on GLES2 */
-#ifdef HAVE_COGL_GLES2
#include "cogl-pipeline-progend-glsl-private.h"
-#endif
#include <glib.h>
#include <string.h>