diff options
author | marha <marha@users.sourceforge.net> | 2013-10-18 11:59:15 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-10-18 11:59:15 +0200 |
commit | b821fe861f33d7e8a39fe4c7d885b7ff379dc476 (patch) | |
tree | 7b3c0b22d35eadf598cff3965413a96c76d5ad39 /pixman/pixman | |
parent | 56e12b1310b1b52d00bc27e919d915255af5bf03 (diff) | |
parent | b8a77c943fa53005b6cdb1ab792acf5ff0a131be (diff) | |
download | vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.gz vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.bz2 vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa pixman git update 18 okt 2013
Conflicts:
mesalib/include/GL/glext.h
mesalib/include/GL/glxext.h
Diffstat (limited to 'pixman/pixman')
-rw-r--r-- | pixman/pixman/pixman-glyph.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pixman/pixman/pixman-glyph.c b/pixman/pixman/pixman-glyph.c index 2f7ea940b..60eb10914 100644 --- a/pixman/pixman/pixman-glyph.c +++ b/pixman/pixman/pixman-glyph.c @@ -391,6 +391,9 @@ box32_intersect (pixman_box32_t *dest, return dest->x2 > dest->x1 && dest->y2 > dest->y1; } +#if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__) +__attribute__((__force_align_arg_pointer__)) +#endif PIXMAN_EXPORT void pixman_composite_glyphs_no_mask (pixman_op_t op, pixman_image_t *src, @@ -630,6 +633,9 @@ out: * - Trim the mask to the destination clip/image? * - Trim composite region based on sources, when the op ignores 0s. */ +#if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__) +__attribute__((__force_align_arg_pointer__)) +#endif PIXMAN_EXPORT void pixman_composite_glyphs (pixman_op_t op, pixman_image_t *src, |