diff options
Diffstat (limited to 'do_traps.c')
| -rw-r--r-- | do_traps.c | 18 |
1 files changed, 8 insertions, 10 deletions
@@ -1,4 +1,3 @@ -/* $Xorg: do_traps.c,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_traps.c,v 1.9tsi Exp $ */ #include "x11perf.h" #include "bitmaps.h" @@ -106,7 +104,7 @@ EndTrapezoids(XParms xp, Parms p) free(points); } -#ifdef XRENDER +#if defined(XRENDER) && defined(XFT) #include <X11/extensions/Xrender.h> #include <X11/Xft/Xft.h> @@ -172,8 +170,8 @@ InitFixedTraps(XParms xp, Parms p, int reps) maskFormat = XRenderFindStandardFormat (xp->d, std_fmt); maskPixmap = XCreatePixmap (xp->d, xp->w, WIDTH, HEIGHT, depth); - - mask = XRenderCreatePicture (xp->d, maskPixmap, maskFormat, 0, 0); + + mask = XRenderCreatePicture (xp->d, maskPixmap, maskFormat, 0, NULL); color.red = 0; color.green = 0; @@ -185,7 +183,7 @@ InitFixedTraps(XParms xp, Parms p, int reps) &color, &aablack)) { XftDrawDestroy (aadraw); - aadraw = 0; + aadraw = NULL; return 0; } color.red = 0xffff; @@ -198,7 +196,7 @@ InitFixedTraps(XParms xp, Parms p, int reps) &color, &aawhite)) { XftDrawDestroy (aadraw); - aadraw = 0; + aadraw = NULL; return 0; } @@ -304,7 +302,7 @@ InitFixedTrapezoids(XParms xp, Parms p, int reps) 0); } else - maskFormat = 0; + maskFormat = NULL; color.red = 0; color.green = 0; color.blue = 0; @@ -315,7 +313,7 @@ InitFixedTrapezoids(XParms xp, Parms p, int reps) &color, &aablack)) { XftDrawDestroy (aadraw); - aadraw = 0; + aadraw = NULL; return 0; } color.red = 0xffff; @@ -328,7 +326,7 @@ InitFixedTrapezoids(XParms xp, Parms p, int reps) &color, &aawhite)) { XftDrawDestroy (aadraw); - aadraw = 0; + aadraw = NULL; return 0; } |