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

journal: remove possability of fallback layers

Browse Source 
When logging quads in the journal it used to be possible to specify a
mask of fallback layers (layers where a default white texture should be
used in-place of the corresponding texture in the current source
pipeline). Since we now handle fallbacks for cogl_rectangle* primitives
when validating the pipeline up-front before logging in the journal we
no longer need the ability for the journal to apply fallbacks too.
This commit is contained in:
Robert Bragg 2010-11-22 12:44:36 +00:00
parent 305bb124b7
commit 99f4832c28
3 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clutter/cogl/cogl/cogl-journal-private.h
View File

@ -45,7 +45,6 @@ void
_cogl_journal_log_quad (const float *position, _cogl_journal_log_quad (const float *position,
CoglPipeline *pipeline, CoglPipeline *pipeline,
int n_layers, int n_layers,
guint32 fallback_layers,
CoglHandle layer0_override_texture, CoglHandle layer0_override_texture,
const float *tex_coords, const float *tex_coords,
unsigned int tex_coords_len); unsigned int tex_coords_len);

6
clutter/cogl/cogl/cogl-journal.c
View File

@ -770,7 +770,6 @@ void
_cogl_journal_log_quad (const float *position, _cogl_journal_log_quad (const float *position,
CoglPipeline *pipeline, CoglPipeline *pipeline,
int n_layers, int n_layers,
guint32 fallback_layers,
CoglHandle layer0_override_texture, CoglHandle layer0_override_texture,
const float *tex_coords, const float *tex_coords,
unsigned int tex_coords_len) unsigned int tex_coords_len)
@ -921,11 +920,6 @@ _cogl_journal_log_quad (const float *position,
flush_options.disable_layers = disable_layers; flush_options.disable_layers = disable_layers;
flush_options.flags |= COGL_PIPELINE_FLUSH_DISABLE_MASK; flush_options.flags |= COGL_PIPELINE_FLUSH_DISABLE_MASK;
} }
if (G_UNLIKELY (fallback_layers))
{
flush_options.fallback_layers = fallback_layers;
flush_options.flags |= COGL_PIPELINE_FLUSH_FALLBACK_MASK;
}
if (G_UNLIKELY (layer0_override_texture)) if (G_UNLIKELY (layer0_override_texture))
{ {
flush_options.flags |= COGL_PIPELINE_FLUSH_LAYER0_OVERRIDE; flush_options.flags |= COGL_PIPELINE_FLUSH_LAYER0_OVERRIDE;

2
clutter/cogl/cogl/cogl-primitives.c
View File

@ -123,7 +123,6 @@ log_quad_sub_textures_cb (CoglHandle texture_handle,
_cogl_journal_log_quad (quad_coords, _cogl_journal_log_quad (quad_coords,
state->pipeline, state->pipeline,
1, /* one layer */ 1, /* one layer */
0, /* don't need to use fallbacks */
texture_override, /* replace the layer0 texture */ texture_override, /* replace the layer0 texture */
subtexture_coords, subtexture_coords,
4); 4);
@ -543,7 +542,6 @@ _cogl_multitexture_quad_single_primitive (const float *position,
_cogl_journal_log_quad (position, _cogl_journal_log_quad (position,
pipeline, pipeline,
n_layers, n_layers,
0, /* we don't need fallback layers */
COGL_INVALID_HANDLE, /* no texture override */ COGL_INVALID_HANDLE, /* no texture override */
final_tex_coords, final_tex_coords,
n_layers * 4); n_layers * 4);