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

cogl-material: Fix some problems with flushing texture overrides

Browse Source 
There were a few problems flushing texture overrides so that sliced
textures would not work:

* In _cogl_material_set_layer_texture it ignored the 'overriden'
  parameter and always set texture_overridden to FALSE.

* cogl_texture_get_gl_texture wasn't being called correctly in
  override_layer_texture_cb. It returns a gboolean to indicate the
  error status but this boolean was being assigned to gl_target.

* _cogl_material_layer_texture_equal did not take into account the
  override.

* _cogl_material_layer_get_texture_info did not return the overridden
  texture so it would always use the first texture slice.
This commit is contained in:
Neil Roberts 2010-07-08 18:28:11 +01:00
parent 61cbeeacfa
commit 475a72fd94
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cogl/cogl-material.c
View File

@ -2042,7 +2042,7 @@ _cogl_material_set_layer_texture (CoglMaterial *material,
layer->texture != COGL_INVALID_HANDLE) layer->texture != COGL_INVALID_HANDLE)
cogl_handle_unref (layer->texture); cogl_handle_unref (layer->texture);
layer->texture = texture; layer->texture = texture;
layer->texture_overridden = FALSE; layer->texture_overridden = overriden;
layer->slice_gl_texture = slice_gl_texture; layer->slice_gl_texture = slice_gl_texture;
layer->slice_gl_target = slice_gl_target; layer->slice_gl_target = slice_gl_target;
@ -2651,7 +2651,7 @@ override_layer_texture_cb (CoglMaterialLayer *layer, void *user_data)
texture = _cogl_material_layer_get_texture (layer); texture = _cogl_material_layer_get_texture (layer);
if (texture != COGL_INVALID_HANDLE) if (texture != COGL_INVALID_HANDLE)
gl_target = cogl_texture_get_gl_texture (texture, NULL, &gl_target); cogl_texture_get_gl_texture (texture, NULL, &gl_target);
else else
gl_target = GL_TEXTURE_2D; gl_target = GL_TEXTURE_2D;
@ -2736,6 +2736,15 @@ _cogl_material_layer_texture_equal (CoglMaterialLayer *authority0,
{ {
if (authority0->texture != authority1->texture) if (authority0->texture != authority1->texture)
return FALSE; return FALSE;
if (authority0->texture_overridden != authority1->texture_overridden)
return FALSE;
if (authority0->texture_overridden &&
(authority0->slice_gl_texture != authority1->slice_gl_texture ||
authority0->slice_gl_target != authority1->slice_gl_target))
return FALSE;
return TRUE; return TRUE;
} }
@ -5358,8 +5367,13 @@ _cogl_material_layer_get_texture_info (CoglMaterialLayer *layer,
*texture = layer->texture; *texture = layer->texture;
if (G_UNLIKELY (*texture == COGL_INVALID_HANDLE)) if (G_UNLIKELY (*texture == COGL_INVALID_HANDLE))
*texture = ctx->default_gl_texture_2d_tex; *texture = ctx->default_gl_texture_2d_tex;
if (layer->texture_overridden)
{
*gl_texture = layer->slice_gl_texture;
*gl_target = layer->slice_gl_target;
}
else
cogl_texture_get_gl_texture (*texture, gl_texture, gl_target); cogl_texture_get_gl_texture (*texture, gl_texture, gl_target);
return;
} }
#ifndef HAVE_COGL_GLES #ifndef HAVE_COGL_GLES