gl: fix parameter order in setup_spans() function 03/45103/2
authorHenry Song <henry.song@samsung.com>
Tue, 21 Jul 2015 21:53:52 +0000 (14:53 -0700)
committernisanthmp <nisanth.mp@samsung.com>
Mon, 3 Aug 2015 13:18:33 +0000 (18:48 +0530)
Change-Id: I42dad907a1851df4fc4a4664b1023dcd9ba3c0dd
Signed-off-by: nisanthmp <nisanth.mp@samsung.com>
src/cairo-gl-composite.c

index 57d7ddf..e8c0137 100644 (file)
@@ -321,8 +321,8 @@ _cairo_gl_context_setup_operand (cairo_gl_context_t *ctx,
 
 static void
 _cairo_gl_context_setup_spans (cairo_gl_context_t *ctx,
-                              cairo_bool_t        encode_src_as_attribute,
                               cairo_bool_t        spans_enabled,
+                              cairo_bool_t        encode_src_as_attribute,
                               unsigned int        vertex_size,
                               unsigned int        vertex_offset)
 {
@@ -798,12 +798,10 @@ _cairo_gl_set_operands_and_operator (cairo_gl_composite_t *setup,
     if (setup->spans)
        vertex_size += sizeof (GLfloat);
 
-    if (setup->src.type != CAIRO_GL_OPERAND_CONSTANT ||
-       ! setup->src.constant.encode_as_attribute)
+    if (setup->src.type == CAIRO_GL_OPERAND_CONSTANT)
        _cairo_gl_context_setup_spans (ctx,
                                       setup->spans,
-                                      setup->src.type == CAIRO_GL_OPERAND_CONSTANT ||
-                                      ! setup->src.constant.encode_as_attribute,
+                                      setup->src.constant.encode_as_attribute,
                                       vertex_size,
                                       dst_size + src_size + mask_size);