xserver: Branch 'master'

[Maarten Maathuis]

 include/pixmapstr.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 956a4ba40b28251ab2d88b5d5b0796e01afd2bdd
Author: Maarten Maathuis <madman2003 at gmail.com>
Date:   Fri Oct 10 00:28:34 2008 +0200

    pixmap: Add some notes to devKind and devPrivate.

diff --git a/include/pixmapstr.h b/include/pixmapstr.h
index cc5a8d8..702faf0 100644
--- a/include/pixmapstr.h
+++ b/include/pixmapstr.h
@@ -74,8 +74,8 @@ typedef struct _Pixmap {
     DrawableRec		drawable;
     PrivateRec		*devPrivates;
     int			refcnt;
-    int			devKind;
-    DevUnion		devPrivate;
+    int			devKind; /* This is the pitch of the pixmap, typically width*bpp/8. */
+    DevUnion		devPrivate; /* When !NULL, devPrivate.ptr points to the raw pixel data. */
 #ifdef COMPOSITE
     short		screen_x;
     short		screen_y;