fb: unexport FbDash*() macros
No external users, so no need to keep them exported. (note that xf86-video-intel has it's own copies of them) Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
parent
b1f60ad68c
commit
05ffb3ec67
43
fb/fb.h
43
fb/fb.h
|
@ -223,49 +223,6 @@ typedef int FbStride;
|
|||
} \
|
||||
}
|
||||
|
||||
/* Macros for dealing with dashing */
|
||||
|
||||
#define FbDashDeclare \
|
||||
unsigned char *__dash, *__firstDash, *__lastDash
|
||||
|
||||
#define FbDashInit(pGC,pPriv,dashOffset,dashlen,even) { \
|
||||
(even) = TRUE; \
|
||||
__firstDash = (pGC)->dash; \
|
||||
__lastDash = __firstDash + (pGC)->numInDashList; \
|
||||
(dashOffset) %= (pPriv)->dashLength; \
|
||||
\
|
||||
__dash = __firstDash; \
|
||||
while ((dashOffset) >= ((dashlen) = *__dash)) \
|
||||
{ \
|
||||
(dashOffset) -= (dashlen); \
|
||||
(even) = 1-(even); \
|
||||
if (++__dash == __lastDash) \
|
||||
__dash = __firstDash; \
|
||||
} \
|
||||
(dashlen) -= (dashOffset); \
|
||||
}
|
||||
|
||||
#define FbDashNext(dashlen) { \
|
||||
if (++__dash == __lastDash) \
|
||||
__dash = __firstDash; \
|
||||
(dashlen) = *__dash; \
|
||||
}
|
||||
|
||||
/* as numInDashList is always even, this case can skip a test */
|
||||
|
||||
#define FbDashNextEven(dashlen) { \
|
||||
(dashlen) = *++__dash; \
|
||||
}
|
||||
|
||||
#define FbDashNextOdd(dashlen) FbDashNext(dashlen)
|
||||
|
||||
#define FbDashStep(dashlen,even) { \
|
||||
if (!--(dashlen)) { \
|
||||
FbDashNext(dashlen); \
|
||||
(even) = 1-(even); \
|
||||
} \
|
||||
}
|
||||
|
||||
/* Framebuffer access wrapper */
|
||||
typedef FbBits(*ReadMemoryProcPtr) (const void *src, int size);
|
||||
typedef void (*WriteMemoryProcPtr) (void *dst, FbBits value, int size);
|
||||
|
|
43
fb/fbbits.h
43
fb/fbbits.h
|
@ -48,6 +48,49 @@
|
|||
n >>= FB_SHIFT; \
|
||||
}
|
||||
|
||||
/* Macros for dealing with dashing */
|
||||
|
||||
#define FbDashDeclare \
|
||||
unsigned char *__dash, *__firstDash, *__lastDash
|
||||
|
||||
#define FbDashInit(pGC,pPriv,dashOffset,dashlen,even) { \
|
||||
(even) = TRUE; \
|
||||
__firstDash = (pGC)->dash; \
|
||||
__lastDash = __firstDash + (pGC)->numInDashList; \
|
||||
(dashOffset) %= (pPriv)->dashLength; \
|
||||
\
|
||||
__dash = __firstDash; \
|
||||
while ((dashOffset) >= ((dashlen) = *__dash)) \
|
||||
{ \
|
||||
(dashOffset) -= (dashlen); \
|
||||
(even) = 1-(even); \
|
||||
if (++__dash == __lastDash) \
|
||||
__dash = __firstDash; \
|
||||
} \
|
||||
(dashlen) -= (dashOffset); \
|
||||
}
|
||||
|
||||
#define FbDashNext(dashlen) { \
|
||||
if (++__dash == __lastDash) \
|
||||
__dash = __firstDash; \
|
||||
(dashlen) = *__dash; \
|
||||
}
|
||||
|
||||
/* as numInDashList is always even, this case can skip a test */
|
||||
|
||||
#define FbDashNextEven(dashlen) { \
|
||||
(dashlen) = *++__dash; \
|
||||
}
|
||||
|
||||
#define FbDashNextOdd(dashlen) FbDashNext(dashlen)
|
||||
|
||||
#define FbDashStep(dashlen,even) { \
|
||||
if (!--(dashlen)) { \
|
||||
FbDashNext(dashlen); \
|
||||
(even) = 1-(even); \
|
||||
} \
|
||||
}
|
||||
|
||||
#ifdef BITSSTORE
|
||||
#define STORE(b,x) BITSSTORE(b,x)
|
||||
#else
|
||||
|
|
|
@ -24,7 +24,9 @@
|
|||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "fb.h"
|
||||
#include "fb/fb.h"
|
||||
#include "fb/fbbits.h"
|
||||
|
||||
#include "miline.h"
|
||||
|
||||
#define fbBresShiftMask(mask,dir,bpp) ((bpp == FB_STIP_UNIT) ? 0 : \
|
||||
|
|
Loading…
Reference in New Issue