isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 12:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Record new enabled arrays in _cogl_disable_other_texcoord_arrays

Browse Source 
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.
This commit is contained in:
Neil Roberts 2010-05-27 14:51:44 +01:00
parent aab411bde4
commit 401892af11
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clutter/cogl/cogl/cogl-internal.h
View File

@ -134,7 +134,8 @@ void
_cogl_flush_face_winding (void); _cogl_flush_face_winding (void);
/* Disables the texcoord arrays that don't have a corresponding bit /* 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 void
_cogl_disable_other_texcoord_arrays (const CoglBitmask *mask); _cogl_disable_other_texcoord_arrays (const CoglBitmask *mask);

1
clutter/cogl/cogl/cogl.c
View File

@ -790,6 +790,7 @@ _cogl_disable_other_texcoord_arrays (const CoglBitmask *mask)
/* Update the mask of arrays that are enabled */ /* Update the mask of arrays that are enabled */
_cogl_bitmask_clear_bits (&ctx->texcoord_arrays_enabled, _cogl_bitmask_clear_bits (&ctx->texcoord_arrays_enabled,
&ctx->texcoord_arrays_to_disable); &ctx->texcoord_arrays_to_disable);
_cogl_bitmask_set_bits (&ctx->texcoord_arrays_enabled, mask);
} }
void void