From 401892af1188073dc3107832b8e2e908c5c0e79e Mon Sep 17 00:00:00 2001
From: Neil Roberts <neil@linux.intel.com>
Date: Thu, 27 May 2010 14:51:44 +0100
Subject: [PATCH] cogl: Record new enabled arrays in _cogl_disable_other_texcoord_arrays

When _cogl_disable_other_texcoord_arrays is called it disables the
neccessary texcoord arrays and then removes the bits for the disabled
arrays in ctx->texcoord_arrays_enabled. However none of the places
that call the function then set any bits in ctx->texcoord_arrays_enabled
so the arrays would never get marked and they would never get disabled
again.

This patch just changes it so that _cogl_disable_other_texcoord_arrays
also sets the corresponding bits in ctx->texcoord_arrays_enabled.
---
 clutter/cogl/cogl/cogl-internal.h |    3 ++-
 clutter/cogl/cogl/cogl.c          |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/clutter/cogl/cogl/cogl-internal.h b/clutter/cogl/cogl/cogl-internal.h
index c650960..c4169be 100644
--- a/clutter/cogl/cogl/cogl-internal.h
+++ b/clutter/cogl/cogl/cogl-internal.h
@@ -134,7 +134,8 @@ void
 _cogl_flush_face_winding (void);

 /* Disables the texcoord arrays that don't have a corresponding bit
-   set in the mask */
+   set in the mask and sets ctx->texcoord_arrays_enabled to mask. Note
+   that it doesn't enable any extra texcoord arrays */
 void
 _cogl_disable_other_texcoord_arrays (const CoglBitmask *mask);

diff --git a/clutter/cogl/cogl/cogl.c b/clutter/cogl/cogl/cogl.c
index eab2d12..41dfa53 100644
--- a/clutter/cogl/cogl/cogl.c
+++ b/clutter/cogl/cogl/cogl.c
@@ -790,6 +790,7 @@ _cogl_disable_other_texcoord_arrays (const CoglBitmask *mask)
   /* Update the mask of arrays that are enabled */
   _cogl_bitmask_clear_bits (&ctx->texcoord_arrays_enabled,
                             &ctx->texcoord_arrays_to_disable);
+  _cogl_bitmask_set_bits (&ctx->texcoord_arrays_enabled, mask);
 }

 void
--
1.7.1.87.g94e70