[cogl/wip/cogl-1.14: 49/177] Fix a warning when building without GLES2 support
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/wip/cogl-1.14: 49/177] Fix a warning when building without GLES2 support
- Date: Mon, 21 Jan 2013 15:49:03 +0000 (UTC)
commit 2336740c1f3afb6108453c3cb67df37b0fb12742
Author: Neil Roberts <neil linux intel com>
Date: Mon Oct 1 15:30:20 2012 +0100
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>
(cherry picked from commit 34143bc6f1239c9cb22ba613521ba9ee7ec7059a)
cogl/driver/gl/cogl-pipeline-opengl.c | 3 ---
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 8995541..f5bb489 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>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]