cogl: Set the layer matrix on the right layer instead of a random one

When uploading the layer matrix to GL it wasn't first calling
glActiveTextureMatrix to set the right texture unit for the
layer. This would end up setting the texture matrix on whatever layer
happened to be previously active. This happened to work for
test-cogl-multitexture presumably because it was coincidentally
setting the layer matrix on the last used layer.

diff --git a/clutter/cogl/cogl/cogl-pipeline-vertend-fixed.c b/clutter/cogl/cogl/cogl-pipeline-vertend-fixed.c
index c26b568..57d6191 100644 (file)
--- a/clutter/cogl/cogl/cogl-pipeline-vertend-fixed.c
+++ b/clutter/cogl/cogl/cogl-pipeline-vertend-fixed.c
@@ -83,6 +83,8 @@ _cogl_pipeline_vertend_fixed_add_layer (CoglPipeline *pipeline,
       _cogl_matrix_stack_set (unit->matrix_stack,
                               &authority->big_state->matrix);
 
+      _cogl_set_active_texture_unit (unit_index);
+
       _cogl_matrix_stack_flush_to_gl (unit->matrix_stack, COGL_MATRIX_TEXTURE);
     }
 

diff --git a/clutter/cogl/cogl/cogl-pipeline-vertend-glsl.c b/clutter/cogl/cogl/cogl-pipeline-vertend-glsl.c
index f32109e..fda8681 100644 (file)
--- a/clutter/cogl/cogl/cogl-pipeline-vertend-glsl.c
+++ b/clutter/cogl/cogl/cogl-pipeline-vertend-glsl.c
@@ -271,6 +271,8 @@ _cogl_pipeline_vertend_glsl_add_layer (CoglPipeline *pipeline,
       _cogl_matrix_stack_set (unit->matrix_stack,
                               &authority->big_state->matrix);
 
+      _cogl_set_active_texture_unit (unit_index);
+
       _cogl_matrix_stack_flush_to_gl (unit->matrix_stack, COGL_MATRIX_TEXTURE);
     }