Commit graph

9350 commits

Author SHA1 Message Date
Alexandros Frantzis
966e4a1738 gl: Add entry for UniformMatrix4fv in the gl dispatch table
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-02-10 14:37:39 +00:00
Adrian Johnson
0984c9ea27 Type1-subset: Fallback if font contains more than one /Encoding
https://bugzilla.gnome.org/show_bug.cgi?id=641704
2011-02-08 21:40:08 +10:30
Andrea Canciani
5f039f0f89 mesh: Rename cairo_pattern_mesh_* functions to cairo_mesh_pattern_*
This is consistent with the naming of most cairo types/functions
(example: cairo_foo_surface_*).

The substitution in the code has been performed using:

  sed -i 's/cairo_pattern_mesh_/cairo_mesh_pattern_/' <files>
2011-02-07 20:28:09 +01:00
Chris Wilson
fda784793e test: Attempt to capture out-of-bounds spans compositing bug
Attempt to provoke out-of-bounds accesses as demonstrated by
https://bugs.launchpad.net/ubuntu/+source/cairo/+bug/710072

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-02-06 18:12:08 +00:00
Chris Wilson
d558f40c44 image: Limit span rendering to bounded extents
We make the presumption that the incoming geometry is appropriately
clipped to the bounded extents and can simply memset without being out
of bounds.

However, this was not always the case as we were removing the clip boxes
in order to optimise the common case where the operation is naturally
limited to the surface.

(This is a candidate for 1.10)

Bugzilla: https://bugs.launchpad.net/ubuntu/+source/cairo/+bug/710072
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-02-06 14:19:23 +00:00
Behdad Esfahbod
fc8c54dafe Don't err on non-invertible font matrix
The scaled-font layer handles that later if it actually is a problem:

    scaled_font->scale_inverse = scaled_font->scale;
    status = cairo_matrix_invert (&scaled_font->scale_inverse);
    if (unlikely (status)) {
        /* If the font scale matrix is rank 0, just using an all-zero inverse matrix
         * makes everything work correctly.  This make font size 0 work without
         * producing an error.
         *
         * FIXME:  If the scale is rank 1, we still go into error mode.  But then
         * again, that's what we do everywhere in cairo.
         *
         * Also, the check for == 0. below may be too harsh...
         */
        if (_cairo_matrix_is_scale_0 (&scaled_font->scale)) {
            cairo_matrix_init (&scaled_font->scale_inverse,
                               0, 0, 0, 0,
                               -scaled_font->scale.x0,
                               -scaled_font->scale.y0);
        } else
            return status;
    }
2011-02-04 15:43:40 -05:00
Alexandros Frantzis
7f15319621 gl: Remove fixed-function related code paths
Fixed-function related code paths are no longer used, as we require shader
support for the gl backend.

Reviewed-by: Eric Anholt <eric@anholt.net>
2011-01-31 16:07:53 -08:00
Alexandros Frantzis
f6ca11694b gl: Remove unnecessary checks for NULL shader implementation
Due to the fact that we fail if the system doesn't support shaders, we
now always have a valid shader implementation.

Reviewed-by: Eric Anholt <eric@anholt.net>
2011-01-31 16:07:53 -08:00
Alexandros Frantzis
037c9ba7e2 gl: Fail if GL implementation doesn't support shaders
The non-shaders implementation was never tuned for fixed-function GL
implementation, the maintainers are not interested in supporting it,
and the hardware is rather rare at this point.  This lets us focus on
the implementation for modern hardware, which needs plenty of work
still.

Reviewed-by: Eric Anholt <eric@anholt.net>
2011-01-31 16:07:53 -08:00
Uli Schlachter
0e08e7adfc XCB: Fix build with xcb-shm disabled
The function _cairo_xcb_shm_image_create is defined and needed even when XCB-SHM
is disabled. In this case it just falls back to an image surface.

Thanks to Benjamin Otte for noticing this.

cairo-xcb-surface-render.c: In function ‘_render_to_picture’:
cairo-xcb-surface-render.c:749: error: implicit declaration of function ‘_cairo_xcb_shm_image_create’
cairo-xcb-surface-render.c:749: warning: nested extern declaration of ‘_cairo_xcb_shm_image_create’

Signed-off-by: Uli Schlachter <psychon@znc.in>
2011-01-31 22:42:24 +01:00
Uli Schlachter
2e81f79e95 xcb: Use a normal image surface if SHM fails
If we can't use SHM, we still have PutImage. So instead of returning the error
to the caller, it makes sense to retry with a normal image surface.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2011-01-31 18:22:06 +01:00
Uli Schlachter
72788a0660 xcb: Move the allocation of a shm surface into its own function
This simplifies the fallback to an image surface when something causes an error.

