From 645063cd9384a26353775e92a79ed8710c6ca66c Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 4 Mar 2014 12:51:49 -0500 Subject: [PATCH] exa, kdrive: Remove redundant BitsPerPixel macros We already get this from servermd.h Reviewed-by: Keith Packard Signed-off-by: Adam Jackson --- exa/exa_priv.h | 12 ------------ hw/kdrive/src/kdrive.h | 13 ------------- 2 files changed, 25 deletions(-) diff --git a/exa/exa_priv.h b/exa/exa_priv.h index 61a1f4ccb..88bfd3772 100644 --- a/exa/exa_priv.h +++ b/exa/exa_priv.h @@ -214,18 +214,6 @@ typedef struct { DevPrivateKeyRec gcPrivateKeyRec; } ExaScreenPrivRec, *ExaScreenPrivPtr; -/* - * This is the only completely portable way to - * compute this info. - */ -#ifndef BitsPerPixel -#define BitsPerPixel(d) (\ - PixmapWidthPaddingInfo[d].notPower2 ? \ - (PixmapWidthPaddingInfo[d].bytesPerPixel * 8) : \ - ((1 << PixmapWidthPaddingInfo[d].padBytesLog2) * 8 / \ - (PixmapWidthPaddingInfo[d].padRoundUp+1))) -#endif - extern DevPrivateKeyRec exaScreenPrivateKeyRec; #define exaScreenPrivateKey (&exaScreenPrivateKeyRec) diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h index 066a13419..e1d2b5927 100644 --- a/hw/kdrive/src/kdrive.h +++ b/hw/kdrive/src/kdrive.h @@ -330,19 +330,6 @@ typedef struct _KdPointerMatrix { int matrix[2][3]; } KdPointerMatrix; -/* - * This is the only completely portable way to - * compute this info. - */ - -#ifndef BitsPerPixel -#define BitsPerPixel(d) (\ - PixmapWidthPaddingInfo[d].notPower2 ? \ - (PixmapWidthPaddingInfo[d].bytesPerPixel * 8) : \ - ((1 << PixmapWidthPaddingInfo[d].padBytesLog2) * 8 / \ - (PixmapWidthPaddingInfo[d].padRoundUp+1))) -#endif - extern DevPrivateKeyRec kdScreenPrivateKeyRec; #define kdScreenPrivateKey (&kdScreenPrivateKeyRec)