From e86d8720ba1e79b486ca29a5c2b27fa25811e6a2 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 2 Apr 2020 11:04:07 +0200
Subject: [PATCH] Remove 8-bit support from documentation

We removed support in the code ages ago, but overlooked this part of the
documentation. Also remove some dead code in Xvnc on the same theme.
---
 unix/xserver/hw/vnc/Xvnc.man | 10 ++++------
 unix/xserver/hw/vnc/xvnc.c   | 10 ----------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/unix/xserver/hw/vnc/Xvnc.man b/unix/xserver/hw/vnc/Xvnc.man
index 95591795..83621c08 100644
--- a/unix/xserver/hw/vnc/Xvnc.man
+++ b/unix/xserver/hw/vnc/Xvnc.man
@@ -37,15 +37,13 @@ Specify the size of the desktop to be created. Default is 1024x768.
 .TP
 .B \-depth \fIdepth\fP
 Specify the pixel depth in bits of the desktop to be created. Default is 24,
-other possible values are 8, 15, and 16 - anything else is likely to cause
-strange behaviour by applications.
+other possible values are 16 and 32. Anything else is likely to cause strange
+behaviour by applications and may prevent the server from starting at all.
 .
 .TP
 .B \-pixelformat \fIformat\fP
-Specify pixel format for server to use (BGRnnn or RGBnnn).  The default for
-depth 8 is BGR233 (meaning the most significant two bits represent blue, the
-next three green, and the least significant three represent red), the default
-for depth 16 is RGB565 and for depth 24 is RGB888.
+Specify pixel format for server to use (BGRnnn or RGBnnn). The default for
+depth 16 is RGB565 and for depth 24 and 32 is RGB888.
 .
 .TP
 .B \-interface \fIIP address\fP
diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c
index 9424723a..d50fc262 100644
--- a/unix/xserver/hw/vnc/xvnc.c
+++ b/unix/xserver/hw/vnc/xvnc.c
@@ -1580,16 +1580,6 @@ vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)
     miSetPixmapDepths();
 
     switch (pvfb->fb.depth) {
-    case 8:
-	miSetVisualTypesAndMasks (8,
-				  ((1 << StaticGray) |
-				  (1 << GrayScale) |
-				  (1 << StaticColor) |
-				  (1 << PseudoColor) |
-				  (1 << TrueColor) |
-				  (1 << DirectColor)),
-				  8, PseudoColor, 0, 0, 0);
-	break;
     case 16:
 	miSetVisualTypesAndMasks (16,
 				  ((1 << TrueColor) |
-- 
2.39.5