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

Always bind a new texture to unit 1 when necessary

Browse Source 
The special handling for texture unit 1 caught the case where unit
1 was changed for transient purposes, but didn't properly handle
the case where the actual non-transient texture was different between
two materials with no transient binding in between.

If the actual texture has changed when flushing, mark unit 1 as dirty
and needing a rebind.

http://bugzilla.clutter-project.org/show_bug.cgi?id=2261
This commit is contained in:
Owen W. Taylor 2010-08-09 15:06:35 -04:00 committed by Robert Bragg
parent b646f0cfa9
commit de8276105f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -737,7 +737,9 @@ flush_layers_common_gl_state_cb (CoglMaterialLayer *layer, void *user_data)
*/ */
if (unit->gl_texture != gl_texture || unit->is_foreign) if (unit->gl_texture != gl_texture || unit->is_foreign)
{ {
if (unit_index != 1) if (unit_index == 1)
unit->dirty_gl_texture = TRUE;
else
GE (glBindTexture (gl_target, gl_texture)); GE (glBindTexture (gl_target, gl_texture));
unit->gl_texture = gl_texture; unit->gl_texture = gl_texture;
} }