aboutsummaryrefslogtreecommitdiff
path: root/libxcb/xcb-proto
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-14 08:14:45 +0200
committermarha <marha@users.sourceforge.net>2011-06-14 08:14:45 +0200
commit6b441c10eeb02569204ff50ba8c3b739037b8141 (patch)
treef9c0dd95a41268546aeecdd31c8588c617749cd1 /libxcb/xcb-proto
parent0d495843cebea4ae94a3138db2bf51da80a16391 (diff)
parent4d74e36f359d22b50302c82a922b79ac24dd3e23 (diff)
downloadvcxsrv-6b441c10eeb02569204ff50ba8c3b739037b8141.tar.gz
vcxsrv-6b441c10eeb02569204ff50ba8c3b739037b8141.tar.bz2
vcxsrv-6b441c10eeb02569204ff50ba8c3b739037b8141.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mesa/SConscript mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/main/texgetimage.c mesalib/src/mesa/sources.mak mesalib/src/mesa/swrast/s_texrender.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/xkeyboard-config/configure.in
Diffstat (limited to 'libxcb/xcb-proto')
-rw-r--r--libxcb/xcb-proto/src/render.xml22
1 files changed, 20 insertions, 2 deletions
diff --git a/libxcb/xcb-proto/src/render.xml b/libxcb/xcb-proto/src/render.xml
index 59cc8e0bb..9667fbeb6 100644
--- a/libxcb/xcb-proto/src/render.xml
+++ b/libxcb/xcb-proto/src/render.xml
@@ -5,8 +5,8 @@ All Rights Reserved. See the file COPYING in this directory
for licensing information.
-->
<xcb header="render" extension-xname="RENDER" extension-name="Render"
- major-version="0" minor-version="10">
- <!-- supports version 0.10 -->
+ major-version="0" minor-version="11">
+ <!-- supports version 0.11 -->
<import>xproto</import>
@@ -20,6 +20,7 @@ for licensing information.
</enum>
<!-- Disjoint* and Conjoint* are new in version 0.2 -->
+ <!-- PDF blend modes are new in version 0.11 -->
<enum name="PictOp">
<item name="Clear" />
<item name="Src" />
@@ -61,6 +62,23 @@ for licensing information.
<item name="ConjointAtop" />
<item name="ConjointAtopReverse" />
<item name="ConjointXor" />
+
+ <!-- PDF blend modes are new in version 0.11 -->
+ <item name="Multiply"><value>48</value></item>
+ <item name="Screen" />
+ <item name="Overlay" />
+ <item name="Darken" />
+ <item name="Lighten" />
+ <item name="ColorDodge" />
+ <item name="ColorBurn" />
+ <item name="HardLight" />
+ <item name="SoftLight" />
+ <item name="Difference" />
+ <item name="Exclusion" />
+ <item name="HSLHue" />
+ <item name="HSLSaturation" />
+ <item name="HSLColor" />
+ <item name="HSLLuminosity" />
</enum>
<enum name="PolyEdge">