[cogl/wip/neil/master-next] cogl-pipeline-state: Define GL_FUNC_ADD so it'll compile for GLES1
- From: Neil Roberts <nroberts src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/wip/neil/master-next] cogl-pipeline-state: Define GL_FUNC_ADD so it'll compile for GLES1
- Date: Mon, 19 Sep 2011 14:50:54 +0000 (UTC)
commit 5f69b21e1fcfdbea2a436fa94af25a5cfc17ac03
Author: Neil Roberts <neil linux intel com>
Date: Mon Sep 19 13:31:15 2011 +0100
cogl-pipeline-state: Define GL_FUNC_ADD so it'll compile for GLES1
When compiling with just the GLES1 headers GL_FUNC_ADD isn't
defined. There was already a #define for this in cogl-pipeline.c so that
setup_blend_state could work but this function has moved to
cogl-pipeline-state.c so the #define needs to be moved as well.
cogl/cogl-pipeline-state.c | 4 ++++
cogl/cogl-pipeline.c | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/cogl/cogl-pipeline-state.c b/cogl/cogl-pipeline-state.c
index 0becc30..45beb75 100644
--- a/cogl/cogl-pipeline-state.c
+++ b/cogl/cogl-pipeline-state.c
@@ -38,6 +38,10 @@
#include "string.h"
+#ifndef GL_FUNC_ADD
+#define GL_FUNC_ADD 0x8006
+#endif
+
CoglPipeline *
_cogl_pipeline_get_user_program (CoglPipeline *pipeline)
{
diff --git a/cogl/cogl-pipeline.c b/cogl/cogl-pipeline.c
index fd3422e..42923be 100644
--- a/cogl/cogl-pipeline.c
+++ b/cogl/cogl-pipeline.c
@@ -51,10 +51,6 @@
#include <glib/gprintf.h>
#include <string.h>
-#ifndef GL_FUNC_ADD
-#define GL_FUNC_ADD 0x8006
-#endif
-
static CoglPipelineLayer *_cogl_pipeline_layer_copy (CoglPipelineLayer *layer);
static void _cogl_pipeline_free (CoglPipeline *tex);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]