From 01578512706fb4bd46d99574a8282cd4d25f7bad Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= Date: Wed, 1 Jul 2009 16:27:11 +0200 Subject: [PATCH] Call glClientActiveTexture() through COGL context. Fixes build issues on systems with OpenGL header older than 1.3. --- clutter/cogl/common/cogl.c | 4 ++++ clutter/cogl/gl/cogl-primitives.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/clutter/cogl/common/cogl.c b/clutter/cogl/common/cogl.c index 9c92cda..bfd2aac 100644 --- a/clutter/cogl/common/cogl.c +++ b/clutter/cogl/common/cogl.c @@ -48,6 +48,10 @@ typedef CoglFuncPtr (*GLXGetProcAddressProc) (const guint8 *procName); #include "cogl-gles2-wrapper.h" #endif +#ifdef HAVE_COGL_GL +#define glClientActiveTexture ctx->pf_glClientActiveTexture +#endif + #ifdef COGL_GL_DEBUG /* GL error to string conversion */ static const struct { diff --git a/clutter/cogl/gl/cogl-primitives.c b/clutter/cogl/gl/cogl-primitives.c index bdc24f7..0c2f655 100644 --- a/clutter/cogl/gl/cogl-primitives.c +++ b/clutter/cogl/gl/cogl-primitives.c @@ -37,6 +37,8 @@ #define _COGL_MAX_BEZ_RECURSE_DEPTH 16 +#define glClientActiveTexture ctx->pf_glClientActiveTexture + void _cogl_path_add_node (gboolean new_sub_path, float x, -- 2.7.4