Commit graph

6538 commits

Author SHA1 Message Date
Andrea Canciani
56a367a162 atomic: Correct implementation of _atomic_fetch ()
_atomic_fetch() was expected to replace the content of a slot with
NULL and return the old content, but it incorrectly returned the
previous content even if it was unable to perform the exchange
(because of conflicts with other threads accessing the pool).

Fix suggested by Chris Wilson <chris@chris-wilson.co.uk>
2010-04-29 10:52:48 +02:00
Andrea Canciani
d66b1ca1cf atomic: Separate bool and old-value compare-and-exchange
Some implementations only offer one version of compare-and-exchange,
thus we expose both through cairo-atomic, implementing what is missing
through appropriate fallbacks.
*_cmpxchg() now return a boolean (this unbreaks _cairo_atomic_uint_cmpxchg)
*_cmpxchg_return_old() return the old value
Code is updated everywhere to reflect this, by using *_cmpxchg()
wherever the returned value was only tested to check if the exchange
had really taken place.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-04-29 10:52:47 +02:00
Andrea Canciani
a0bf424b82 atomic: Remove unused function _cairo_atomic_int_set()
_cairo_atomic_int_set() was only used in the definition of
CAIRO_REFERENCE_SET_VALUE, which was never used.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-04-29 10:52:47 +02:00
Benjamin Otte
9ce8bef9d6 fallback: Propagate extents properly
Otherwise unbounded operators will clear the full surface.
Improves the score for the unbounded-operator test, in particular the
output for the test-fallback case.
2010-04-28 20:25:56 +02:00
Benjamin Otte
91fd97ae7c fallback: Pass the correct extents for unbounbded operations 2010-04-28 20:25:52 +02:00
Benjamin Otte
06e9caf861 image: pixman_image_fill_rectangles() => pixman_image_fill_boxes() 2010-04-28 20:14:55 +02:00
Benjamin Otte
bc49df3227 pixman_image_composite => pixman_image_composite32
Fix up the remaining callers
2010-04-28 20:14:55 +02:00
Benjamin Otte
393da364a7 fallback: Sanitize code that queries surface extents
The previous code was setting extents.is_bounded, but that value has a
completely different meaning.
2010-04-28 18:18:15 +02:00
Benjamin Otte
2a91d42508 fallback: Fix clip_region handling in mask creation
Fixes the xlib-expose-event test.
2010-04-28 13:15:09 +02:00
Chris Wilson
bb853916f3 image: Generate clear/white/black images when !HAS_ATOMIC_OPS
Andrea reported that b74cc0f broke compilation without atomic ops.
2010-04-28 11:37:59 +01:00
Chris Wilson
45d4c6e0b2 script: Replace the missing " " after pop
I accidentally deleted the whitespace after popping the recording
surface, thus causing the scripts to be broken.
2010-04-28 10:01:06 +01:00
Chris Wilson
6a99e83c50 subsurface: Mark the image as !clear after copying. 2010-04-28 09:55:20 +01:00
Chris Wilson
ca3df75e8f script: Reconstruct subsurfaces. 2010-04-28 09:54:56 +01:00
Chris Wilson
a5f54e48e3 snapshot: The snapshot masquerades as the target surface type.
Not wholly convinced this is a good idea, but it matches the behaviour
of the other internal surface types.
2010-04-28 08:39:21 +01:00
Chris Wilson
4a678afdf7 snapshot: Simply memcpy if the cloned image matches the original. 2010-04-28 08:39:21 +01:00
Chris Wilson
b74cc0f6d5 image: Convert 1x1 samples into solid colors.
If the sampled extents of the operation on an image surface is just a
single pixel, we can safely convert to a solid color.
2010-04-28 08:39:21 +01:00
Chris Wilson
f5cf131a9d surface: skip OVER is the source is clear.
If the source has no alpha, the OVER operation becomes DST, i.e. a
no-op.
2010-04-27 18:56:23 +01:00
Andrea Canciani
ebe6f2ac69 quartz: Assert success of path creation
Path creation can only fail because of the callbacks, but in quartz
they all return CAIRO_STATUS_SUCCESS. Therefore we can just assert
that path creation was successful and simplify calling functions
(as they don't have to handle potential errors anymore).
2010-04-27 12:24:43 +02:00
Andrea Canciani
f67b600927 quartz: Simplify path creation
If paths are created before changing the ctm (when stroking) no
multiplication is needed in the path construction code.
2010-04-27 12:24:43 +02:00
Andrea Canciani
3b2ceff050 quartz: Stroke without ctm_inverse multiplication
If the CTM is not changed before creating the path, no multiplication
needs to be made between points and the inverse of the CTM.
2010-04-27 12:24:42 +02:00
Chris Wilson
514d366cde snapshot: propagate status on finish 2010-04-27 11:09:25 +01:00
Chris Wilson
a505104013 image: Compute sample extents
In order to reuse the original image as the pixman pattern, then the
entire operation must be wholly contained within the extents of the
image (including subsurfaces) and be reducible to an untransformed
REPEAT_NONE.
2010-04-27 11:07:45 +01:00
Andrea Canciani
b8a7f8621a Update FSF address
I updated the Free Software Foundation address using the following script.

for i in $(git grep Temple | cut -d: -f1 )
do
  sed -e 's/59 Temple Place[, -]* Suite 330, Boston, MA *02111-1307[, ]* USA/51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA/' -i "$i"
done

Fixes http://bugs.freedesktop.org/show_bug.cgi?id=21356
2010-04-27 11:13:38 +02:00
Chris Wilson
3c9e5d9792 region: Cast to remove const to suppress compiler warnings.
airo-region.c: In function ‘cairo_region_intersect’:
cairo-region.c:503: warning: passing argument 3 of
‘pixman_region32_intersect’ discards qualifiers from pointer target type
/usr/local/include/pixman-1/pixman.h:518: note: expected ‘struct
pixman_region32_t *’ but argument is of type ‘const struct pixman_region32_t *’

cairo-region.c: In function ‘cairo_region_union’:
cairo-region.c:566: warning: passing argument 3 of
‘pixman_region32_union’ discards qualifiers from pointer target type
/usr/local/include/pixman-1/pixman.h:521: note: expected ‘struct
pixman_region32_t *’ but argument is of type ‘const struct pixman_region32_t *’
2010-04-26 18:18:48 +01:00
Chris Wilson
8c72122df5 clip: Skip combining with solid pixel aligned boxes. 2010-04-25 10:30:12 +01:00
Chris Wilson
240ebaf81a clip: Fix sign reverse when combining with the clip surface.
Finally, found the reversed sign in the clipping code, thanks cu!

Fixes: test/clip-shape
2010-04-25 09:45:41 +01:00
Chris Wilson
4d3632761b clip: Report the surface offset when retrieving the clip mask
Stop the callers from guessing the origin of the clip surface by
reporting it explicitly! This enables the clip to bypass any rectangles
overlaid on top of the clip surface, which is common when the backends
limit the clip to the extents of the operation -- but irrelevant to the
actual content of the clip mask
2010-04-25 09:45:41 +01:00
Benjamin Otte
1687c7b7d3 xlib: Fix display closing to work properly
Previously we free()'d the cairo_device's memory which was not good at
all. Now the code causes cairo_device_finish() instead.
2010-04-23 22:22:28 +02:00
Benjamin Otte
637564c562 xlib: Fix screen device handling
Add a _cairo_xlib_device_create() function that could easily be exported
as a replacement for _cairo_xlib_display_get(). This function returns a
cairo_device_t instead of a cairo_xlib_display_t because the display
isn't acquired.
2010-04-23 22:18:54 +02:00
Benjamin Otte
49b52a8946 gl: Make drawing to windows work again
The correct MIN/MAG_FILTER wasn't set.
2010-04-23 21:46:22 +02:00
Benjamin Otte
3efbc0c5c8 gl: Only unref a surface if it exists
Note: This will likely work for NULL clones, but I prefer not
dereferencing NULLs. That gives people a wrong understanding of the code
(i.e. me).
2010-04-23 21:46:12 +02:00
Benjamin Otte
64662be4ef gl: Use GLfloat instead of float in gl*Array() functions 2010-04-23 21:46:04 +02:00
Benjamin Otte
e4f84f97b2 gl: Don't acquire the gl context twice 2010-04-23 21:45:56 +02:00
Benjamin Otte
e40a2d1f5e gl: Use correct type when uploading images 2010-04-23 21:45:01 +02:00
Benjamin Otte
55cf323f96 gl: fix typo in comment 2010-04-23 21:44:20 +02:00
Chris Wilson
887d43578c xlib: Simply release the ref, not destroy, from CloseDisplay.
Do not call the destroy function directly, but rely on the reference
counting to call the notifier upon the last reference. Instead, simply
release the reference we were holding for the cache and CloseDisplay
callback.
2010-04-23 20:15:44 +01:00
Chris Wilson
c63e3490a5 cairo: Handle the all-clipped state in cairo_push_group()
Yet another bug reported by Jeff Muizelaar, thanks!

Fixes: test/clip-empty-group
2010-04-23 14:47:59 +01:00
Chris Wilson
4438cc6a49 cairo: Use explicit device flushing.
Now with the concept of a cairo_device_t and the ability to flush it,
we now longer require the heuristic of automatically flushing on behalf
of the user at the end of every context.
2010-04-23 14:39:21 +01:00
Chris Wilson
0fc140abc3 pdf: Suppress compiler warning. 2010-04-23 14:39:21 +01:00
Chris Wilson
1923a33a72 cairoint.h: Change ASSERT_NOT_REACHED to remove compiler warning 2010-04-23 14:39:21 +01:00
Chris Wilson
d366da7d8c Win32 features update 2010-04-23 14:39:21 +01:00
Andrea Canciani
b7fbda276d Revert "script: Another RGB16_565 warning."
This reverts commit a9f5064933.

The change was already applied in bdf8f50ada.
2010-04-19 10:38:43 +02:00
Benjamin Otte
f74ad37e66 xlib: Make display a cairo_device_t
The code now uses the locking of the cairo_device_t instead of its own
mutexes.

The code was modified so that cairo_surface_t does no longer reference
the display directly. Instead, it calls _cairo_xlib_display_acquire().
If a function assumes an already acquired display, it now requires the
caller to provide a cairo_xlib_display_t parameter. Functions that do
not require an acquired display will not require the display parameter
or they will take the cairo_device_t instead.
2010-04-18 23:20:02 +02:00
Benjamin Otte
2bffa2467e Use pixman_image_composite32()
Replace all occurences of pixman_image_composite()
2010-04-15 18:31:01 +02:00
Benjamin Otte
567923d66a image: Make unbounded fixup code not use pixman_fill()
The new pixman_image_fill_boxes() does proper fallbacks for weird pixman
formats.
2010-04-15 18:31:01 +02:00
Benjamin Otte
0a19ad7c10 gl: Get rid of "return value not checked" warnings
Assert that those functions only return successfully.
2010-04-15 18:31:00 +02:00
Benjamin Otte
7745ea21e1 gl: acquire/release properly in _cairo_gl_draw_image()
Fixes various testsuite failures, in particular ones related to masks.
2010-04-15 18:31:00 +02:00
Benjamin Otte
596d3017a1 gl: acquire/release context when getting images
Avoids Mesa complaining about no current context.
2010-04-15 18:31:00 +02:00
Benjamin Otte
46ef05c3d7 glx: Add getters for device's Display and GLXContext 2010-04-15 18:31:00 +02:00
Benjamin Otte
712919223d gl: Make code safe for multithreaded access
The code callss the gl device's acquire/release in
cairo_device_acquire/release(). This way, external APIs can use these
functions to prepare for rendering GL.

Also adds code to unset the glx context if it wasn't set when acquiring
the device. This allows multithreaded apps to work fine with just using
cairo APIs, but might introduce penalties in single-threaded
applications.
2010-04-15 18:30:54 +02:00