xserver: Branch 'master' - 2 commits

[Eric Anholt]

 .gitignore                 |    2 ++
 fb/fbcompose.c             |    8 ++++----
 hw/xfree86/exa/Makefile.am |   12 ++++++++++++
 hw/xfree86/exa/exa.man.pre |   40 ++++++++++++++++++++++++++++++++++++++++
 render/picture.h           |    4 ----
 5 files changed, 58 insertions(+), 8 deletions(-)

New commits:
diff-tree c7ac485a59709572307b9a4a9abacc52c7021b65 (from 2cf1f39ca974c81a2f52d2f7509aa3d098a87176)
Author: Eric Anholt <anholt at FreeBSD.org>
Date:   Wed Jun 21 09:34:55 2006 -0700

    Remove the default case from fbcompose.c switches which should cover all cases.
    
    Instead, stick the NULL return default case afterwards, so that the compiler can
    warn us when we've got unimplemented cases.  Removes some unimplemented and
    unused 8bpp, depth 4 picture format names.

diff --git a/fb/fbcompose.c b/fb/fbcompose.c
index 03adab4..3a61e97 100644
--- a/fb/fbcompose.c
+++ b/fb/fbcompose.c
@@ -573,9 +573,9 @@ static fetchProc fetchProcForPicture (Pi
         /* 1bpp formats */
     case PICT_a1: return  fbFetch_a1;
     case PICT_g1: return  fbFetch_g1;
-    default:
-        return NULL;
     }
+
+    return NULL;
 }
 
 /*
@@ -1010,9 +1010,9 @@ static fetchPixelProc fetchPixelProcForP
         /* 1bpp formats */
     case PICT_a1: return  fbFetchPixel_a1;
     case PICT_g1: return  fbFetchPixel_g1;
-    default:
-        return NULL;
     }
+
+    return NULL;
 }
 
 
diff --git a/render/picture.h b/render/picture.h
index e7d86ac..8184c02 100644
--- a/render/picture.h
+++ b/render/picture.h
@@ -102,10 +102,6 @@ typedef enum _PictFormatShort {
    PICT_g8 =		PICT_FORMAT(8,PICT_TYPE_GRAY,0,0,0,0),
 
    PICT_x4a4 =		PICT_FORMAT(8,PICT_TYPE_A,4,0,0,0),
-   PICT_x4r1g2b1 =	PICT_FORMAT(8,PICT_TYPE_ARGB,0,1,2,1),
-   PICT_x4b1g2r1 =	PICT_FORMAT(8,PICT_TYPE_ABGR,0,1,2,1),
-   PICT_x4a1r1g1b1 =	PICT_FORMAT(8,PICT_TYPE_ARGB,1,1,1,1),
-   PICT_x4a1b1g1r1 =	PICT_FORMAT(8,PICT_TYPE_ABGR,1,1,1,1),
 				    
    PICT_x4c4 =		PICT_FORMAT(8,PICT_TYPE_COLOR,0,0,0,0),
    PICT_x4g4 =		PICT_FORMAT(8,PICT_TYPE_GRAY,0,0,0,0),
diff-tree 2cf1f39ca974c81a2f52d2f7509aa3d098a87176 (from d67fd106968e371d8be3966ed5ecdd3c69f36e3a)
Author: Eric Anholt <anholt at FreeBSD.org>
Date:   Wed Jun 21 09:30:59 2006 -0700

    Add a manpage for EXA.

diff --git a/.gitignore b/.gitignore
index 149c1e6..1e79706 100644
--- a/.gitignore
+++ b/.gitignore
@@ -144,6 +144,8 @@ hw/xfree86/doc/man/Xorg.1x
 hw/xfree86/doc/man/Xorg.man
 hw/xfree86/doc/man/xorg.conf.5x
 hw/xfree86/doc/man/xorg.conf.man
+hw/xfree86/exa/exa.4
+hw/xfree86/exa/exa.man
 hw/xfree86/fbdevhw/fbdevhw.4x
 hw/xfree86/fbdevhw/fbdevhw.man
 hw/xfree86/getconfig/cfg.man
diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am
index 8e85e1e..7f0a20e 100644
--- a/hw/xfree86/exa/Makefile.am
+++ b/hw/xfree86/exa/Makefile.am
@@ -14,3 +14,15 @@ libexa_la_SOURCES = \
 
 libexa_la_LIBADD = \
 	../../../exa/libexa.la
+
+include $(top_srcdir)/cpprules.in
+
+drivermandir = $(DRIVER_MAN_DIR)
+driverman_DATA = exa.$(DRIVER_MAN_SUFFIX)
+CLEANFILES = $(driverman_DATA) exa.man
+
+exa.$(DRIVER_MAN_SUFFIX): exa.man
+	-rm -f exa.$(DRIVER_MAN_SUFFIX)
+	$(LN_S) exa.man exa.$(DRIVER_MAN_SUFFIX)
+
+EXTRA_DIST = exa.man.pre README
diff --git a/hw/xfree86/exa/exa.man.pre b/hw/xfree86/exa/exa.man.pre
new file mode 100644
index 0000000..ea41b90
--- /dev/null
+++ b/hw/xfree86/exa/exa.man.pre
@@ -0,0 +1,40 @@
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH EXA __drivermansuffix__ __vendorversion__
+.SH NAME
+exa \- new 2D acceleration architecture for X.Org
+.SH DESCRIPTION
+.B EXA
+provides a simple API for video drivers to implement for 2D acceleration.  It
+is a module loaded by drivers, and is not intended to be loaded on its own.  See
+your driver's manual page for how to enable 
+.B EXA
+.
+.PP
+The
+.B EXA
+architecture is designed to make accelerating the Render extension simple and
+efficient, and results in various performance tradeoffs compared to XAA.  Some
+options are available for debugging performance issues or driver rendering
+problems.  They are not intended for general use.
+.TP
+.BI "Option \*qEXANoComposite\*q \*q" boolean \*q
+Disables acceleration of the Composite operation, which is at the heart of
+the Render extension.  Not related to the Composite extension.  Default: No.
+.TP
+.BI "Option \*qEXANoUploadToScreen\*q \*q" boolean \*q
+Disables acceleration of uploading pixmap data to the freamebuffer. Default: No.
+.TP
+.BI "Option \*qEXANoDownloadFromScreen\*q \*q" boolean \*q
+Disables acceleration of downloading of pixmap data from the framebuffer. 
+.B NOTE:
+Not usable with drivers which rely on DownloadFromScreen succeeding.
+Default: No.
+.TP
+.BI "Option \*qMigrationHeuristic\*q \*q" anystr \*q
+Chooses an alternate pixmap migration heuristic, for debugging purposes.  The
+default is intended to be the best performing one for general use, though others
+may help with specific use cases.  Available options include \*qalways\*q,
+\*qgreedy\*q, and \*qsmart\*q.  Default: smart.
+.SH AUTHORS
+Authors include: Keith Packard, Eric Anholt, Zack Rusin, and Michel Dänzer