diff --git a/clutter/cogl/cogl/cogl-journal-private.h b/clutter/cogl/cogl/cogl-journal-private.h index eccc242bc..0da86ff9e 100644 --- a/clutter/cogl/cogl/cogl-journal-private.h +++ b/clutter/cogl/cogl/cogl-journal-private.h @@ -45,7 +45,6 @@ void _cogl_journal_log_quad (const float *position, CoglPipeline *pipeline, int n_layers, - guint32 fallback_layers, CoglHandle layer0_override_texture, const float *tex_coords, unsigned int tex_coords_len); diff --git a/clutter/cogl/cogl/cogl-journal.c b/clutter/cogl/cogl/cogl-journal.c index 60b717094..51bf76a96 100644 --- a/clutter/cogl/cogl/cogl-journal.c +++ b/clutter/cogl/cogl/cogl-journal.c @@ -770,7 +770,6 @@ void _cogl_journal_log_quad (const float *position, CoglPipeline *pipeline, int n_layers, - guint32 fallback_layers, CoglHandle layer0_override_texture, const float *tex_coords, unsigned int tex_coords_len) @@ -921,11 +920,6 @@ _cogl_journal_log_quad (const float *position, flush_options.disable_layers = disable_layers; 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)) { flush_options.flags |= COGL_PIPELINE_FLUSH_LAYER0_OVERRIDE; diff --git a/clutter/cogl/cogl/cogl-primitives.c b/clutter/cogl/cogl/cogl-primitives.c index eb487fad3..23fccf4af 100644 --- a/clutter/cogl/cogl/cogl-primitives.c +++ b/clutter/cogl/cogl/cogl-primitives.c @@ -123,7 +123,6 @@ log_quad_sub_textures_cb (CoglHandle texture_handle, _cogl_journal_log_quad (quad_coords, state->pipeline, 1, /* one layer */ - 0, /* don't need to use fallbacks */ texture_override, /* replace the layer0 texture */ subtexture_coords, 4); @@ -543,7 +542,6 @@ _cogl_multitexture_quad_single_primitive (const float *position, _cogl_journal_log_quad (position, pipeline, n_layers, - 0, /* we don't need fallback layers */ COGL_INVALID_HANDLE, /* no texture override */ final_tex_coords, n_layers * 4);