brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

material: don't dereference layer->texture directly

Browse Source 
In _cogl_material_texture_storage_change_notify we were potentially
dereferencing layer->texture without checking first that it is the
authority of texture state. We now use
_cogl_material_layer_get_texture() instead.
This commit is contained in:
Robert Bragg 2010-08-08 13:05:40 +01:00
parent 8caaf5a8b2
commit a75a7fadab
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cogl/cogl-material-opengl.c
View File

@ -258,7 +258,7 @@ _cogl_delete_gl_texture (GLuint gl_texture)
/* Whenever the underlying GL texture storage of a CoglTexture is /* Whenever the underlying GL texture storage of a CoglTexture is
* changed (e.g. due to migration out of a texture atlas) then we are * changed (e.g. due to migration out of a texture atlas) then we are
* notified. This lets us ensure that we reflush that texture's state * notified. This lets us ensure that we reflush that texture's state
* if it reused again with the same texture unit. * if it is reused again with the same texture unit.
*/ */
void void
_cogl_material_texture_storage_change_notify (CoglHandle texture) _cogl_material_texture_storage_change_notify (CoglHandle texture)
@ -273,7 +273,7 @@ _cogl_material_texture_storage_change_notify (CoglHandle texture)
&g_array_index (ctx->texture_units, CoglTextureUnit, i); &g_array_index (ctx->texture_units, CoglTextureUnit, i);
if (unit->layer && if (unit->layer &&
unit->layer->texture == texture) _cogl_material_layer_get_texture (unit->layer) == texture)
unit->texture_storage_changed = TRUE; unit->texture_storage_changed = TRUE;
/* NB: the texture may be bound to multiple texture units so /* NB: the texture may be bound to multiple texture units so