diff options
author | marha <marha@users.sourceforge.net> | 2012-04-16 09:17:34 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-04-16 09:17:34 +0200 |
commit | d6d3999ccb2cb72d55820770260172eccbbb68d7 (patch) | |
tree | 568ce82dd1a8e2edbbe8cd4cb5ab5b14157f34f6 /xorg-server/hw/xfree86/dri | |
parent | fffd436e9c2ec6f5aa501ee57d0e4ade7293ee60 (diff) | |
download | vcxsrv-d6d3999ccb2cb72d55820770260172eccbbb68d7.tar.gz vcxsrv-d6d3999ccb2cb72d55820770260172eccbbb68d7.tar.bz2 vcxsrv-d6d3999ccb2cb72d55820770260172eccbbb68d7.zip |
libX11 xserver pixman mesa git update 16 Apr 2012
Diffstat (limited to 'xorg-server/hw/xfree86/dri')
-rw-r--r-- | xorg-server/hw/xfree86/dri/sarea.h | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/xorg-server/hw/xfree86/dri/sarea.h b/xorg-server/hw/xfree86/dri/sarea.h index 1528cc191..7a55b49d6 100644 --- a/xorg-server/hw/xfree86/dri/sarea.h +++ b/xorg-server/hw/xfree86/dri/sarea.h @@ -33,7 +33,6 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - #ifndef _SAREA_H_ #define _SAREA_H_ @@ -43,7 +42,7 @@ #if defined(__alpha__) #define SAREA_MAX 0x2000 #elif defined(__ia64__) -#define SAREA_MAX 0x10000 /* 64kB */ +#define SAREA_MAX 0x10000 /* 64kB */ #else /* Intel 830M driver needs at least 8k SAREA */ #define SAREA_MAX 0x2000 @@ -59,8 +58,8 @@ * \sa _XF86DRISAREA. */ typedef struct _XF86DRISAREADrawable { - unsigned int stamp; - unsigned int flags; + unsigned int stamp; + unsigned int flags; } XF86DRISAREADrawableRec, *XF86DRISAREADrawablePtr; /** @@ -69,11 +68,11 @@ typedef struct _XF86DRISAREADrawable { * \sa _XF86DRISAREA. */ typedef struct _XF86DRISAREAFrame { - unsigned int x; - unsigned int y; - unsigned int width; - unsigned int height; - unsigned int fullscreen; + unsigned int x; + unsigned int y; + unsigned int width; + unsigned int height; + unsigned int fullscreen; } XF86DRISAREAFrameRec, *XF86DRISAREAFramePtr; /** @@ -81,17 +80,17 @@ typedef struct _XF86DRISAREAFrame { */ typedef struct _XF86DRISAREA { /** first thing is always the DRM locking structure */ - drmLock lock; + drmLock lock; /** \todo Use readers/writer lock for drawable_lock */ - drmLock drawable_lock; - XF86DRISAREADrawableRec drawableTable[SAREA_MAX_DRAWABLES]; - XF86DRISAREAFrameRec frame; - drm_context_t dummy_context; + drmLock drawable_lock; + XF86DRISAREADrawableRec drawableTable[SAREA_MAX_DRAWABLES]; + XF86DRISAREAFrameRec frame; + drm_context_t dummy_context; } XF86DRISAREARec, *XF86DRISAREAPtr; -typedef struct _XF86DRILSAREA { - drmLock lock; - drmLock otherLocks[31]; +typedef struct _XF86DRILSAREA { + drmLock lock; + drmLock otherLocks[31]; } XF86DRILSAREARec, *XF86DRILSAREAPtr; #endif |