This is strictly the application of the script 'x-indent-all.sh' from util/modular. Compared to the patch that Daniel posted in January, I've added a few indent flags: -bap -psl -T PrivatePtr -T pmWait -T _XFUNCPROTOBEGIN -T _XFUNCPROTOEND -T _X_EXPORT The typedefs were needed to make the output of sdksyms.sh match the previous output, otherwise, the code is formatted badly enough that sdksyms.sh generates incorrect output. The generated code was compared with the previous version and found to be essentially identical -- "assert" line numbers and BUILD_TIME were the only differences found. The comparison was done with this script: dir1=$1 dir2=$2 for dir in $dir1 $dir2; do (cd $dir && find . -name '*.o' | while read file; do dir=`dirname $file` base=`basename $file .o` dump=$dir/$base.dump objdump -d $file > $dump done) done find $dir1 -name '*.dump' | while read dump; do otherdump=`echo $dump | sed "s;$dir1;$dir2;"` diff -u $dump $otherdump done Signed-off-by: Keith Packard <keithp@keithp.com> Acked-by: Daniel Stone <daniel@fooishbar.org> Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
74 lines
2.5 KiB
C
74 lines
2.5 KiB
C
/**************************************************************************
|
|
|
|
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
|
|
Copyright (c) 2002 Apple Computer, Inc.
|
|
All Rights Reserved.
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a
|
|
copy of this software and associated documentation files (the
|
|
"Software"), to deal in the Software without restriction, including
|
|
without limitation the rights to use, copy, modify, merge, publish,
|
|
distribute, sub license, and/or sell copies of the Software, and to
|
|
permit persons to whom the Software is furnished to do so, subject to
|
|
the following conditions:
|
|
|
|
The above copyright notice and this permission notice (including the
|
|
next paragraph) shall be included in all copies or substantial portions
|
|
of the Software.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
|
|
IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
|
|
ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
**************************************************************************/
|
|
|
|
/*
|
|
* Authors:
|
|
* Jens Owen <jens@precisioninsight.com>
|
|
*
|
|
*/
|
|
|
|
#ifndef DRI_STRUCT_H
|
|
#define DRI_STRUCT_H
|
|
|
|
#include "dri.h"
|
|
#include "x-list.h"
|
|
|
|
#define DRI_MAX_DRAWABLES 256
|
|
|
|
#define DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin) ((DRIDrawablePrivPtr) \
|
|
dixLookupPrivate(&(pWin)->devPrivates, DRIWindowPrivKey))
|
|
|
|
#define DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix) ((DRIDrawablePrivPtr) \
|
|
dixLookupPrivate(&(pPix)->devPrivates, DRIPixmapPrivKey))
|
|
|
|
typedef struct _DRIDrawablePrivRec {
|
|
xp_surface_id sid;
|
|
int drawableIndex;
|
|
DrawablePtr pDraw;
|
|
ScreenPtr pScreen;
|
|
int refCount;
|
|
unsigned int key[2];
|
|
x_list *notifiers; /* list of (FUN . DATA) */
|
|
} DRIDrawablePrivRec, *DRIDrawablePrivPtr;
|
|
|
|
#define DRI_SCREEN_PRIV(pScreen) ((DRIScreenPrivPtr) \
|
|
dixLookupPrivate(&(pScreen)->devPrivates, DRIScreenPrivKey))
|
|
|
|
#define DRI_SCREEN_PRIV_FROM_INDEX(screenIndex) ((DRIScreenPrivPtr) \
|
|
dixLookupPrivate(&screenInfo.screens[screenIndex]->devPrivates, \
|
|
DRIScreenPrivKey))
|
|
|
|
typedef struct _DRIScreenPrivRec {
|
|
Bool directRenderingSupport;
|
|
int nrWindows;
|
|
DRIWrappedFuncsRec wrap;
|
|
DrawablePtr DRIDrawables[DRI_MAX_DRAWABLES];
|
|
} DRIScreenPrivRec, *DRIScreenPrivPtr;
|
|
|
|
#endif /* DRI_STRUCT_H */
|