Commit graph

6642 commits

Author SHA1 Message Date
M Joonas Pihlaja
85b81a3e59 [cairo-spans] Implement a span renderer for cairo_image_surface_t.
This implementation first produces an A8 alpha mask and then
pixman_image_composites the result to the destination with the source.
Clipping is handled by pixman when it is region clipping or by
cairo-surface-fallback when it is something more complex.
2008-12-06 14:04:36 +02:00
M Joonas Pihlaja
7994fc06ad [cairo-spans] New cairo_tor_scan_converter_t.
Imports a new polygon scan converter implementation from the
repository at

http://cgit.freedesktop.org/~joonas/glitter-paths/

Glitter paths is a stand alone polygon rasteriser derived from David
Turner's reimplementation of Tor Anderssons's 15x17 supersampling
rasteriser from the Apparition graphics library.  The main new feature
in this implementation is cheaply choosing per-scan line between doing
fully analytical coverage computation for an entire row at a time
vs. using a supersampling approach.
2008-12-06 14:04:36 +02:00
M Joonas Pihlaja
2078e5b20f [cairo-spans] New _cairo_path_fixed_fill_using_spans().
Adds a helper function for backends to use for filling a path using
spans.
2008-12-06 14:04:36 +02:00
M Joonas Pihlaja
4a9b274eeb [cairo-spans] Add a check/create_span_renderer backend methods.
A surface will have the chance to use span rendering at cairo_fill()
time by creating a renderer for a specific combination of
pattern/dst/op before the path is scan converted.  The protocol is to
first call check_span_renderer() to see if the surface wants to render
with spans and then later call create_span_renderer() to create the
renderer for real once the extents of the path are known.

No backends have an implementation yet.
2008-12-06 14:04:36 +02:00
M Joonas Pihlaja
948c3526dc [cairo-spans] New abstract types for scan converting polygons.
A cairo_span_renderer_t implementation can be provided by a surface if
it wants to render paths as horizontal spans of the alpha component of
a mask.  Its job is to composite a source pattern to the destination
surface when given spans of alpha coverage for a row while taking care
of backend specific clipping.

A cairo_scan_converter_t takes edges of a flattened path and generates
spans for a span renderer to render.
2008-12-06 14:04:35 +02:00
M Joonas Pihlaja
4b227143b3 [cairo-spans] Introduce a type to track which pixels combine in a compositing op.
A cairo_composite_rectangles_t contains the coordinates of rectangular
windows into each of the source pattern, mask, clip and destination
surface containing the pixels that will combine in a compositing
operation.  The idea is to have a uniform way to represent all the
translations involved rather than overloading parameters like src_x/y,
dst_x/y, etc., sometimes with different incompatible meanings across
functions.
2008-12-06 14:04:35 +02:00
M Joonas Pihlaja
a370d077bc [path-fixed] New _cairo_path_fixed_is_region().
We want to hit the current fast paths for rendering axis aligned
rectilinear paths rather than spans, and for that we need to be able
to identify regional paths.
2008-12-06 14:04:35 +02:00
M Joonas Pihlaja
6acb822393 [path-fixed] Avoid extra indirection when iterating already flat paths.
Perform a plain iteration rather than a flattening one if the path
knows it doesn't have any curves.
2008-12-06 14:04:35 +02:00
Chris Wilson
0c0f4862c5 [perf-diff] Fix cairo-perf-diff for git 1.6
Since git 1.6 the plumbing commands aren't installed in the user's
path by default.  This patch fixes cairo-perf-diff to find the
git-sh-setup command from git's lib dir.
2008-12-06 13:32:37 +02:00
M Joonas Pihlaja
afba0c3129 [perf] Add perf tests to hit rectilinear code paths.
These tests look at the differences in code paths
hit by filling paths that are rectilinear (or not) and
pixel aligned (or not) with the even-odd and non-zero
fill rules.  The paths are not simple, so they don't
hit the special case quad/triangle tessellator.
2008-12-06 13:30:29 +02:00
M Joonas Pihlaja
8ec58113df [perf] Explicitly test rendering a path with lots of intersections.
We don't have one just for this purpose.  The only other
path with many intersections that gets actually rendered is zrusin-another,
but that might be sped up in the future (say by identifying
collinearities up front or something like that.)
2008-12-06 13:21:44 +02:00
Jeff Muizelaar
08b486c9aa [win32] Use MOD instead of the '%' operator
Repeat should be handled using MOD instead of '%' so that negative numbers
are handled as expected. E.g. -1 mod 600 = 599, not 495 as the '%' operator
gives. This was causing https://bugzilla.mozilla.org/show_bug.cgi?id=466258

