diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-05-18 19:44:35 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-05-18 19:44:35 +0000 |
| commit | 07d1e9ae5f0da65427ac52f065b173d340d70d6d (patch) | |
| tree | cb0bde9e1f55f440962b107ca056027befc0ba0f /hw/xfree86/dri/dri.h | |
| parent | b87a32fb0eafa6d5f12a6faa634662c71fdc97fa (diff) | |
Bug #3066: Promote frameBufferPhysicalAddress to pointer from CARD32; bump
DRIINFO version to match. Fix various pointer printfs in libdri to be
64-bit aware. Silence a warning about redefining noXFree86DRIExtension.
(Jesse Barnes)
Diffstat (limited to 'hw/xfree86/dri/dri.h')
| -rw-r--r-- | hw/xfree86/dri/dri.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h index 82d3c0d52..bfb0d64a8 100644 --- a/hw/xfree86/dri/dri.h +++ b/hw/xfree86/dri/dri.h @@ -104,10 +104,11 @@ typedef struct { * Revision history: * 4.1.0 and earlier: DRIQueryVersion returns XF86DRI_*_VERSION. * 4.2.0: DRIQueryVersion begins returning DRIINFO_*_VERSION. + * 5.0.0: frameBufferPhysicalAddress changed from CARD32 to pointer. */ -#define DRIINFO_MAJOR_VERSION 4 -#define DRIINFO_MINOR_VERSION 2 +#define DRIINFO_MAJOR_VERSION 5 +#define DRIINFO_MINOR_VERSION 0 #define DRIINFO_PATCH_VERSION 0 typedef struct { @@ -156,7 +157,7 @@ typedef struct { int ddxDriverMajorVersion; int ddxDriverMinorVersion; int ddxDriverPatchVersion; - CARD32 frameBufferPhysicalAddress; + pointer frameBufferPhysicalAddress; long frameBufferSize; long frameBufferStride; long SAREASize; |