xserver: Branch 'server-1.9-branch' - 4 commits

[Jeremy Huddleston]

 configure.ac               |    1 +
 damageext/damageext.c      |    1 +
 doc/xml/dtrace/Makefile.am |    2 ++
 miext/shadow/shpacked.c    |    4 ++--
 test/xi2/protocol-common.c |    1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit f9f381c48a87b700cc9429dce5ddbac74a774803
Author: Cyril Brulebois <kibi at debian.org>
Date:   Thu Nov 11 23:55:55 2010 +0100

    test: Fix missing xkbsrv.h include.
    
    Otherwise, building fails with CFLAGS="-Wall -Werror" this way:
    | protocol-common.c: In function ‘init_simple’:
    | protocol-common.c:159: error: implicit declaration of function ‘XkbInitPrivates’
    | protocol-common.c:159: error: nested extern declaration of ‘XkbInitPrivates’
    
    Signed-off-by: Cyril Brulebois <kibi at debian.org>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    (cherry picked from commit c481dae0dc89d8d50cac23210023d75bfaf6012b)

diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c
index 50f2b86..10d82a5 100644
--- a/test/xi2/protocol-common.c
+++ b/test/xi2/protocol-common.c
@@ -28,6 +28,7 @@
 #include <stdint.h>
 #include "extinit.h" /* for XInputExtensionInit */
 #include "exglobals.h"
+#include "xkbsrv.h" /* for XkbInitPrivates */
 #include <glib.h>
 
 #include "protocol-common.h"
commit 2715529d6b1da1e7b0266e66eba1aa50027c7c86
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Tue Nov 9 13:33:55 2010 -0800

    DOC: Only build dtrace documentation with --enable-docs
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit 291c39dfef84d1b204d7f5e63e925dee2dbdaca7)

diff --git a/configure.ac b/configure.ac
index 6f8b5da..1f014ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -718,6 +718,7 @@ fi
 
 dnl Handle building documentation
 AM_CONDITIONAL(BUILDDOCS, test "x$BUILDDOCS" = xyes)
+XORG_ENABLE_DOCS
 XORG_ENABLE_DEVEL_DOCS
 XORG_WITH_XMLTO(0.0.20)
 XORG_WITH_FOP
diff --git a/doc/xml/dtrace/Makefile.am b/doc/xml/dtrace/Makefile.am
index 0e25e5d..a95d374 100644
--- a/doc/xml/dtrace/Makefile.am
+++ b/doc/xml/dtrace/Makefile.am
@@ -25,11 +25,13 @@ XML_FILES = Xserver-DTrace.xml
 
 include ../xmlrules.in
 
+if ENABLE_DOCS
 if XSERVER_DTRACE
 doc_DATA = $(BUILT_DOC_FILES)
 else
 noinst_DATA = $(BUILT_DOC_FILES)
 endif
+endif
 
 CLEANFILES = $(CLEAN_DOC_FILES)
 
commit 4a7b5a33e1f9e53c9cd19d6790d0d48f05cb54d4
Author: Adam Jackson <ajax at redhat.com>
Date:   Sat Sep 11 17:55:57 2010 -0400

    shadow: Optimize shadowUpdatePacked(). (#26973)
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>
    Reviewed-by: Soren Sandmann <sandmann at daimi.au.dk>
    Reviewed-by: Matt Turner <mattst88 at gmail.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit f0b4df99486066ad0e638b3b5debc905bc8ef1c4)

diff --git a/miext/shadow/shpacked.c b/miext/shadow/shpacked.c
index 20d2ea1..06606bc 100644
--- a/miext/shadow/shpacked.c
+++ b/miext/shadow/shpacked.c
@@ -102,8 +102,8 @@ shadowUpdatePacked (ScreenPtr	    pScreen,
 		width -= i;
 		scr += i;
 #define PickBit(a,i)	(((a) >> (i)) & 1)
-		while (i--)
-		    *win++ = *sha++;
+		memcpy(win, sha, i * sizeof(FbBits));
+		sha += i;
 	    }
 	    shaLine += shaStride;
 	    y++;
commit a0895a219027e0a52a5a02db903d662562e02dda
Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Thu Oct 28 20:46:23 2010 -0700

    Set DamageSetReportAfterOp to true for the damage extension
    
    Change the damage extension reporter to queue up events after we chain
    to the wrapped functions.  Damage events are typically sent out after
    the rendering happens anyway, since we submit batch buffers from the
    flush callback chain and then flush client io buffers.  Compositing
    managers relie on this order, and there is no way we could reliably
    provide damage events to clients before the rendering happens anyway.
    
    By queueing up the damage events before the rendering happens, there's
    a risk that the client io buffer may overflow and send the damage
    events to the client before the driver has even seen the rendering
    request.  Reporting damage events after the rendering fixes this
    corner case and better corresponds with how we expect this to work.
    
    Signed-off-by: Kristian Høgsberg <krh at bitplanet.net>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit 8d7b7a0d71e0b89321b3341b781bc8845386def6)
    [anholt: re-applied to revert the revert, now that the cause of the
    revert is fixed]
    Signed-off-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit 333b6ed26e36735ef72f314a3f8c4ec565af223f)

diff --git a/damageext/damageext.c b/damageext/damageext.c
index 4aa0ff3..754383d 100644
--- a/damageext/damageext.c
+++ b/damageext/damageext.c
@@ -217,6 +217,7 @@ ProcDamageCreate (ClientPtr client)
     if (!AddResource (stuff->damage, DamageExtType, (pointer) pDamageExt))
 	return BadAlloc;
 
+    DamageSetReportAfterOp (pDamageExt->pDamage, TRUE);
     DamageRegister (pDamageExt->pDrawable, pDamageExt->pDamage);
 
     if (pDrawable->type == DRAWABLE_WINDOW)