From 2e77c039c9bf18948398766bb306b9352b1f7663 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Mon, 1 Oct 2012 15:30:20 +0100 Subject: [PATCH] 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 (cherry picked from commit 34143bc6f1239c9cb22ba613521ba9ee7ec7059a) --- cogl/driver/gl/cogl-pipeline-opengl.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/cogl/driver/gl/cogl-pipeline-opengl.c b/cogl/driver/gl/cogl-pipeline-opengl.c index 899554180..f5bb4893e 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 #include