Additionally, this causes errors from _cairo_xcb_connection_allocate_shm_info to
be handled via falling back to a normal image surface while previously those
were returned to the caller.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2011-01-31 18:20:23 +01:00
Uli Schlachter
48cb9186a2 xcb: Remove a duplicate static function
Both cairo-xcb-surface-core.c and cairo-xcb-surface-render.c contained an
identical definition of _cairo_xcb_shm_image_create. This commits removes the
one from cairo-xcb-surface-render.c and adds the other one to
cairo-xcb-private.h.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2011-01-31 18:19:15 +01:00
Uli Schlachter
274289d8c6 xcb: Limit the amount of SHM used
Without this, one could make cairo attach to lots of shared memory. I managed to
make cairo use 1.5 GiB of shared memory according to top. This was done by
disabling XRENDER and thus causing lots of fallbacks.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2011-01-31 18:18:02 +01:00
Uli Schlachter
a8e8d2aba8 scaled font: Fix the docs for cairo_scaled_font_get_font_face
With the toy font API, it is possible that cairo_scaled_font_get_font_face()
doesn't return the font face which was passed to cairo_scaled_font_create()
despite the docs saying otherwise.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2011-01-27 17:44:59 +01:00
Uli Schlachter
23f87951ba User fonts: Make it clear what should NOT be freed
This is a misunderstanding that I actually saw in some real-world code that used
to work fine with cairo 1.8. Once you spend some time trying to debug such a
problem, you wish the docs would have said so. ;-)

Signed-off-by: Uli Schlachter <psychon@znc.in>
2011-01-27 17:44:59 +01:00
Uli Schlachter
00b1eac4b0 xcb: Document all public functions
These docs are based upon cairo-xlib and the existing documentations for
cairo_xcb_surface_create_with_xrender_format.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2011-01-26 21:10:59 +01:00
Uli Schlachter
9e7ce0c352 xcb: Automatically enable the backend if the libs are available
It looks like the cairo-xcb backend is in a good shape and hopefully will be a
supported backend for cairo 1.12.0. Let's see if this causes lots of new bugs to
be uncovered. :-)

Signed-off-by: Uli Schlachter <psychon@znc.in>
2011-01-26 17:54:13 +01:00
Pino Toscano
0e199ccc57 LD_PRELOAD is supported on Hurd
LD_PRELOAD is supported on Hurd. Adding Hurd to the list of supported
systems makes cairo-trace available on them as well.

See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=608492
2011-01-25 14:36:01 +01:00
Andrea Canciani
f60e8f0bb2 xcb: Fix compositing of pixel-aligned rectangles
bef8b28300 introduced a regression in
the compositing of pixel-aligned rectangles, because it only
translates the destination, instead of destination, source and mask,
by the extents offset.

The same commit introduces some memleaks when the acquisition of an
xcb picture fails.

74374fce9d causes incorrect rendering
whenever extents are not tight.

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=33448
2011-01-25 12:16:51 +01:00
Andrea Canciani
062e78b620 Fix regressions from 1.10 merge
d6dc6e8e39 introduced two regressions:

 - the compiler warns about _gradient_stops_are_opaque being unused in
   cairo-pdf-surface.c

 - get-path-extents now checks for the wrong extents, thus it fails
2011-01-24 10:35:23 +01:00
Uli Schlachter
c7b16098bd xcb: Fix a BadPicture when clearing a surface
This bug was introduced in 6f431886 "xcb: Prefer RenderFillRectangles to perform
the deferred clear". The problem is that we are trying to clear a surface before
we created a Picture for it. This resulted in a FillRectangles call with
dst=XCB_NONE.

I noticed this problem via cairo-perf-micro's dragon-solid-circle-clip.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2011-01-23 22:10:20 +01:00
Chris Wilson
74374fce9d xcb: Only use clip rectangles for more than 1 pixel-aligned box
If there is only a single box, then it is naturally equivalent to the
single call to Composite. So need to incur the addition protocol
overhead of setting up the CompositeClip.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-23 18:33:00 +00:00
Chris Wilson
5809c6ff32 version: Post-snapshot bump 2011-01-23 16:52:50 +00:00
Chris Wilson
ac9ee388fa version: Bump for 1.11.2 snapshot 2011-01-23 16:32:13 +00:00
Chris Wilson
7e75e2d14a NEWS: 1.11.2 snapshot 2011-01-23 16:31:40 +00:00
Chris Wilson
d6dc6e8e39 Merge branch '1.10' into tmp
Synchronize stable bug-fixes with development snapshot

