From f89ff7f3835edab93de1c67895b6a754abffc5eb Mon Sep 17 00:00:00 2001
From: Neil Roberts <neil@linux.intel.com>
Date: Thu, 4 Jun 2009 11:50:06 +0100
Subject: [PATCH] Load glBlendEquation and glBlendColor using
 cogl_get_proc_address

These are defined since OpenGL 1.2 and since Windows doesn't export
any functions defined after 1.1 we need to load them dynamically.
---
 clutter/cogl/common/cogl-material.c |  2 ++
 clutter/cogl/gl/cogl-context.h      |  2 ++
 clutter/cogl/gl/cogl-defines.h.in   | 11 +++++++++++
 clutter/cogl/gl/cogl.c              |  7 +++++++
 4 files changed, 22 insertions(+)

diff --git a/clutter/cogl/common/cogl-material.c b/clutter/cogl/common/cogl-material.c
index 7e8567a6e..85f9f343b 100644
--- a/clutter/cogl/common/cogl-material.c
+++ b/clutter/cogl/common/cogl-material.c
@@ -52,6 +52,8 @@
 #define glActiveTexture ctx->pf_glActiveTexture
 #define glClientActiveTexture ctx->pf_glClientActiveTexture
 #define glBlendFuncSeparate ctx->pf_glBlendFuncSeparate
+#define glBlendEquation ctx->pf_glBlendEquation
+#define glBlendColor ctx->pf_glBlendColor
 #define glBlendEquationSeparate ctx->pf_glBlendEquationSeparate
 #endif
 
diff --git a/clutter/cogl/gl/cogl-context.h b/clutter/cogl/gl/cogl-context.h
index 10e56e510..3db4c0e9e 100644
--- a/clutter/cogl/gl/cogl-context.h
+++ b/clutter/cogl/gl/cogl-context.h
@@ -170,6 +170,8 @@ typedef struct
   COGL_PFNGLACTIVETEXTUREPROC                      pf_glActiveTexture;
   COGL_PFNGLCLIENTACTIVETEXTUREPROC                pf_glClientActiveTexture;
 
+  COGL_PFNGLBLENDEQUATIONPROC                      pf_glBlendEquation;
+  COGL_PFNGLBLENDCOLORPROC                         pf_glBlendColor;
   COGL_PFNGLBLENDFUNCSEPARATEPROC                  pf_glBlendFuncSeparate;
   COGL_PFNGLBLENDEQUATIONSEPARATEPROC              pf_glBlendEquationSeparate;
 } CoglContext;
diff --git a/clutter/cogl/gl/cogl-defines.h.in b/clutter/cogl/gl/cogl-defines.h.in
index bde93c559..4805ea5b3 100644
--- a/clutter/cogl/gl/cogl-defines.h.in
+++ b/clutter/cogl/gl/cogl-defines.h.in
@@ -1032,6 +1032,17 @@ typedef void
   (GLenum                modeRGB,
    GLenum                modeAlpha);
 
+typedef void
+  (APIENTRYP             COGL_PFNGLBLENDEQUATIONPROC)
+  (GLenum                mode);
+
+typedef void
+  (APIENTRYP             COGL_PFNGLBLENDCOLORPROC)
+  (GLclampf              red,
+   GLclampf              green,
+   GLclampf              blue,
+   GLclampf              alpha);
+
 G_END_DECLS
 
 #endif
diff --git a/clutter/cogl/gl/cogl.c b/clutter/cogl/gl/cogl.c
index 8fcd3eabd..608bc364e 100644
--- a/clutter/cogl/gl/cogl.c
+++ b/clutter/cogl/gl/cogl.c
@@ -486,6 +486,13 @@ _cogl_features_init (void)
         (COGL_PFNGLCLIENTACTIVETEXTUREPROC)
         cogl_get_proc_address ("glClientActiveTexture");
 
+  ctx->pf_glBlendEquation =
+         (COGL_PFNGLBLENDEQUATIONPROC)
+         cogl_get_proc_address ("glBlendEquation");
+  ctx->pf_glBlendColor =
+         (COGL_PFNGLBLENDCOLORPROC)
+         cogl_get_proc_address ("glBlendColor");
+
   /* Available in 1.4 */
   ctx->pf_glBlendFuncSeparate =
         (COGL_PFNGLBLENDFUNCSEPARATEPROC)