Detach xf4bpp from cfb.
This commit is contained in:
parent
0aaac95b0d
commit
aff404f293
|
@ -57,6 +57,6 @@ mfbseg.c:
|
||||||
echo "#define POLYSEGMENT" > $@
|
echo "#define POLYSEGMENT" > $@
|
||||||
echo "#include \"$(srcdir)/mfbline.c\"" >> $@
|
echo "#include \"$(srcdir)/mfbline.c\"" >> $@
|
||||||
|
|
||||||
INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
|
INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb
|
||||||
|
|
||||||
AM_CFLAGS = $(XORG_CFLAGS)
|
AM_CFLAGS = $(XORG_CFLAGS)
|
||||||
|
|
|
@ -55,8 +55,7 @@ SOFTWARE.
|
||||||
#include "xf4bpp.h"
|
#include "xf4bpp.h"
|
||||||
#include "mfbmap.h"
|
#include "mfbmap.h"
|
||||||
#define PSZ 8
|
#define PSZ 8
|
||||||
#include "cfb.h"
|
#include "mfb.h"
|
||||||
#include "cfbmskbits.h"
|
|
||||||
#include "mergerop.h"
|
#include "mergerop.h"
|
||||||
#include "mi.h"
|
#include "mi.h"
|
||||||
#include "pixmapstr.h"
|
#include "pixmapstr.h"
|
||||||
|
@ -87,8 +86,8 @@ vga16DoBitblt
|
||||||
int w, h;
|
int w, h;
|
||||||
int careful;
|
int careful;
|
||||||
|
|
||||||
widthSrc = cfbGetLongWidth(pSrc);
|
widthSrc = mfbGetPixelWidth(pSrc);
|
||||||
widthDst = cfbGetLongWidth(pDst);
|
widthDst = mfbGetPixelWidth(pDst);
|
||||||
|
|
||||||
/* XXX we have to err on the side of safety when both are windows,
|
/* XXX we have to err on the side of safety when both are windows,
|
||||||
* because we don't know if IncludeInferiors is being used.
|
* because we don't know if IncludeInferiors is being used.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user