Conflicts:
	cairo-version.h
	src/cairo-path-bounds.c
	src/cairo-pdf-surface.c
	test/get-path-extents.c
2011-01-23 16:05:01 +00:00
Chris Wilson
6c65168dcf Makefile: add missing cairo-box-private.h 2011-01-23 15:46:32 +00:00
Chris Wilson
6f4318869c xcb: Prefer RenderFillRectangles to perform the deferred clear
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-23 13:29:51 +00:00
Chris Wilson
bef8b28300 xcb: Apply a clip region for compositing many-pixel-aligned-boxes
Based on a patch by  Uli Schlachter.

Uli found that the "fast-path" for compositing pixel-aligned boxes did
not live up to its name; using multiple Composite is many times slower,
because of the extra protocol and driver overheads, than specifying a
clip region and a single Composite.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2011-01-23 12:28:06 +00:00
Andrea Canciani
ff9e962165 gstate: Remove unused code
_cairo_gstate_redirect_target asserts that this surface is NULL
immediately before destroying it. If the code is compiled with
assertions disabled and the assert would be false, it is now safer
because instead of an invalid access it will only memleak.

_cairo_gstate_get_parent_target () is not used anymore in
cairo_pop_group () and the related code can be removed.

_cairo_gstate_is_redirected () has never been used.

The comment about the clipping is misleading, because the clip is
translated as expected since fb7f7c2f27.
2011-01-22 11:59:38 +01:00
Andrea Canciani
5d95ae924e gstate: Set an error status when restoring a push_group
cairo_push_group (cr) followed by cairo_restore (cr) should put cr in
an error status of CAIRO_STATUS_INVALID_RESTORE.

Fixes group-state.
2011-01-22 11:59:38 +01:00
Andrea Canciani
e0b741de90 test: Add group-state
The interaction between the group and the state API is currently
untested and buggy. This test tries to use them incorrectly and check
that cairo notices the problem and marks the cr object with an error
status.
2011-01-22 11:59:38 +01:00
Andrea Canciani
b51520628d clip: Improve _cairo_clip_contains_*
_cairo_clip_contains_rectangle() considered a NULL clip empty instead
of containing everything.

_cairo_clip_contains_rectangle() checks for NULL clips, so we don't
have to check for them in _cairo_clip_contains_extents().
2011-01-22 11:56:37 +01:00
Mats Palmgren
47d14586f5 win32: Improve error logging
On win32 stderr is fully buffered, so fflush() should be called after
each error to ensure it is printed to the console.

There is no need to use fwprintf if the format string can be
represented as char*.

See https://bugs.freedesktop.org/show_bug.cgi?id=33319
2011-01-21 09:56:46 +01:00
Andrea Canciani
72a9d49a53 Bump pixman requirements to 0.20.2 for radial gradients
Pixman has PDF-like radial gradients since 0.20.0, but the
implementation of the tangent circles case was not correct. This has
been fixed in 0.20.2, along with some invalid operations fixes.
2011-01-19 15:04:49 +01:00
Andrea Canciani
67cfb20bd0 test: Workaround pixman limits in large-source-roi
Since 1cc750ed92a936d84b47cac696aaffd226e1c02e pixman won't perform
the compositing if it can't prove that this the computations it has to
perform will fit within the size of the variables it uses.

It looks like in this case it cannot prove that no overflow will
happen unless surface_width <= 30582. Instead of this size (discovered
by bisection), a safer looking 30000 was chosen. It should still
trigger the problems the original test was looking for, because
backends which support 30000xheight surfaces will likely support
32767xheight as well.
2011-01-19 14:41:52 +01:00
Andrea Canciani
b8e7bfdff0 quartz: Respect pattern filter settings
CAIRO_FILTER_FAST and CAIRO_FILTER_NEAREST both map to nearest
neighbor filtering, whereas all other filter modes are names for
bilinear filtering.

Additionally, translations matrices are transformed into integer
translations when possible (i.e. when they are used on an nearest
neighbor filtered surface pattern), which makes Quartz behave as
cairo-image for these simple transformations.

Fixes a1-image-sample, a1-mask-sample, filter-nearest-offset.

Improves the output of filter-nearest-transformed and
rotate-image-surface-paint. They are not blurry anymore, but they are
different from the reference images because of different in/out rules
between Quartz and cairo-image.
2011-01-19 13:27:33 +01:00
Andrea Canciani
45da39dda7 quartz: Avoid using private APIs
CGContextSetCTM() is not part of the public API and can easily be
replaced by CGContextConcatCTM()-ing an appropriate matrix.
2011-01-19 12:00:58 +01:00
Andrea Canciani
ca9068839b quartz: Use CGLayer to implement unbounded operators
Quartz operators are not unbounded, but it is possible to implement
unbounded operators by using a temporary destination.