Patch from Robert O'Callahan
2008-12-04 17:53:06 -05:00
Chris Wilson
540de34453 [matrix] Optimise invert for simple scaling|translation matrices.
Peter Hercek reported, and provided a very useful test case for, a bug
that caused his applications to crash with Cairo detecting an
non-invertible pattern matrix and thus asserting the impossible happened.
Bisecting revealed that the bug first appeared with 3c18d95 and
disappeared with 0d0c6a1. Since neither of these explain the crash,
further investigation revealed a compiler bug (gcc 4.3.3 20081130,
earlier versions have different bugs!) that caused the matrix inversion
to be invalid iff _cairo_matrix_scalar_multiply() was inlined (i.e. -O0,
or an explicit noinline atttribute on that function prevented the bug, as
did -msse.) So we apply this workaround to hide the bug in the stable
series...

The matrix is quite often just a simple scale and translate (or even
identity!). For this class of matrix, we can skip the full adjoint
rearrangement and determinant calculation and just compute the inverse
directly.
(cherry picked from commit 0d0c6a199c)
2008-12-02 17:31:51 +00:00
Behdad Esfahbod
aff32019a7 [Makefile.am] Use top_srcdir instead of srcdir
Doesn't make much difference here, but makes our intention clear.
2008-11-30 23:28:59 -05:00
Luo Jinghua
51a75ad932 glitz: Replace specified color with an opaque one if dst surface don't have an alpha channel.
Otherwise if underlying glitz drawable has an alpha channel, glitz_set_rectangles
will set its alpha channel to specified value instead of opaque one and effects following
composite operations since glitz draws to attached drawable then copies its content to
the dst surface. With this commit, three test cases such as operator, operator-alpha and
unbounded-operator passes now.
2008-11-30 21:44:36 +08:00
Chris Wilson
7247017cf5 Fix up a couple of likely(malloc==NULL)
Adrian Johnson spotted that I marked a few malloc failures as likely,
whoops.
2008-11-29 11:48:17 +00:00
Chris Wilson
1659db2c1f [test] Fix surface leak from device-offset-positive.
A forgotten cairo_surface_destroy() caused the similar surface to be
leaked during the test.
2008-11-29 11:20:35 +00:00
Chris Wilson
0d757a793d [png] Fix leak of original png data on error path.
The error path was missing a _cairo_output_stream_destroy() to cleanup a
copy of the incoming PNG data.
2008-11-29 11:20:34 +00:00
Chris Wilson
e6963a5bfe Mark allocation failures as unlikely.
Use the gcc likelihood annotation to indicate that allocation failures are
extremely unlikely.
2008-11-29 11:20:34 +00:00
Chris Wilson
d1801c23fa Mark if(status) as being unlikely.
The error paths should be hit very rarely during normal operation, so mark
them as being unlikely so gcc may emit better code.
2008-11-29 11:20:33 +00:00
Chris Wilson
f0804d4856 [test] Exercise caps and joins under reflection.
The nature of the joins depends critically upon whether the joint is
clockwise or counter-clockwise, so extend the basic caps-joins test to
exercise both conditions i.e. repeat the test under a reflection.
2008-11-29 11:20:29 +00:00
Chris Wilson
f39dd86e29 [test] Add simple cap test.
Add a test case that only exercises capping, useful for developing
new strokers.
2008-11-29 10:14:26 +00:00
Chris Wilson
f2982e103c [fill] Allow rectangles to be implicitly closed.
Also scan for appendages of simple rectangles.
2008-11-29 10:14:26 +00:00
Chris Wilson
d2bcf1d76d [path] Carefully check for no more points.
As the empty path points to an embedded buf, we cannot rely on the buf
pointer being NULL to mark end-of-path.
2008-11-29 10:14:26 +00:00
Chris Wilson
424aba9be5 [check] Search for the word NOTE
Add word boundary markers around the regexp so that we only match for the
word NOTE and not on substrings like GL_NOTEQUAL.
2008-11-29 10:14:26 +00:00
Chris Wilson
36147140ce [perf] Fix build
If automake detects the use of cairo_perf_LDADD in an unused conditional
that overrides the default - so we need to manually set cairo_perf_LDADD.
2008-11-29 10:13:53 +00:00
Luo Jinghua
ed6bd4766c image: Use unsigned long to compute color masks.
Use unsigned long in the first place to prevent compiler from
expanding signed bit to all upper bits. e.g, a alpha mask 0xff0000
will expand to 0xffffffffff00000 on 64 bit platform which is not
what we expected.
2008-11-28 07:54:41 +08:00
M Joonas Pihlaja
41cb91d417 [script] Use the in-tree libcairo for csi-replay.
csi-replay was missing the in-tree libcairo.la so the build was
failing while looking for new symbols from the system libcairo.
2008-11-26 23:49:12 +02:00
Chris Wilson
f5634818f1 [os2] Move include cairo.h before os2.h
The defines need to come first, but we specify that cairo.h is the first
header file to be included by files.
2008-11-26 20:23:05 +00:00
Behdad Esfahbod
2f0f9a1a59 [os2] Fix includes
Patch from Dave Yeo to make cairo-os2.h include os2.h directly so the
header is standalone.
2008-11-26 20:22:57 +00:00
Chris Wilson
5591cb58fd [script] Only use zlib if available.
Conditionally link against zlib - replaying a script will fail if the
trace uses a compressed format.
2008-11-26 17:43:22 +00:00
Chris Wilson
9432c0c9b8 [script] Link the interpreter against the built library.
Ensure we correctly link against the version of cairo just built.
2008-11-26 17:35:09 +00:00
Chris Wilson
815e5b962e [script] Add a fallback image surface for replay
If we do not have a native windowing surface compiled into the library,
just replay the script to an image surface.
2008-11-26 17:30:29 +00:00
Chris Wilson
5e37652362 [skiplist] Check for ffs()
Wine at least does not provide ffs(), so check at configure time and
open-code a replacement.
2008-11-26 17:26:57 +00:00
Chris Wilson
60282b866a [glitz] Fix clone_similar().
Clone similar open-coded various image surface functions and failed to
clone a sub-region resulting in failures for mask-transformed-* and
large-source.
2008-11-26 16:58:29 +00:00
Paolo Bonzini
47275c7ece [test] Fix glitz-surface-source test
The recent changes to separate glitz/agl broke the compilation of the
glitz-surface-source test.
2008-11-26 16:18:41 +00:00
Paolo Bonzini
a84ea78290 [test] Add quartz-surface-source test
Add a simple test to exercise using a Quartz surface as a source.
2008-11-26 16:17:45 +00:00
Paolo Bonzini
993941cfd7 [perf] Fix SDL compilation for MacOS X
The attached patch makes the SDL tests compile under Mac OS X.  The
problem is:

