[PATCH xserver 05/11] vfb: Remove -pixdepths option

[Adam Jackson]

This really isn't especially useful, and we'd rather not be in the
business of supporting arbitrary pixel formats.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 hw/vfb/InitOutput.c | 18 ------------------
 hw/vfb/man/Xvfb.man | 13 -------------
 2 files changed, 31 deletions(-)

diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index d7bfd70..075993e 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -236,7 +236,6 @@ void
 ddxUseMsg(void)
 {
     ErrorF("-screen scrn WxHxD     set screen's width, height, depth\n");
-    ErrorF("-pixdepths list-of-int support given pixmap depths\n");
     ErrorF("+/-render		   turn on/off RENDER extension support"
            "(default on)\n");
     ErrorF("-linebias n            adjust thin line pixelization\n");
@@ -314,23 +313,6 @@ ddxProcessArgument(int argc, char *argv[], int i)
         return 3;
     }
 
-    if (strcmp(argv[i], "-pixdepths") == 0) {   /* -pixdepths list-of-depth */
-        int depth, ret = 1;
-
-        CHECK_FOR_REQUIRED_ARGUMENTS(1);
-        while ((++i < argc) && (depth = atoi(argv[i])) != 0) {
-            if (depth < 0 || depth > 32) {
-                ErrorF("Invalid pixmap depth %d\n", depth);
-                UseMsg();
-                FatalError("Invalid pixmap depth %d passed to -pixdepths\n",
-                           depth);
-            }
-            vfbPixmapDepths[depth] = TRUE;
-            ret++;
-        }
-        return ret;
-    }
-
     if (strcmp(argv[i], "+render") == 0) {      /* +render */
         Render = TRUE;
         return 1;
diff --git a/hw/vfb/man/Xvfb.man b/hw/vfb/man/Xvfb.man
index 95b4dd4..10abf47 100644
--- a/hw/vfb/man/Xvfb.man
+++ b/hw/vfb/man/Xvfb.man
@@ -57,12 +57,6 @@ This option creates screen \fIscreennum\fP and sets its width, height,
 and depth to W, H, and D respectively.  By default, only screen 0 exists
 and has the dimensions 1280x1024x8.
 .TP 4
-.B "\-pixdepths \fIlist-of-depths\fP"
-This option specifies a list of pixmap depths that the server should
-support in addition to the depths implied by the supported screens.
-\fIlist-of-depths\fP is a space-separated list of integers that can
-have values from 1 to 32.
-.TP 4
 .B "\-fbdir \fIframebuffer-directory\fP"
 This option specifies the directory in which the memory mapped files
 containing the framebuffer memory should be created.
@@ -109,13 +103,6 @@ The server will listen for connections as server number 1, will have the
 default screen configuration (one screen, 1280x1024x8), and screen 1
 will be depth 16 1600x1200.
 .TP 8
-Xvfb -pixdepths 3 27 -fbdir /var/tmp
-The server will listen for connections as server number 0, will have the
-default screen configuration (one screen, 1280x1024x8),
-will also support pixmap
-depths of 3 and 27,
-and will use memory mapped files in /var/tmp for the framebuffer.
-.TP 8
 xwud -in /var/tmp/Xvfb_screen0
 Displays screen 0 of the server started by the preceding example.
 .SH "SEE ALSO"
-- 
2.9.3