xserver: Branch 'master'

[Eric Anholt]

 exa/exa.h      |    9 +++++++++
 exa/exa_priv.h |    8 --------
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
diff-tree 48c871564d493203d434d5da015903399287f619 (from afb84c2fca56887b3bfe7aa93f337c49b087acdc)
Author: Eric Anholt <anholt at FreeBSD.org>
Date:   Mon Jun 26 15:57:32 2006 +0200

    Move EXA_PM_IS_SOLID() to the public API, since drivers will want it frequently.

diff --git a/exa/exa.h b/exa/exa.h
index 2cb2008..96465a7 100644
--- a/exa/exa.h
+++ b/exa/exa.h
@@ -36,6 +36,7 @@
 #include "windowstr.h"
 #include "gcstruct.h"
 #include "picturestr.h"
+#include "fb.h"
 
 #define EXA_VERSION_MAJOR   2
 #define EXA_VERSION_MINOR   0
@@ -715,4 +716,12 @@ exaGetPixmapSize(PixmapPtr pPix);
 void
 exaEnableDisableFBAccess (int index, Bool enable);
 
+/**
+ * Returns TRUE if the given planemask covers all the significant bits in the
+ * pixel values for pDrawable.
+ */
+#define EXA_PM_IS_SOLID(_pDrawable, _pm) \
+	(((_pm) & FbFullMask((_pDrawable)->depth)) == \
+	 FbFullMask((_pDrawable)->depth))
+
 #endif /* EXA_H */
diff --git a/exa/exa_priv.h b/exa/exa_priv.h
index 90af553..03ee0ed 100644
--- a/exa/exa_priv.h
+++ b/exa/exa_priv.h
@@ -137,14 +137,6 @@ extern int exaPixmapPrivateIndex;
 /** Align an offset to a power-of-two alignment */
 #define EXA_ALIGN2(offset, align) (((offset) + (align) - 1) & ~((align) - 1))
 
-/**
- * Returns TRUE if the given planemask covers all the significant bits in the
- * pixel values for pDrawable.
- */
-#define EXA_PM_IS_SOLID(_pDrawable, _pm) \
-	(((_pm) & FbFullMask((_pDrawable)->depth)) == \
-	 FbFullMask((_pDrawable)->depth))
-
 #define EXA_PIXMAP_SCORE_MOVE_IN    10
 #define EXA_PIXMAP_SCORE_MAX	    20
 #define EXA_PIXMAP_SCORE_MOVE_OUT   -10