From f39f841f012538d8702a7e9c4d2a9d4b22fb1716 Mon Sep 17 00:00:00 2001 From: Henry Song Date: Tue, 21 Jul 2015 14:53:52 -0700 Subject: gl: fix parameter order in setup_spans() function Change-Id: I42dad907a1851df4fc4a4664b1023dcd9ba3c0dd Signed-off-by: nisanthmp --- src/cairo-gl-composite.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/cairo-gl-composite.c b/src/cairo-gl-composite.c index 57d7ddf31..e8c013758 100644 --- a/src/cairo-gl-composite.c +++ b/src/cairo-gl-composite.c @@ -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); -- cgit v1.2.3