mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-14 17:18:09 +00:00
unifdef -B -DRENDER to always include RENDER code
This patch was created with: git ls-files '*.[ch]' | while read f; do unifdef -B -DRENDER -o $f $f; done Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
4
fb/fb.h
4
fb/fb.h
@@ -41,11 +41,7 @@
|
||||
#include "mi.h"
|
||||
#include "migc.h"
|
||||
#include "mibstore.h"
|
||||
#ifdef RENDER
|
||||
#include "picturestr.h"
|
||||
#else
|
||||
#include "picture.h"
|
||||
#endif
|
||||
|
||||
#ifdef FB_ACCESS_WRAPPER
|
||||
|
||||
|
||||
@@ -31,8 +31,6 @@
|
||||
|
||||
#include "fb.h"
|
||||
|
||||
#ifdef RENDER
|
||||
|
||||
#include "picturestr.h"
|
||||
#include "mipict.h"
|
||||
#include "fbpict.h"
|
||||
@@ -203,8 +201,6 @@ fbCompositeGeneral (CARD8 op,
|
||||
width, height);
|
||||
}
|
||||
|
||||
#endif /* RENDER */
|
||||
|
||||
static pixman_image_t *
|
||||
create_solid_fill_image (PicturePtr pict)
|
||||
{
|
||||
@@ -472,8 +468,6 @@ Bool
|
||||
fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
|
||||
{
|
||||
|
||||
#ifdef RENDER
|
||||
|
||||
PictureScreenPtr ps;
|
||||
|
||||
if (!miPictureInit (pScreen, formats, nformats))
|
||||
@@ -486,7 +480,5 @@ fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
|
||||
ps->AddTraps = fbAddTraps;
|
||||
ps->AddTriangles = fbAddTriangles;
|
||||
|
||||
#endif /* RENDER */
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -26,8 +26,6 @@
|
||||
|
||||
#include "fb.h"
|
||||
|
||||
#ifdef RENDER
|
||||
|
||||
#include "picturestr.h"
|
||||
#include "mipict.h"
|
||||
#include "renderedge.h"
|
||||
@@ -160,4 +158,3 @@ fbAddTriangles (PicturePtr pPicture,
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* RENDER */
|
||||
|
||||
Reference in New Issue
Block a user