x11proto-render: Changes to 'upstream-unstable'
.gitignore | 78 ++-- Makefile.am | 14 +- README | 30 + configure.ac| 15 +- render.h|2 + renderproto.txt |7 ++--- 6 files changed, 122 insertions(+), 24 deletions(-) New commits: commit 7c31f0bc6c3d71bd63d45df4f0457c3ed7b75e7d Author: Adam Jackson Date: Tue Aug 10 10:12:49 2010 -0400 renderproto 0.11.1 Signed-off-by: Adam Jackson diff --git a/configure.ac b/configure.ac index 8779274..68549c6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([RenderProto], [0.11], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([RenderProto], [0.11.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 89289190032cb7f17a392ef0fe8237bdb54edcf6 Author: Adam Jackson Date: Tue Aug 10 10:10:48 2010 -0400 Make recursive alpha maps undefined Signed-off-by: Adam Jackson diff --git a/renderproto.txt b/renderproto.txt index 70bf260..9f1f231 100644 --- a/renderproto.txt +++ b/renderproto.txt @@ -616,9 +616,7 @@ CreatePicture alpha-map. Exposures to the window do not affect the contents of alpha-map. Alpha-map must refer to a picture containing a Pixmap, not a Window (or a Match error results). If the alpha-map picture - itself already has an alpha-map, that alpha-map is used instead. If - the alpha-map picture points to the same drawable as the picture - itself, None is used instead. + itself already has an alpha-map, the result is undefined. The clip-mask restricts reads and writes to drawable. Only pixels where the clip-mask has bits set to 1 are read or written. Pixels commit 6122aa1ed38adbdf65e3ac11cff60bf075e85c0d Author: Sami Farin Date: Wed Sep 26 11:31:00 2007 -0700 Bug 12578 - renderproto-0.9.3: render.h does not compile https://bugs.freedesktop.org/show_bug.cgi?id=12578 diff --git a/render.h b/render.h index 1afb1ca..7e35bd6 100644 --- a/render.h +++ b/render.h @@ -26,6 +26,8 @@ #ifndef _RENDER_H_ #define _RENDER_H_ +#include + typedef XIDGlyph; typedef XIDGlyphSet; typedef XIDPicture; commit e44c308a0a268de2be2110c38a0a29d5b4101d10 Author: Adam Jackson Date: Tue May 11 10:45:09 2010 -0400 Clarify alpha-map loop prevention (#23581) Signed-off-by: Adam Jackson diff --git a/renderproto.txt b/renderproto.txt index a736ba7..70bf260 100644 --- a/renderproto.txt +++ b/renderproto.txt @@ -615,7 +615,10 @@ CreatePicture Rendering is additionally clipped by the geometry and clip mask of alpha-map. Exposures to the window do not affect the contents of alpha-map. Alpha-map must refer to a picture containing a Pixmap, - not a Window (or a Match error results). + not a Window (or a Match error results). If the alpha-map picture + itself already has an alpha-map, that alpha-map is used instead. If + the alpha-map picture points to the same drawable as the picture + itself, None is used instead. The clip-mask restricts reads and writes to drawable. Only pixels where the clip-mask has bits set to 1 are read or written. Pixels commit 724feb119aa1906f6a7a2f62fccb1b76bb56857c Author: Gaetan Nadon Date: Sun Mar 28 19:00:31 2010 -0400 config: remove the pkgconfig pc.in file from EXTRA_DIST Automake always includes it in the tarball. Signed-off-by: Gaetan Nadon diff --git a/Makefile.am b/Makefile.am index bae789c..a1a75ef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,7 +8,6 @@ pkgconfig_DATA = renderproto.pc dist_doc_DATA = renderproto.txt -EXTRA_DIST = renderproto.pc.in MAINTAINERCLEANFILES = ChangeLog INSTALL commit 2c7bf7d8481706d208bdebf93568cb478762f080 Author: Rémi Cardona Date: Thu Dec 17 08:41:27 2009 +0100 Use $(docdir) for renderproto.txt install path Signed-off-by: Rémi Cardona Reviewed-by: Gaetan Nadon Reviewed-by: Alan Coopersmith Reviewed-by: Dan Nicholson diff --git a/Makefile.am b/Makefile.am index 29cb9fb..bae789c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,10 +6,9 @@ render_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = renderproto.pc -renderdocdir = $(datadir)/doc/$(PACKAGE) -renderdoc_DATA = renderproto.txt +dist_doc_DATA = renderproto.txt -EXTRA_DIST = renderproto.pc.in $(renderdoc_DATA) +EXTRA_DIST = renderproto.pc.in MAINTAINERCLEANFILES = ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 94abcfe..8779274 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_PREREQ([2.57]) +AC_PREREQ([2.60]) AC_INIT([RenderProto], [0.11], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit
x11proto-render: Changes to 'upstream-unstable'
.gitignore |4 +
ChangeLog |4 -
Makefile.am | 12 +++
configure.ac|6 +
render.h| 23 +++
renderproto.txt | 170
6 files changed, 104 insertions(+), 115 deletions(-)
New commits:
commit d889aa6c766e2691e1a6a8189c730661023e4de4
Author: Fredrik Höglund
Date: Wed Jul 15 00:16:32 2009 +0200
Bump version to 0.11.
diff --git a/configure.ac b/configure.ac
index c03f421..102abc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([RenderProto], [0.9.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([RenderProto], [0.11],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_CHANGELOG
commit 533e22db3088bb75e58b6d977ec82a13c4680b54
Author: Fredrik Höglund
Date: Wed Jul 15 00:16:08 2009 +0200
Add support for the PDF blend mode operators.
diff --git a/render.h b/render.h
index 497af6d..1afb1ca 100644
--- a/render.h
+++ b/render.h
@@ -33,7 +33,7 @@ typedef XID PictFormat;
#define RENDER_NAME"RENDER"
#define RENDER_MAJOR 0
-#define RENDER_MINOR 10
+#define RENDER_MINOR 11
#define X_RenderQueryVersion 0
#define X_RenderQueryPictFormats 1
@@ -139,6 +139,27 @@ typedef XIDPictFormat;
#define PictOpConjointXor 0x2b
#define PictOpConjointMaximum 0x2b
+/*
+ * Operators only available in version 0.11
+ */
+#define PictOpBlendMinimum 0x30
+#define PictOpMultiply 0x30
+#define PictOpScreen 0x31
+#define PictOpOverlay 0x32
+#define PictOpDarken 0x33
+#define PictOpLighten 0x34
+#define PictOpColorDodge 0x35
+#define PictOpColorBurn0x36
+#define PictOpHardLight0x37
+#define PictOpSoftLight0x38
+#define PictOpDifference 0x39
+#define PictOpExclusion0x3a
+#define PictOpHSLHue 0x3b
+#define PictOpHSLSaturation0x3c
+#define PictOpHSLColor 0x3d
+#define PictOpHSLLuminosity0x3e
+#define PictOpBlendMaximum 0x3e
+
#define PolyEdgeSharp 0
#define PolyEdgeSmooth 1
diff --git a/renderproto.txt b/renderproto.txt
index 0934770..5249e6c 100644
--- a/renderproto.txt
+++ b/renderproto.txt
@@ -139,7 +139,11 @@ PICTOP { Clear, Src, Dst, Over, OverReverse,
In, InReverse,
ConjointClear, ConjointSrc, ConjointDst, ConjointOver,
ConjointOverReverse, ConjointIn, ConjointInReverse,
ConjointOut, ConjointOutReverse, ConjointAtop,
- ConjointAtopReverse, ConjointXor }
+ ConjointAtopReverse, ConjointXor,
+ Multiply, Screen, Overlay, Darken, Lighten, ColorDodge,
+ ColorBurn, HardLight, SoftLight, Difference, Exclusion,
+ HSLHue, HSLSaturation, HSLColor, HSLLuminosity
+ }
SUBPIXEL { Unknown, HorizontalRGB, HorizontalBGR,
VerticalRGB, VerticalBGR, None
}
@@ -1197,3 +1201,7 @@ what each version before 1.0 implemented:
The repeat picture attribute now supports Pad and
Reflect, older versions only supported None and Normal.
+
+ 0.11:
+ Blend mode operators
+
commit 2c5e931d5e5b5af88bcf8aaed8b10d799fd47b1e
Author: Søren Sandmann Pedersen
Date: Fri Jul 10 21:34:12 2009 -0400
Clarify behavior of IncludeInferior and GraphicsExposures.
diff --git a/renderproto.txt b/renderproto.txt
index 438ce16..0934770 100644
--- a/renderproto.txt
+++ b/renderproto.txt
@@ -365,11 +365,6 @@ pixels within a window geometry obscured by other windows).
axis. Tiles that in both an even numbered row and an even
numbered column are reflected in both axes.
-When GraphicsExposures are selected in the destination picture, a region
-containing at least the union of all destination pixel values affected by
-data replaced as above is delivered after each compositing operation. If
-the resulting region is empty, a NoExpose event is delivered instead.
-
To construct the source and mask operands, the computed pixels values are
transformed through a homogeneous matrix, filtered and then used in the
fundamental rendering operator described above. Each screen provides a list
@@ -631,16 +626,15 @@ CreatePicture
Transformations, filters and repeat modes do not affect the clip
mask.
- For ClipB
x11proto-render: Changes to 'upstream-unstable'
configure.ac |2 +-
render.h |8
renderproto.h |2 --
3 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 9c561f58b713aaecbc0ba3a6a8579094e57fdd20
Author: Eric Anholt <[EMAIL PROTECTED]>
Date: Fri Aug 31 14:50:09 2007 -0700
Bump version to 0.9.3.
diff --git a/configure.ac b/configure.ac
index dc3b047..cfe6a0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([RenderProto], [0.9.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([RenderProto], [0.9.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
commit 030dd885476b70c9054b6e4b50dfdbab12e73716
Author: Eric Anholt <[EMAIL PROTECTED]>
Date: Fri Aug 31 14:28:03 2007 -0700
Bug #7364: Fix the typedefs of GlyphSet, Picture, and PictFormat to be XIDs.
Without this, they would be 64-bit types on 64-bit X Servers, which
occasionally resulted in incorrect unpacking.
diff --git a/render.h b/render.h
index 691c63f..497af6d 100644
--- a/render.h
+++ b/render.h
@@ -26,10 +26,10 @@
#ifndef _RENDER_H_
#define _RENDER_H_
-typedef unsigned long Glyph;
-typedef unsigned long GlyphSet;
-typedef unsigned long Picture;
-typedef unsigned long PictFormat;
+typedef XIDGlyph;
+typedef XIDGlyphSet;
+typedef XIDPicture;
+typedef XIDPictFormat;
#define RENDER_NAME"RENDER"
#define RENDER_MAJOR 0
diff --git a/renderproto.h b/renderproto.h
index bdd4c74..ffe0639 100644
--- a/renderproto.h
+++ b/renderproto.h
@@ -46,7 +46,6 @@
#define PictFormat CARD32
#define Fixed INT32
#define GlyphsetCARD32
-#define Glyph CARD32
/*
* data structures
@@ -660,6 +659,5 @@ typedef struct {
#undef PictFormat
#undef Fixed
#undef Glyphset
-#undef Glyph
#endif /* _XRENDERP_H_ */
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
x11proto-render: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: commit 76a3e69e8e5a761533fc4c752bf907c2440ea6b2 Author: Alan Coopersmith <[EMAIL PROTECTED]> Date: Wed Oct 11 13:13:16 2006 -0700 Typo fixes in Render protocol spec commit 42cd58192fa14dc792379896e9473f693b616d9f Author: Alan Coopersmith <[EMAIL PROTECTED]> Date: Wed Oct 11 13:08:51 2006 -0700 Update date/version on Render protocol spec to match last update (0.10) commit 04fc37cf7d28dee03e3e68b812ce843f5d1edb97 Author: Eric Anholt <[EMAIL PROTECTED]> Date: Tue Jan 9 11:26:25 2007 -0800 Hook renderproto.txt up to build/install. The previous 12 commits represent a conversion of xlibs cvs to git, then usage of git-format-patch protocol, munging of the path, and git-am. The remaining patches to the render protocol description from xorg-docs will follow. commit 2a8d528ed739f4bc59b4b7e5054f44e378b4a89f Author: Lars Knoll <[EMAIL PROTECTED]> Date: Fri Jul 1 08:17:51 2005 + premultiplied colors for creation of solid fills. commit effea4687eec4922ab1975ea69d81fe9238a310a Author: Lars Knoll <[EMAIL PROTECTED]> Date: Thu Jun 30 07:16:25 2005 + smaller fixes to the protocol. commit 09eb1125f8edb2dcbdff55f3f330044d1f35f8bb Author: Lars Knoll <[EMAIL PROTECTED]> Date: Wed Jun 29 11:52:07 2005 + add support for Gradient and Solid Pictures bump render version to 0.10 commit d3bc284d6c875118566504798aa3818617d377cd Author: Keith Packard <[EMAIL PROTECTED]> Date: Thu Jul 29 07:58:03 2004 + 2004-07-29 Keith Packard <[EMAIL PROTECTED]> * configure.ac: * protocol: * render.h: * renderproto.h: Specify new AddTraps request. Change pixelization specification. commit 3a46f9178cbd722ed238587d4463a6d19d8f1044 Author: Keith Packard <[EMAIL PROTECTED]> Date: Sat May 3 19:20:00 2003 + Add animated cursor request, bump to 0.8 commit 1d46ed302a18da9d7fe4f08101b7e0fad5e0a909 Author: Keith Packard <[EMAIL PROTECTED]> Date: Wed Nov 27 05:36:25 2002 + Fix FreePicture to note that non-XID references can keep pictures allocated commit 8c80ba46b689cdc66c3fdf6bfec3d025795f9c9e Author: Keith Packard <[EMAIL PROTECTED]> Date: Wed Nov 6 22:47:49 2002 + XRenderQueryPictIndexValues support (from Olivier Chapuis). Bump Render version to 0.7 commit 02402ce6194c6205f172c35b276169cf2cf30a31 Author: Keith Packard <[EMAIL PROTECTED]> Date: Thu Sep 26 02:56:48 2002 + Add image transformation and sub-pixel ordering to Render commit 62a55ea66717bd056fde8d1bbf84275d7fa087e5 Author: Marc Aurele La France <[EMAIL PROTECTED]> Date: Fri Aug 23 15:12:36 2002 + Grammar commit 465ae9a308001920f94d1f029e2bbb7f70c87d89 Author: Keith Packard <[EMAIL PROTECTED]> Date: Fri Aug 23 05:48:25 2002 + Add CreateCursor request to Render commit 6633f3924d6f224d02f48808b28981f9775f6e72 Author: Keith Packard <[EMAIL PROTECTED]> Date: Mon May 13 07:55:48 2002 + Update spec to match current implementation. commit 7ff23a96aaafb598a413e2bd4c52da98dfb8da4a Author: Keith Packard <[EMAIL PROTECTED]> Date: Fri Dec 15 18:33:53 2000 + Add Render protocol document commit 3237db592bb09dc89f8be918e2c59c6f9f59d8ea Author: Alan Coopersmith <[EMAIL PROTECTED]> Date: Fri Jul 14 18:56:29 2006 -0700 renamed: .cvsignore -> .gitignore commit 91f4e05915f5c0e6afe709a9904b955842e909fd Author: Kevin E Martin <[EMAIL PROTECTED]> Date: Thu Dec 15 00:24:38 2005 + Update package version number for final X11R7 release candidate. commit 0810eecdd6303d4967760beac1a38df5cf0feab7 Author: Kevin E Martin <[EMAIL PROTECTED]> Date: Wed Oct 19 02:48:15 2005 + Update package version number for RC1 release. commit 8c450de3b74dd1dd4a28747d9b60bc51382b0f17 Author: Eric Anholt <[EMAIL PROTECTED]> Date: Tue Aug 2 19:19:39 2005 + Add basic .cvsignore files for proto modules. commit 2a63ef2ad78c8d4d89b275280b2d6f9f8d9a2c1f Author: Kevin E Martin <[EMAIL PROTECTED]> Date: Fri Jul 29 21:22:56 2005 + Various changes preparing packages for RC0: - Verify and update package version numbers as needed - Implement versioning scheme - Change bug address to point to bugzilla bug entry form - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to reenable it) - Fix makedepend to use pkgconfig and pass distcheck - Update build script to build macros first - Update modular Xorg version commit c3526e7ea51b7b70d14fb6ad97cc234221ac875a Author: Lars Knoll <[EMAIL PROTECTED]> Date: Fri Jul 1 10:03:25 2005 + Add support for gradients and solid fills to Render. commit c1a679f90a1b9e011060661dfdadd2960489ba95 Author: Lars Knoll <[EMAIL PROTECTED]> Date: Mon Jun 13 14:40:24 2005 + add the convolution filter from xserver to xorg commit ce97141900f9cc5dc067d2067b5877901399c597 Author: Daniel Stone <[EM
