← Back to branch summary

~ubuntu-branches/ubuntu/raring/cairo/raring

« back to all changes in this revision

Viewing changes to src/cairo-gl-traps-compositor.c

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2013-01-23 21:19:34 UTC
  • mfrom: (1.3.11) (28.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20130123211934-q9qb538ujcmkliic
Tags: 1.12.10-1ubuntu1
https://launchpad.net/bugs/725434
* Merge from Debian, remaining changes:
* debian/patches/server_side_gradients.patch:
  - Don't use server side gradients, most drivers don't handle those and
    are really slow
* debian/control: Add missing libxext-dev dependency to libcairo2-dev.
  Spotted by autopkgtest.
* debian/patches/git_evince_rendering_fix.patch:
  Backport GIT commit to fix a rendering bug in evince
* debian/control, debian/libcairo2.symbols, debian/rules:
  - Disable GL backend due to LP: #725434

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cairo-gl-traps-compositor.c
110
110
                    const cairo_boxes_t *boxes)
111
111
{
112
112
    const struct _cairo_boxes_chunk *chunk;
 
113
    cairo_gl_emit_rect_t emit = _cairo_gl_context_choose_emit_rect (ctx);
113
114
    int i;
114
115
 
115
116
    for (chunk = &boxes->chunks; chunk; chunk = chunk->next) {
118
119
            int y1 = _cairo_fixed_integer_part (chunk->base[i].p1.y);
119
120
            int x2 = _cairo_fixed_integer_part (chunk->base[i].p2.x);
120
121
            int y2 = _cairo_fixed_integer_part (chunk->base[i].p2.y);
121
 
            _cairo_gl_composite_emit_rect (ctx, x1, y1, x2, y2, 0);
 
122
            emit (ctx, x1, y1, x2, y2);
122
123
        }
123
124
    }
124
125
}
228
229
        goto FAIL;
229
230
 
230
231
    /* XXX clip */
231
 
    _cairo_gl_composite_emit_rect (ctx, dst_x, dst_y, dst_x+width, dst_y+height, 0);
 
232
    _cairo_gl_context_emit_rect (ctx, dst_x, dst_y, dst_x+width, dst_y+height);
232
233
    status = _cairo_gl_context_release (ctx, CAIRO_STATUS_SUCCESS);
233
234
 
234
235
FAIL:
403
404
        goto FAIL;
404
405
 
405
406
    /* XXX clip */
406
 
    _cairo_gl_composite_emit_rect (ctx,
407
 
                                   extents->x-dst_x, extents->y-dst_y,
408
 
                                   extents->x-dst_x+extents->width,
409
 
                                   extents->y-dst_y+extents->height, 0);
 
407
    _cairo_gl_context_emit_rect (ctx,
 
408
                                 extents->x-dst_x, extents->y-dst_y,
 
409
                                 extents->x-dst_x+extents->width,
 
410
                                 extents->y-dst_y+extents->height);
410
411
    status = _cairo_gl_context_release (ctx, CAIRO_STATUS_SUCCESS);
411
412
 
412
413
FAIL:
499
500
        goto FAIL;
500
501
 
501
502
    /* XXX clip */
502
 
    _cairo_gl_composite_emit_rect (ctx,
503
 
                                   dst_x, dst_y,
504
 
                                   dst_x+extents->width,
505
 
                                   dst_y+extents->height, 0);
 
503
    _cairo_gl_context_emit_rect (ctx,
 
504
                                 dst_x, dst_y,
 
505
                                 dst_x+extents->width,
 
506
                                 dst_y+extents->height);
506
507
    status = _cairo_gl_context_release (ctx, CAIRO_STATUS_SUCCESS);
507
508
 
508
509
FAIL: