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

cogl-material: Ensure mipmaps before doing anything else on a texture

Browse Source 
When the texture is in the atlas, ensuring the mipmaps can effectively
make it become a completely different texture so we should do this
before getting the GL handle.
This commit is contained in:
Neil Roberts 2009-12-05 14:20:00 +00:00
parent 231cfffa18
commit 34b50934be
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
clutter/cogl/cogl/cogl-material.c
View File

@ -1400,7 +1400,17 @@ _cogl_material_flush_layers_gl_state (CoglMaterial *material,
tex_handle = layer->texture; tex_handle = layer->texture;
if (tex_handle != COGL_INVALID_HANDLE) if (tex_handle != COGL_INVALID_HANDLE)
cogl_texture_get_gl_texture (tex_handle, &gl_texture, &gl_target); {
if (is_mipmap_filter (layer->min_filter)
|| is_mipmap_filter (layer->mag_filter))
_cogl_texture_ensure_mipmaps (tex_handle);
_cogl_texture_set_filters (tex_handle,
layer->min_filter,
layer->mag_filter);
cogl_texture_get_gl_texture (tex_handle, &gl_texture, &gl_target);
}
else else
{ {
new_gl_layer_info.fallback = TRUE; new_gl_layer_info.fallback = TRUE;
@ -1431,13 +1441,6 @@ _cogl_material_flush_layers_gl_state (CoglMaterial *material,
GE (glActiveTexture (GL_TEXTURE0 + i)); GE (glActiveTexture (GL_TEXTURE0 + i));
unit = _cogl_get_texture_unit (i); unit = _cogl_get_texture_unit (i);
_cogl_texture_set_filters (layer->texture,
layer->min_filter,
layer->mag_filter);
if (is_mipmap_filter (layer->min_filter)
|| is_mipmap_filter (layer->mag_filter))
_cogl_texture_ensure_mipmaps (layer->texture);
/* FIXME: We could be more clever here and only bind the texture /* FIXME: We could be more clever here and only bind the texture
if it is different from gl_layer_info->gl_texture to avoid if it is different from gl_layer_info->gl_texture to avoid
redundant GL calls. However a few other places in Cogl and redundant GL calls. However a few other places in Cogl and