[PATCH 15/23] fb: Remove unused fbReduceRasterOp

[Adam Jackson]

Appears to have been cargo-culted in from cfb and then never used.

Reviewed-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 fb/fb.h        |  3 ---
 fb/fbutil.c    | 78 ----------------------------------------------------------
 fb/wfbrename.h |  2 --
 3 files changed, 83 deletions(-)

diff --git a/fb/fb.h b/fb/fb.h
index f7cbaf9..9a67b9d 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -1375,9 +1375,6 @@ fbTile(FbBits * dst,
  */
 extern _X_EXPORT FbBits fbReplicatePixel(Pixel p, int bpp);
 
-extern _X_EXPORT void
- fbReduceRasterOp(int rop, FbBits fg, FbBits pm, FbBits * andp, FbBits * xorp);
-
 #ifdef FB_ACCESS_WRAPPER
 extern _X_EXPORT ReadMemoryProcPtr wfbReadMemory;
 extern _X_EXPORT WriteMemoryProcPtr wfbWriteMemory;
diff --git a/fb/fbutil.c b/fb/fbutil.c
index 078fc42..c1d5923 100644
--- a/fb/fbutil.c
+++ b/fb/fbutil.c
@@ -39,84 +39,6 @@ fbReplicatePixel(Pixel p, int bpp)
     return b;
 }
 
-void
-fbReduceRasterOp(int rop, FbBits fg, FbBits pm, FbBits * andp, FbBits * xorp)
-{
-    FbBits and, xor;
-
-    switch (rop) {
-    default:
-    case GXclear:              /* 0 0 0 0 */
-        and = 0;
-        xor = 0;
-        break;
-    case GXand:                /* 0 0 0 1 */
-        and = fg;
-        xor = 0;
-        break;
-    case GXandReverse:         /* 0 0 1 0 */
-        and = fg;
-        xor = fg;
-        break;
-    case GXcopy:               /* 0 0 1 1 */
-        and = 0;
-        xor = fg;
-        break;
-    case GXandInverted:        /* 0 1 0 0 */
-        and = ~fg;
-        xor = 0;
-        break;
-    case GXnoop:               /* 0 1 0 1 */
-        and = FB_ALLONES;
-        xor = 0;
-        break;
-    case GXxor:                /* 0 1 1 0 */
-        and = FB_ALLONES;
-        xor = fg;
-        break;
-    case GXor:                 /* 0 1 1 1 */
-        and = ~fg;
-        xor = fg;
-        break;
-    case GXnor:                /* 1 0 0 0 */
-        and = ~fg;
-        xor = ~fg;
-        break;
-    case GXequiv:              /* 1 0 0 1 */
-        and = FB_ALLONES;
-        xor = ~fg;
-        break;
-    case GXinvert:             /* 1 0 1 0 */
-        and = FB_ALLONES;
-        xor = FB_ALLONES;
-        break;
-    case GXorReverse:          /* 1 0 1 1 */
-        and = ~fg;
-        xor = FB_ALLONES;
-        break;
-    case GXcopyInverted:       /* 1 1 0 0 */
-        and = 0;
-        xor = ~fg;
-        break;
-    case GXorInverted:         /* 1 1 0 1 */
-        and = fg;
-        xor = ~fg;
-        break;
-    case GXnand:               /* 1 1 1 0 */
-        and = fg;
-        xor = FB_ALLONES;
-        break;
-    case GXset:                /* 1 1 1 1 */
-        and = 0;
-        xor = FB_ALLONES;
-        break;
-    }
-    and |= ~pm;
-    xor &= pm;
-    *andp = and;
-    *xorp = xor;
-}
-
 #define O 0
 #define I FB_ALLONES
 
diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index c8be10f..d32c7a4 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -126,8 +126,6 @@
 #define fbQueryBestSize wfbQueryBestSize
 #define fbRasterizeTrapezoid wfbRasterizeTrapezoid
 #define fbRealizeFont wfbRealizeFont
-#define fbRealizeWindow wfbRealizeWindow
-#define fbReduceRasterOp wfbReduceRasterOp
 #define fbReplicatePixel wfbReplicatePixel
 #define fbResolveColor wfbResolveColor
 #define fbScreenPrivateKeyRec wfbScreenPrivateKeyRec
-- 
1.9.3