isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 18:11:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Call glClientActiveTexture() through COGL context.

Browse Source 
Fixes build issues on systems with OpenGL header older than 1.3.
This commit is contained in:
Ole André Vadla Ravnås 2009-07-01 16:27:11 +02:00 committed by Neil Roberts
parent f61f66c6fe
commit 0157851270
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/cogl/common/cogl.c
View File

@ -48,6 +48,10 @@ typedef CoglFuncPtr (*GLXGetProcAddressProc) (const guint8 *procName);
#include "cogl-gles2-wrapper.h" #include "cogl-gles2-wrapper.h"
#endif #endif
#ifdef HAVE_COGL_GL
#define glClientActiveTexture ctx->pf_glClientActiveTexture
#endif
#ifdef COGL_GL_DEBUG #ifdef COGL_GL_DEBUG
/* GL error to string conversion */ /* GL error to string conversion */
static const struct { static const struct {

2
clutter/cogl/gl/cogl-primitives.c
View File

@ -37,6 +37,8 @@
#define _COGL_MAX_BEZ_RECURSE_DEPTH 16 #define _COGL_MAX_BEZ_RECURSE_DEPTH 16
#define glClientActiveTexture ctx->pf_glClientActiveTexture
void void
_cogl_path_add_node (gboolean new_sub_path, _cogl_path_add_node (gboolean new_sub_path,
float x, float x,