[Cogl] [PATCH 2/2] Fix a warning when building without GLES2 support

[Robert Bragg]

this looks good to land to me:

Reviewed-by: Robert Bragg <robert at linux.intel.com>

thanks,
- Robert

On Mon, Oct 1, 2012 at 3:32 PM, Neil Roberts <neil at linux.intel.com> wrote:
> 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.
> ---
>  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 fe4558b..a65caf9 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>
> --
> 1.7.11.3.g3c3efa5
>
> _______________________________________________
> Cogl mailing list
> Cogl at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/cogl