1) that <SDL_main.h> should be included in files that define the main
function for SDL Mac OS X programs (this is not true with the upcoming
SDL 1.3 release).

2) that -lSDLmain, because it is statically linked, needs the Cocoa
framework in the LDADD of the main program.  Again, 1.3 will not require
this.
2008-11-26 16:15:35 +00:00
Chris Wilson
8a5b55ca6c [matrix] Impose a maximum number of refinement iterations
Ensure we do not loop forever trying to minimise the error between the
pixman and cairo matrices - for instance when the FPU is not running at
full precision.
2008-11-26 16:15:35 +00:00
Chris Wilson
4218699642 [skiplist] Use ffs()
Use ffs() [find-first-set-bit] instead of open-coding, which is about 25%
faster on my test machine.
2008-11-26 16:15:35 +00:00
Chris Wilson
039437c9cf [png] Use FILE* instead of void*.
Adrian Johnson reported that cygwin complained about the use of the void *
within feof() as it was using a macro and attempted a to deference the
void*...
2008-11-26 10:33:33 +00:00
Adrian Johnson
8fa3cd9564 Change uint to uint32_t 2008-11-26 06:40:47 +10:30
Luo Jinghua
e828f73306 glitz: Apply fixup to unbounded operators to clear area outside of mask 2008-11-26 00:09:11 +08:00
Luo Jinghua
449e7518be glitz: set correct parameters for linear and radial pattern.
Glitz expects 16.16 fixed point, but we use 24.8 fixed point by default.
2008-11-25 22:55:24 +08:00
Luo Jinghua
3bde440e00 glitz: fixup another stupid bug in fill_rectangles.
Wny I doesn't notice them before. Without fixes it fills n_rect times of
the first one in the rectangle list.
2008-11-25 22:36:53 +08:00
Chris Wilson
4ac38f7c2b [fill] Emit rectangles for GdkRegion
Scan the path for a series of consistently wound rectangles.
2008-11-25 12:54:58 +00:00
Chris Wilson
23df74e5ff [xlib] Cosmetic tweak.
Tightly scope the local rects.
2008-11-25 12:54:58 +00:00
Chris Wilson
06fabd6cbd [path] Fix up extents.
Forgot to round the box to the integer rectangle and missed why only
testing on image. Very naughty.
2008-11-25 12:54:58 +00:00
Luo Jinghua
1f44fb97f3 cairo-script: add $(top_builddir)/src to CPPPATH.
$(top_builddir)/src is needed to find cairo-features.h while
building out of tree.
2008-11-25 20:45:03 +08:00
Paolo Bonzini
487c708b3b [boilerplate] fix compilation for glitz-agl
As suggested on the list, this splits the cairo-boilerplate-glitz.c
file in three separate files, one for each backend.  Furthermore,
it fixes a few problems in compilation of the AGL backend test harness.
2008-11-25 20:40:37 +08:00