Fixes clip-stroke-unbounded, clip-fill-nz-unbounded,
clip-fill-eo-unbounded, clip-operator, operator-alpha-alpha,
overlapping-glyphs, surface-pattern-operator, unbounded-operator.
2011-01-19 12:00:58 +01:00
Andrea Canciani
d7e3637af2 quartz: Cleanup extents computation
All the draw operations use the same code to compute the gradient
parameter range. It can be moved to the function which sets up the
source.
2011-01-19 11:53:53 +01:00
Andrea Canciani
aa2fb0c05f quartz: Do not use opaque patterns as masks
When an opaque surface is used as a mask, Quartz converts it to
greyscale and uses the result as an alpha value. Cairo expects the
mask operation to ignore the color components and only use the alpha
of the pattern.

The expected behavior can be achieved by drawing the mask on a
temporary surface with an alpha channel.

Fixes clear-source.
2011-01-19 11:53:53 +01:00
Andrea Canciani
7d89d69c49 quartz: Make huge domain handling more stable
Quartz cannot correctly handle arbitrary domains. Falling back is
needed to get correct results on very large (in parameter space)
gradients.

For PAD extended gradients, limiting the domain to (at most) [-0.5,
1.5] is sufficient to guarantee that it will correctly sample the
extreme stops and improves the accuracy (over having a much bigger
domain).

Fixes radial-gradient, radial-gradient-mask, radial-gradient-source,
radial-gradient-mask-source, radial-gradient-one-stop.

Improves the quality of the linear gradients in linear-gradient,
linear-gradient-subset, mask, operator-source, trap-clip.
2011-01-19 11:53:52 +01:00
Andrea Canciani
4874dab984 quartz: Use standard stack allocation size
Make cairo-quartz respect the convention that stack-allocated data
structures use the size computed by CAIRO_STACK_ARRAY_LENGTH ().

Additionally this increases the size of the dash and glyph arrays,
making dynamic memory allocation less likely.
2011-01-19 11:53:52 +01:00
Andrea Canciani
5a1e590b12 test: Update quartz ref images
The following commits fix and/or improve the output of some tests.
Updating the ref images before fixing the code allows to check that
the fix is correct and makes it easy to find out which tests are fixed
by each commit.
2011-01-19 11:52:41 +01:00
Andrea Canciani
2e75bf5a25 test: Fix operator-alpha-alpha
The test is checking the compositing of color-alpha sources although
it was meant to check the compositing of alpha-only sources on
alpha-only destinations.

This commit fixes the code to respect the test description.
2011-01-19 11:52:40 +01:00
Andrea Canciani
45505fc5fb Add a results.tar.gz target to the test Makefile
Sometimes it is useful to be able to package the result of a run of
the testsuite. This new target creates an archive containing the html
page and at least all the files it links to.

The archive might contain some unneeded images.
2011-01-18 16:00:08 +01:00
Andrea Canciani
8c031c029d pdf,ps,quartz: Use correct tolerance for gradient domain computation
The tolerance argument of _cairo_gradient_pattern_box_to_parameter ()
is in pattern space, so to have it constant in device space, it should
depend on the pattern matrix.

In ps and pdf the fallback resolution alone is not meaningful. The
resolution/fallback_resolution ratio should be used instead.
2011-01-18 15:15:28 +01:00
Andrea Canciani
78eade13b1 gl: Don't ignore offset for gradient sources
_cairo_gl_operand_init() has parameters to specify an offset for the
source and another for the destination.

_cairo_gl_gradient_operand_init() incorrectly assumed that the two
offsets were identical.

Fixes mask, radial-gradient-mask-source.
2011-01-18 15:10:55 +01:00
Andrea Canciani
49171fb534 gl: Update radial gradient implementation
Cairo assumes that radial gradients are drawn as defined in ISO3200
since b661bc8712.

To implement them in GLSL, three different shaders are required:
 - tangent circles (a=0 in the parameter equation)
 - none-extended gradient (solutions outside [0,1] must be ignored)
 - extended gradient

Moreover, texcoords are used instead of gl_FragCoord, to fix the
flipping as per 31e116f084.

Fixes huge-radial, radial-gradient, radial-gradient-extend,
radial-gradient-mask, radial-gradient-source.
2011-01-18 15:10:55 +01:00