diff options
| -rw-r--r-- | .gitignore | 76 | ||||
| -rw-r--r-- | AUTHORS | 0 | ||||
| -rw-r--r-- | COPYING | 35 | ||||
| -rw-r--r-- | ChangeLog | 52 | ||||
| -rw-r--r-- | INSTALL | 0 | ||||
| -rw-r--r-- | Makefile.am | 38 | ||||
| -rw-r--r-- | NEWS | 0 | ||||
| -rw-r--r-- | README | 24 | ||||
| -rw-r--r-- | Xmark | 4 | ||||
| -rw-r--r-- | Xmark.man | 1 | ||||
| -rw-r--r-- | bitmaps.c | 5 | ||||
| -rw-r--r-- | bitmaps.h | 2 | ||||
| -rw-r--r-- | configure.ac | 40 | ||||
| -rw-r--r-- | do_arcs.c | 2 | ||||
| -rw-r--r-- | do_blt.c | 23 | ||||
| -rw-r--r-- | do_complex.c | 2 | ||||
| -rw-r--r-- | do_dots.c | 2 | ||||
| -rw-r--r-- | do_lines.c | 2 | ||||
| -rw-r--r-- | do_movewin.c | 2 | ||||
| -rw-r--r-- | do_rects.c | 2 | ||||
| -rw-r--r-- | do_segs.c | 2 | ||||
| -rw-r--r-- | do_simple.c | 2 | ||||
| -rw-r--r-- | do_tests.c | 4 | ||||
| -rw-r--r-- | do_text.c | 6 | ||||
| -rw-r--r-- | do_traps.c | 18 | ||||
| -rw-r--r-- | do_tris.c | 2 | ||||
| -rw-r--r-- | do_valgc.c | 2 | ||||
| -rw-r--r-- | do_windows.c | 2 | ||||
| -rw-r--r-- | x11pcomp.cpp | 1 | ||||
| -rw-r--r-- | x11perf.c | 24 | ||||
| -rw-r--r-- | x11perf.h | 4 | ||||
| -rw-r--r-- | x11perf.man | 4 | ||||
| -rw-r--r-- | x11perfcomp.man | 2 |
33 files changed, 188 insertions, 197 deletions
@@ -1,24 +1,80 @@ -.deps -*.o -Makefile -Makefile.in -Xmark.1 +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) aclocal.m4 -autom4te.cache +autom4te.cache/ +autoscan.log +ChangeLog compile config.guess config.h config.h.in config.log +config-ml.in +config.py config.status +config.status.lineno config.sub configure +configure.scan depcomp +.deps/ +INSTALL install-sh +.libs/ +libtool +libtool.m4 +ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +Makefile +Makefile.in +mdate-sh missing -stamp-h1 +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute +*~ +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for x11perf +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# x11perf -x11perf.1 x11perfcomp -x11perfcomp.1 -*~ diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index e69de29..0000000 --- a/AUTHORS +++ /dev/null @@ -1,12 +1,31 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. -Please submit updated COPYING files to the Xorg bugzilla: + All Rights Reserved -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Digital not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. -http://lists.freedesktop.org/mailman/listinfo/xorg +**************************************************************************** + +Copyright (c) 1993 by Hewlett-Packard Company + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both the copyright notice and this permission notice appear in +supporting documentation, and that the name of Hewlett-Packard not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 85e5fac..0000000 --- a/ChangeLog +++ /dev/null @@ -1,52 +0,0 @@ -2006-03-02 Adam Jackson <ajax@freedesktop.org> - - * configure.ac: - Bump to 1.4.1 (was 1.0.1 because we screwed up during modularising). - -2006-02-14 Keith Packard <keithp@keithp.com> - - * Makefile.am: - * configure.ac: - * x11perf.h: - Split detection of Xrender and Xft. - Add detection of MIT-SHM. - Clean up CFLAGS in Makefile.am - -2006-02-13 Eric Anholt <anholt@FreeBSD.org> - - * configure.ac: - * x11perf.c: - * x11perf.h: - Detect when Render is available and turn those tests on. - -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version for X11R7 release. - -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for final X11R7 release candidate. - -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. - -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for X11R7 RC3 release. - -2005-11-20 Alan Coopersmith <alan.coopersmith@sun.com> - - * configure.ac: - Change dependency from xmu to xmuu since the full xmu - (with all its baggage like Xt) is not needed here. - -2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for RC1 release. - diff --git a/INSTALL b/INSTALL deleted file mode 100644 index e69de29..0000000 --- a/INSTALL +++ /dev/null diff --git a/Makefile.am b/Makefile.am index d635909..c14391c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,7 @@ LIBPATH = $(libdir)/X11/x11perfcomp x11perfcompdir = $(LIBPATH) dist_x11perfcomp_SCRIPTS = fillblnk perfboth perfratio Xmark -AM_CFLAGS = $(XEXT_CFLAGS) $(XFT_CFLAGS) $(XRENDER_CFLAGS) $(X11PERF_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XEXT_CFLAGS) $(XFT_CFLAGS) $(XRENDER_CFLAGS) $(X11PERF_CFLAGS) x11perf_LDADD = $(XEXT_LIBS) $(XFT_LIBS) $(XRENDER_LIBS) $(X11PERF_LIBS) -lm x11perf_SOURCES = \ @@ -58,10 +58,11 @@ appman_PRE = \ Xmark.man x11perfcomp: x11pcomp.cpp - $(SED) s/LIBPATH/`echo $(LIBPATH) | sed -e s/\\\\//\\\\\\\\\\\\\//g`/ < $(srcdir)/x11pcomp.cpp | \ + $(AM_V_GEN)$(SED) s/LIBPATH/`echo $(LIBPATH) | sed -e s/\\\\//\\\\\\\\\\\\\//g`/ < $(srcdir)/x11pcomp.cpp | \ $(SED) s/XCOMM/\#/ > $@ +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(bin_SCRIPTS) x11perfcomp EXTRA_DIST = x11pcomp.cpp @@ -73,26 +74,19 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST += $(appman_PRE) CLEANFILES += $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + + +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog INSTALL @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/app/x11perf + + http://cgit.freedesktop.org/xorg/app/x11perf + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + @@ -1,14 +1,10 @@ #! /bin/sh -#$Xorg: Xmark.sh,v 1.3 2000/08/17 19:54:08 cpqbld Exp $ -#XPC Header: Xmark,v 1.15 93/04/12 10:10:07 hmgr Exp # ############################################################ -# Xmark version XPC Revision: 1.15 # # Usage: Xmark datafile # ############################################################ -# $XFree86: xc/programs/x11perf/Xmark.sh,v 1.2 1997/01/04 12:20:20 dawes Exp $ # # # CHANGE HISTORY: @@ -1,6 +1,5 @@ .\" This manpage was written by Richard Braakman and is licensed under the .\" XFree86 license. -.\" $XFree86: xc/programs/x11perf/Xmark.man,v 1.2 2001/01/24 00:06:42 dawes Exp $ .TH Xmark 1 __xorgversion__ .SH NAME Xmark \- summarize x11perf results @@ -1,4 +1,3 @@ -/* $Xorg: bitmaps.c,v 1.3 2000/08/17 19:54:08 cpqbld Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -782,9 +781,7 @@ static unsigned char escherknot_bits[] = { # define GCBits (GCFillStyle|GCTileStipXOrigin|GCTileStipYOrigin) -void SetFillStyle(xp, p) - XParms xp; - Parms p; +void SetFillStyle(XParms xp, Parms p) { int xorg = 0, yorg = 0; @@ -1,4 +1,3 @@ -/* $Xorg: bitmaps.h,v 1.3 2000/08/17 19:54:09 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/bitmaps.h,v 1.3 1999/03/02 11:49:28 dawes Exp $ */ /* Set fill style (if any) to a bitmap or tile */ diff --git a/configure.ac b/configure.ac index 28f7423..c6d1dbb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,3 @@ - dnl Copyright 2005 Red Hat, Inc. dnl dnl Permission to use, copy, modify, distribute, and sell this software and its @@ -21,32 +20,32 @@ dnl PERFORMANCE OF THIS SOFTWARE. dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(x11perf,[1.4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],x11perf) -AM_INIT_AUTOMAKE([dist-bzip2]) -AM_MAINTAINER_MODE - -AM_CONFIG_HEADER(config.h) +# Initialize Autoconf +AC_PREREQ([2.60]) +AC_INIT([x11perf], + [1.5.2], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], + [x11perf]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) -AC_PROG_CC -AC_PROG_INSTALL +# Initialize Automake +AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE -AC_PATH_PROG(SED,sed) -if [[ -z $SED ]] ; then - AC_MSG_ERROR([sed is needed to build x11perf]) -fi +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS AC_TYPE_SIGNAL # Checks for pkg-config packages PKG_CHECK_MODULES(X11PERF, x11 xmuu) -AC_SUBST(X11PERF_CFLAGS) -AC_SUBST(X11PERF_LIBS) # Check for Xrender library PKG_CHECK_MODULES(XRENDER, xrender, [xrender_found=yes], [xrender_found=no]) -AC_SUBST(XRENDER_CFLAGS) -AC_SUBST(XRENDER_LIBS) case "$xrender_found" in yes) AC_DEFINE(XRENDER,1,[Xrender library available]) @@ -55,8 +54,6 @@ esac # Check for Xft library PKG_CHECK_MODULES(XFT, xft, [xft_found=yes], [xft_found=no]) -AC_SUBST(XFT_CFLAGS) -AC_SUBST(XFT_LIBS) case "$xft_found" in yes) AC_DEFINE(XFT,1,[Xft library available]) @@ -65,8 +62,6 @@ esac # Check for MIT-SHM extension PKG_CHECK_MODULES(XEXT, xext, [xext_found=yes], [xext_found=no]) -AC_SUBST(XEXT_CFLAGS) -AC_SUBST(XEXT_LIBS) case "$xext_found" in yes) save_LIBS="$LIBS" @@ -77,7 +72,4 @@ yes) ;; esac -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION - AC_OUTPUT([Makefile]) @@ -1,4 +1,3 @@ -/* $Xorg: do_arcs.c,v 1.3 2000/08/17 19:54:09 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_arcs.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */ #include "x11perf.h" @@ -1,4 +1,3 @@ -/* $Xorg: do_blt.c,v 1.3 2000/08/17 19:54:09 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_blt.c,v 1.8 2001/05/01 16:19:16 alanh Exp $ */ #include "x11perf.h" #include <stdio.h> @@ -200,7 +198,7 @@ InitCopyPix(XParms xp, Parms p, int reps) /* Create pixmap to write stuff into, and initialize it */ pix = XCreatePixmap(xp->d, xp->w, WIDTH, HEIGHT, xp->vinfo.depth); - pixgc = XCreateGC(xp->d, pix, 0, 0); + pixgc = XCreateGC(xp->d, pix, 0, NULL); /* need a gc with GXcopy cos pixmaps contain junk on creation. mmm */ XCopyArea(xp->d, xp->w, pix, pixgc, 0, 0, WIDTH, HEIGHT, 0, 0); XFreeGC(xp->d, pixgc); @@ -214,8 +212,8 @@ InitGetImage(XParms xp, Parms p, int reps) /* Create image to stuff bits into */ image = XGetImage(xp->d, xp->w, 0, 0, WIDTH, HEIGHT, xp->planemask, - p->font==0?ZPixmap:XYPixmap); - if(image==0){ + p->font==NULL?ZPixmap:XYPixmap); + if(image==NULL){ printf("XGetImage failed\n"); return False; } @@ -284,7 +282,7 @@ DoGetImage(XParms xp, Parms p, int reps) int format; size = p->special; - format = (p->font == 0) ? ZPixmap : XYPixmap; + format = (p->font == NULL) ? ZPixmap : XYPixmap; for (sa = segsa, sb = segsb, i = 0; i != reps; i++, sa++, sb++) { XDestroyImage(image); image = XGetImage(xp->d, xp->w, sa->x1, sa->y1, size, size, @@ -404,7 +402,7 @@ InitShmPutImage(XParms xp, Parms p, int reps) perror ("shmget"); return False; } - shm_info.shmaddr = (char *) shmat(shm_info.shmid, 0, 0); + shm_info.shmaddr = (char *) shmat(shm_info.shmid, NULL, 0); if (shm_info.shmaddr == ((char *) -1)) { /* @@ -417,7 +415,7 @@ InitShmPutImage(XParms xp, Parms p, int reps) free(segsa); free(segsb); perror ("shmat"); - shmctl (shm_info.shmid, IPC_RMID, 0); + shmctl (shm_info.shmid, IPC_RMID, NULL); return False; } shm_info.readOnly = True; @@ -439,7 +437,7 @@ InitShmPutImage(XParms xp, Parms p, int reps) free(segsb); if(shmdt (shm_info.shmaddr)==-1) perror("shmdt:"); - if(shmctl (shm_info.shmid, IPC_RMID, 0)==-1) + if(shmctl (shm_info.shmid, IPC_RMID, NULL)==-1) perror("shmctl rmid:"); return False; } @@ -478,7 +476,7 @@ EndShmPutImage(XParms xp, Parms p) XSync(xp->d, False); /* need server to detach so can remove id */ if(shmdt (shm_info.shmaddr)==-1) perror("shmdt:"); - if(shmctl (shm_info.shmid, IPC_RMID, 0)==-1) + if(shmctl (shm_info.shmid, IPC_RMID, NULL)==-1) perror("shmctl rmid:"); } @@ -528,7 +526,7 @@ InitCopyPlane(XParms xp, Parms p, int reps) /* Create pixmap to write stuff into, and initialize it */ pix = XCreatePixmap(xp->d, xp->w, WIDTH, HEIGHT, - p->font==0 ? 1 : xp->vinfo.depth); + p->font==NULL ? 1 : xp->vinfo.depth); gcv.graphics_exposures = False; gcv.foreground = 0; gcv.background = 1; @@ -608,6 +606,9 @@ InitCompositePix(XParms xp, Parms p, int reps) case PictStandardA1: depth = 1; break; + default: + depth = 0; + break; } if (!format) format = XRenderFindStandardFormat (xp->d, xp->planemask); diff --git a/do_complex.c b/do_complex.c index 1886da9..3eac738 100644 --- a/do_complex.c +++ b/do_complex.c @@ -1,4 +1,3 @@ -/* $Xorg: do_complex.c,v 1.3 2000/08/17 19:54:09 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_complex.c,v 1.8 2001/07/25 15:05:16 dawes Exp $ */ #include "x11perf.h" @@ -1,4 +1,3 @@ -/* $Xorg: do_dots.c,v 1.3 2000/08/17 19:54:09 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_dots.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */ #include "x11perf.h" @@ -1,4 +1,3 @@ -/* $Xorg: do_lines.c,v 1.3 2000/08/17 19:54:09 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_lines.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */ #include "x11perf.h" diff --git a/do_movewin.c b/do_movewin.c index ed25d7f..ed96ae1 100644 --- a/do_movewin.c +++ b/do_movewin.c @@ -1,4 +1,3 @@ -/* $Xorg: do_movewin.c,v 1.4 2000/08/17 19:54:09 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_movewin.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */ #include "x11perf.h" @@ -1,4 +1,3 @@ -/* $Xorg: do_rects.c,v 1.4 2000/08/17 19:54:09 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_rects.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */ #include "x11perf.h" #include "bitmaps.h" @@ -1,4 +1,3 @@ -/* $Xorg: do_segs.c,v 1.3 2000/08/17 19:54:09 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_segs.c,v 1.4 2000/11/29 08:58:20 keithp Exp $ */ #include "x11perf.h" diff --git a/do_simple.c b/do_simple.c index 2852f7a..0904b6f 100644 --- a/do_simple.c +++ b/do_simple.c @@ -1,4 +1,3 @@ -/* $Xorg: do_simple.c,v 1.4 2000/08/17 19:54:09 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_simple.c,v 1.6tsi Exp $ */ #ifndef VMS #include <X11/Xatom.h> @@ -1,4 +1,3 @@ -/* $Xorg: do_tests.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_tests.c,v 1.9 2002/05/13 05:27:37 keithp Exp $ */ #include "x11perf.h" @@ -790,7 +788,7 @@ Test test[] = { InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids, V1_4FEATURE, ROP, 0, {2, 300, "escherknot", NULL, FillTiled}}, -#ifdef XRENDER +#if defined(XRENDER) && defined(XFT) {"-aatrap1", "Fill 1x1 aa trap", NULL, InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps, V1_5FEATURE, NONROP, 0, @@ -1,4 +1,3 @@ -/* $Xorg: do_text.c,v 1.4 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_text.c,v 1.7 2001/01/17 23:45:12 dawes Exp $ */ #include "x11perf.h" #include <stdio.h> @@ -444,8 +442,8 @@ InitAAText(XParms xp, Parms p, int reps) printf ("Cannot allocate black\n"); XftFontClose (xp->d, aafont); XftDrawDestroy (aadraw); - aafont = 0; - aadraw = 0; + aafont = NULL; + aadraw = NULL; return 0; } @@ -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; } @@ -1,4 +1,3 @@ -/* $Xorg: do_tris.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_tris.c,v 1.4 2000/11/29 08:58:20 keithp Exp $ */ #undef POLYTRIANGLE_HACK /* don't use this code */ @@ -1,4 +1,3 @@ -/* $Xorg: do_valgc.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_valgc.c,v 1.4 2000/11/29 08:58:20 keithp Exp $ */ #ifndef VMS #include <X11/Xatom.h> diff --git a/do_windows.c b/do_windows.c index f608063..024d76b 100644 --- a/do_windows.c +++ b/do_windows.c @@ -1,4 +1,3 @@ -/* $Xorg: do_windows.c,v 1.4 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_windows.c,v 1.4 2000/11/29 08:58:20 keithp Exp $ */ #include "x11perf.h" diff --git a/x11pcomp.cpp b/x11pcomp.cpp index dd0309e..be7d397 100644 --- a/x11pcomp.cpp +++ b/x11pcomp.cpp @@ -19,7 +19,6 @@ XCOMM XCOMM Mark Moraes, University of Toronto <moraes@csri.toronto.edu> XCOMM Joel McCormack, DEC Western Research Lab <joel@decwrl.dec.com> XCOMM -XCOMM $Xorg: x11pcomp.cpp,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ PATH=LIBPATH:.:$PATH export PATH @@ -1,5 +1,3 @@ -/* $Xorg: x11perf.c,v 1.4 2000/08/17 19:54:10 cpqbld Exp $ */ -/* $XdotOrg: app/x11perf/x11perf.c,v 1.3 2005/07/26 18:55:42 alanc Exp $ */ /**************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -22,7 +20,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ****************************************************************************/ -/* $XFree86: xc/programs/x11perf/x11perf.c,v 3.6 2001/11/03 21:59:20 dawes Exp $ */ #include <stdio.h> #include <ctype.h> @@ -43,13 +40,14 @@ SOFTWARE. /* Only for working on ``fake'' servers, for hardware that doesn't exist */ static Bool drawToFakeServer = False; +static Bool falsePrecision = False; static Pixmap tileToQuery = None; static char *displayName; int abortTest; typedef struct _RopNames { char *name; int rop; } RopNameRec, *RopNamePtr; -RopNameRec ropNames[] = { +static RopNameRec ropNames[] = { { "clear", GXclear }, /* 0 */ { "and", GXand }, /* src AND dst */ { "andReverse", GXandReverse }, /* src AND NOT dst */ @@ -68,7 +66,7 @@ RopNameRec ropNames[] = { { "set", GXset } /* 1 */ }; -RopNameRec popNames[] = { +static RopNameRec popNames[] = { { "Clear", PictOpClear }, { "Src", PictOpSrc }, { "Dst", PictOpDst }, @@ -85,7 +83,7 @@ RopNameRec popNames[] = { { "Saturate", PictOpSaturate }, }; -RopNameRec formatNames[] = { +static RopNameRec formatNames[] = { { "RGB24", PictStandardRGB24 }, { "ARGB32", PictStandardARGB32 }, { "A8", PictStandardA8 }, @@ -94,7 +92,7 @@ RopNameRec formatNames[] = { { "NATIVE", PictStandardNative }, }; -char *(visualClassNames)[] = { +static char *(visualClassNames)[] = { "StaticGray", "GrayScale", "StaticColor", @@ -252,9 +250,11 @@ RoundTo3Digits(double d) { /* It's kind of silly to print out things like ``193658.4/sec'' so just junk all but 3 most significant digits. */ - double exponent, sign; + if (falsePrecision) + return d; + exponent = 1.0; /* the code below won't work if d should happen to be non-positive. */ if (d < 0.0) { @@ -978,10 +978,12 @@ main(int argc, char *argv[]) foundOne = True; } else if (strcmp (argv[i], "-sync") == 0) { synchronous = True; - } else if (strcmp(argv[i], "-pack") == 0) { + } else if (strcmp (argv[i], "-pack") == 0) { xparms.pack = True; } else if (strcmp (argv[i], "-draw") == 0) { drawToFakeServer = True; + } else if (strcmp (argv[i], "-falseprecision") == 0) { + falsePrecision = True; } else if (strcmp (argv[i], "-repeat") == 0) { i++; if (argc <= i) @@ -1094,14 +1096,14 @@ main(int argc, char *argv[]) len = strlen(argv[i]); if(len>=3) ForEachTest (j) { - if (Strstr (test[j].option, argv[i]+1) != 0) { + if (Strstr (test[j].option, argv[i]+1) != NULL) { fprintf(stderr," -> %s %s\n", test[j].option, LABELP(j)); doit[j] = found = True; } } if(!found) ForEachTest (j) { - if (Strstr (LABELP(j), argv[i]+1) != 0) { + if (Strstr (LABELP(j), argv[i]+1) != NULL) { fprintf(stderr," -> %s %s\n", test[j].option, LABELP(j)); doit[j] = found = True; } @@ -1,4 +1,3 @@ -/* $Xorg: x11perf.h,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/x11perf.h,v 3.4 2001/07/25 15:05:16 dawes Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -293,7 +291,7 @@ extern void EndAAText ( XParms xp, Parms p ); extern int InitTrapezoids ( XParms xp, Parms p, int reps ); extern void DoTrapezoids ( XParms xp, Parms p, int reps ); extern void EndTrapezoids ( XParms xp, Parms p ); -#ifdef XRENDER +#if defined(XRENDER) && defined(XFT) extern int InitFixedTraps ( XParms xp, Parms p, int reps ); extern void DoFixedTraps ( XParms xp, Parms p, int reps ); extern void EndFixedTraps ( XParms xp, Parms p ); diff --git a/x11perf.man b/x11perf.man index d8f3e24..b1e7be2 100644 --- a/x11perf.man +++ b/x11perf.man @@ -1,4 +1,3 @@ -.\" $Xorg: x11perf.man,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $ .\" Copyright 1988, 1989 Digital Equipment Corporation. .\" Copyright 1989, 1994, 1998 The Open Group .\" @@ -24,7 +23,6 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/x11perf/x11perf.man,v 1.8 2001/12/14 20:01:14 dawes Exp $ .\" .TH X11PERF 1 __xorgversion__ .SH NAME @@ -1003,7 +1001,7 @@ Circulate unmapped window to top. .SH X DEFAULTS There are no X defaults used by this program. .SH "SEE ALSO" -X(__miscmansuffix__), xbench(1), x11perfcomp(1) +X(__miscmansuffix__), x11perfcomp(1) .SH AUTHORS Joel McCormack .br diff --git a/x11perfcomp.man b/x11perfcomp.man index 2750412..45e4ad3 100644 --- a/x11perfcomp.man +++ b/x11perfcomp.man @@ -1,4 +1,3 @@ -.\" $Xorg: x11pcomp.man,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $ .\" Copyright 1993, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,6 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/x11perf/x11pcomp.man,v 1.7 2001/01/27 18:21:07 dawes Exp $ .\" .TH X11PERFCOMP 1 __xorgversion__ .SH NAME |