From 1564418b3feb9ab010c225129bc1b79b7c882318 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Tue, 30 Nov 2010 16:36:56 +0000 Subject: [PATCH] cogl: Revert "build: Remove unused variable" Having ctx here produces a warning on GLES. However it's needed for Big GL as we have at the top of the file: #ifdef HAVE_COGL_GL #define glClientActiveTexture ctx->drv.pf_glClientActiveTexture #endif This reverts commit 27a3a2056a245aca64b8e3a7d82b7976c13e897a. --- clutter/cogl/cogl/cogl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/clutter/cogl/cogl/cogl.c b/clutter/cogl/cogl/cogl.c index cdb9c2acd..5df6e93dc 100644 --- a/clutter/cogl/cogl/cogl.c +++ b/clutter/cogl/cogl/cogl.c @@ -705,6 +705,8 @@ cogl_read_pixels (int x, static void _cogl_disable_other_texcoord_arrays_cb (int texcoord_array_num, gpointer data) { + CoglContext *ctx = data; + GE (glClientActiveTexture (GL_TEXTURE0 + texcoord_array_num)); GE (glDisableClientState (GL_TEXTURE_COORD_ARRAY)); }