GL/dri/dri.c | 12 ++++++------ GL/dri/dri.h | 2 +- hw/xfree86/drivers/ati/atidri.c | 4 ++-- hw/xfree86/drivers/ati/r128_dri.c | 4 ++-- hw/xfree86/drivers/ati/radeon_dri.c | 4 ++-- hw/xfree86/drivers/glint/glint_dri.c | 4 ++-- hw/xfree86/drivers/i810/i810_dri.c | 4 ++-- hw/xfree86/drivers/i810/i830_dri.c | 4 ++-- hw/xfree86/drivers/mga/mga_dri.c | 4 ++-- hw/xfree86/drivers/savage/savage_dri.c | 4 ++-- hw/xfree86/drivers/sis/sis_dri.c | 4 ++-- hw/xfree86/drivers/sunffb/ffb_dri.c | 4 ++-- hw/xfree86/drivers/tdfx/tdfx_dri.c | 4 ++-- hw/xfree86/drivers/via/via_dri.c | 4 ++-- 14 files changed, 31 insertions(+), 31 deletions(-) Index: programs/Xserver/GL/dri/dri.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/GL/dri/dri.c,v retrieving revision 1.8 diff -u -d -r1.8 dri.c --- programs/Xserver/GL/dri/dri.c 20 Apr 2005 12:25:12 -0000 1.8 +++ programs/Xserver/GL/dri/dri.c 23 Apr 2005 20:35:32 -0000 @@ -284,7 +284,7 @@ return FALSE; } DRIDrvMsg(pScreen->myNum, X_INFO, - "[drm] added %d byte SAREA at 0x%08lx\n", + "[drm] added %d byte SAREA at %p\n", pDRIPriv->pDriverInfo->SAREASize, pDRIPriv->hSAREA); if (drmMap( pDRIPriv->drmFD, @@ -300,7 +300,7 @@ return FALSE; } memset(pDRIPriv->pSAREA, 0, pDRIPriv->pDriverInfo->SAREASize); - DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] mapped SAREA 0x%08lx to %p\n", + DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] mapped SAREA %p to %p\n", pDRIPriv->hSAREA, pDRIPriv->pSAREA); if (drmAddMap( pDRIPriv->drmFD, @@ -318,7 +318,7 @@ "[drm] drmAddMap failed\n"); return FALSE; } - DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] framebuffer handle = 0x%08lx\n", + DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] framebuffer handle = %p\n", pDRIPriv->hFrameBuffer); /* Add tags for reserved contexts */ @@ -381,7 +381,7 @@ pDRIPriv->myContextPriv = pDRIContextPriv; DRIDrvMsg(pScreen->myNum, X_INFO, - "X context handle = 0x%08lx\n", pDRIPriv->myContext); + "X context handle = %p\n", pDRIPriv->myContext); /* Now that we have created the X server's context, we can grab the * hardware lock for the X server. @@ -565,14 +565,14 @@ drmUnlock(pDRIPriv->drmFD, pDRIPriv->myContext); lockRefCount=0; DRIDrvMsg(pScreen->myNum, X_INFO, - "[drm] unmapping %d bytes of SAREA 0x%08lx at %p\n", + "[drm] unmapping %d bytes of SAREA %p at %p\n", pDRIInfo->SAREASize, pDRIPriv->hSAREA, pDRIPriv->pSAREA); if (drmUnmap(pDRIPriv->pSAREA, pDRIInfo->SAREASize)) { DRIDrvMsg(pScreen->myNum, X_ERROR, "[drm] unable to unmap %d bytes" - " of SAREA 0x%08lx at %p\n", + " of SAREA %p at %p\n", pDRIInfo->SAREASize, pDRIPriv->hSAREA, pDRIPriv->pSAREA); Index: programs/Xserver/GL/dri/dri.h =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/GL/dri/dri.h,v retrieving revision 1.3 diff -u -d -r1.3 dri.h --- programs/Xserver/GL/dri/dri.h 16 Jun 2004 09:37:58 -0000 1.3 +++ programs/Xserver/GL/dri/dri.h 23 Apr 2005 20:35:32 -0000 @@ -141,7 +141,7 @@ int ddxDriverMajorVersion; int ddxDriverMinorVersion; int ddxDriverPatchVersion; - CARD32 frameBufferPhysicalAddress; + pointer frameBufferPhysicalAddress; long frameBufferSize; long frameBufferStride; long SAREASize; Index: programs/Xserver/hw/xfree86/drivers/ati/atidri.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/atidri.c,v retrieving revision 1.2 diff -u -d -r1.2 atidri.c --- programs/Xserver/hw/xfree86/drivers/ati/atidri.c 19 Dec 2004 06:56:37 -0000 1.2 +++ programs/Xserver/hw/xfree86/drivers/ati/atidri.c 23 Apr 2005 20:35:34 -0000 @@ -1094,10 +1094,10 @@ /* Check the DRI version */ DRIQueryVersion( &major, &minor, &patch ); - if ( major != 4 || minor < 0 ) { + if ( major != 5 || minor < 0 ) { xf86DrvMsg( pScreen->myNum, X_ERROR, "[dri] ATIDRIScreenInit failed because of a version mismatch.\n" - "[dri] libDRI version is %d.%d.%d but version 4.0.x is needed.\n" + "[dri] libDRI version is %d.%d.%d but version 5.0.x is needed.\n" "[dri] Disabling the DRI.\n", major, minor, patch ); return FALSE; Index: programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c,v retrieving revision 1.5 diff -u -d -r1.5 r128_dri.c --- programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c 4 Dec 2004 22:34:54 -0000 1.5 +++ programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c 23 Apr 2005 20:35:34 -0000 @@ -983,10 +983,10 @@ /* Check the DRI version */ DRIQueryVersion(&major, &minor, &patch); - if (major != 4 || minor < 0) { + if (major != 5 || minor < 0) { xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] R128DRIScreenInit failed because of a version mismatch.\n" - "[dri] libDRI version is %d.%d.%d but version 4.0.x is needed.\n" + "[dri] libDRI version is %d.%d.%d but version 5.0.x is needed.\n" "[dri] Disabling the DRI.\n", major, minor, patch); return FALSE; Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c,v retrieving revision 1.16 diff -u -d -r1.16 radeon_dri.c --- programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c 24 Mar 2005 06:45:51 -0000 1.16 +++ programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c 23 Apr 2005 20:35:35 -0000 @@ -1211,11 +1211,11 @@ /* Check the DRI version */ DRIQueryVersion(&major, &minor, &patch); - if (major != 4 || minor < 0) { + if (major != 5 || minor < 0) { xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] RADEONDRIScreenInit failed because of a version " "mismatch.\n" - "[dri] libDRI version is %d.%d.%d but version 4.0.x is " + "[dri] libDRI version is %d.%d.%d but version 5.0.x is " "needed.\n" "[dri] Disabling DRI.\n", major, minor, patch); Index: programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c,v retrieving revision 1.3 diff -u -d -r1.3 glint_dri.c --- programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c 16 Jun 2004 09:43:59 -0000 1.3 +++ programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c 23 Apr 2005 20:35:35 -0000 @@ -458,10 +458,10 @@ { int major, minor, patch; DRIQueryVersion(&major, &minor, &patch); - if (major != 4 || minor < 0) { + if (major != 5 || minor < 0) { xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] GLINTDRIScreenInit failed because of a version mismatch.\n" - "[dri] libDRI version is %d.%d.%d but version 4.0.x is needed.\n" + "[dri] libDRI version is %d.%d.%d but version 5.0.x is needed.\n" "[dri] Disabling DRI.\n", major, minor, patch); return FALSE; Index: programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c,v retrieving revision 1.6 diff -u -d -r1.6 i810_dri.c --- programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c 24 Jan 2005 15:02:17 -0000 1.6 +++ programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c 23 Apr 2005 20:35:36 -0000 @@ -319,10 +319,10 @@ int major, minor, patch; DRIQueryVersion(&major, &minor, &patch); - if (major != 4 || minor < 0) { + if (major != 5 || minor < 0) { xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] I810DRIScreenInit failed because of a version mismatch.\n" - "[dri] libDRI version is %d.%d.%d bug version 4.0.x is needed.\n" + "[dri] libDRI version is %d.%d.%d but version 5.0.x is needed.\n" "[dri] Disabling DRI.\n", major, minor, patch); return FALSE; } Index: programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c,v retrieving revision 1.7 diff -u -d -r1.7 i830_dri.c --- programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c 1 Feb 2005 19:47:32 -0000 1.7 +++ programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c 23 Apr 2005 20:35:36 -0000 @@ -438,10 +438,10 @@ int major, minor, patch; DRIQueryVersion(&major, &minor, &patch); - if (major != 4 || minor < 0) { + if (major != 5 || minor < 0) { xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] %s failed because of a version mismatch.\n" - "[dri] libDRI version is %d.%d.%d bug version 4.0.x is needed.\n" + "[dri] libDRI version is %d.%d.%d but version 5.0.x is needed.\n" "[dri] Disabling DRI.\n", "I830DRIScreenInit", major, minor, patch); return FALSE; Index: programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c,v retrieving revision 1.4 diff -u -d -r1.4 mga_dri.c --- programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c 26 Jul 2004 23:14:37 -0000 1.4 +++ programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c 23 Apr 2005 20:35:36 -0000 @@ -1012,10 +1012,10 @@ { int major, minor, patch; DRIQueryVersion( &major, &minor, &patch ); - if ( major != 4 || minor < 0 ) { + if ( major != 5 || minor < 0 ) { xf86DrvMsg( pScreen->myNum, X_ERROR, "[dri] MGADRIScreenInit failed because of a version mismatch.\n" - "[dri] libDRI version = %d.%d.%d but version 4.0.x is needed.\n" + "[dri] libDRI version = %d.%d.%d but version 5.0.x is needed.\n" "[dri] Disabling the DRI.\n", major, minor, patch ); return FALSE; Index: programs/Xserver/hw/xfree86/drivers/savage/savage_dri.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dri.c,v retrieving revision 1.19 diff -u -d -r1.19 savage_dri.c --- programs/Xserver/hw/xfree86/drivers/savage/savage_dri.c 17 Mar 2005 00:04:19 -0000 1.19 +++ programs/Xserver/hw/xfree86/drivers/savage/savage_dri.c 23 Apr 2005 20:35:36 -0000 @@ -834,10 +834,10 @@ { int major, minor, patch; DRIQueryVersion( &major, &minor, &patch ); - if ( major != 4 || minor < 0 ) { + if ( major != 5 || minor < 0 ) { xf86DrvMsg( pScreen->myNum, X_ERROR, "[dri] SAVAGEDRIScreenInit failed because of a version mismatch.\n" - "[dri] libDRI version = %d.%d.%d but version 4.0.x is needed.\n" + "[dri] libDRI version = %d.%d.%d but version 5.0.x is needed.\n" "[dri] Disabling the DRI.\n", major, minor, patch ); return FALSE; Index: programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c,v retrieving revision 1.14 diff -u -d -r1.14 sis_dri.c --- programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c 21 Apr 2005 21:30:56 -0000 1.14 +++ programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c 23 Apr 2005 20:35:36 -0000 @@ -271,10 +271,10 @@ { int major, minor, patch; DRIQueryVersion(&major, &minor, &patch); - if(major != 4 || minor < 0) { + if(major != 5 || minor < 0) { xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] SISDRIScreenInit failed because of a version mismatch.\n" - "\t[dri] libDRI version is %d.%d.%d but version 4.0.x is needed.\n" + "\t[dri] libDRI version is %d.%d.%d but version 5.0.x is needed.\n" "\t[dri] Disabling DRI.\n", major, minor, patch); return FALSE; Index: programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c,v retrieving revision 1.3 diff -u -d -r1.3 ffb_dri.c --- programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c 16 Jun 2004 09:44:00 -0000 1.3 +++ programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c 23 Apr 2005 20:35:36 -0000 @@ -219,10 +219,10 @@ { int major, minor, patch; DRIQueryVersion(&major, &minor, &patch); - if (major != 4 || minor < 0) { + if (major != 5 || minor < 0) { xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] FFBDRIScreenInit failed because of a version mismatch.\n" - "[dri] libDRI version is %d.%d.%d but version, 4.0.x is needed.\n" + "[dri] libDRI version is %d.%d.%d but version 5.0.x is needed.\n" "[dri] Disabling DRI.\n", major, minor, patch); return FALSE; Index: programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c,v retrieving revision 1.3 diff -u -d -r1.3 tdfx_dri.c --- programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c 16 Jun 2004 09:44:00 -0000 1.3 +++ programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c 23 Apr 2005 20:35:37 -0000 @@ -308,10 +308,10 @@ { int major, minor, patch; DRIQueryVersion(&major, &minor, &patch); - if (major != 4 || minor < 0) { + if (major != 5 || minor < 0) { xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] TDFXDRIScreenInit failed because of a version mismatch.\n" - "[dri] libDRI version is %d.%d.%d but version 4.0.x is needed.\n" + "[dri] libDRI version is %d.%d.%d but version 5.0.x is needed.\n" "[dri] Disabling the DRI.\n", major, minor, patch); return FALSE; Index: programs/Xserver/hw/xfree86/drivers/via/via_dri.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/via/via_dri.c,v retrieving revision 1.12 diff -u -d -r1.12 via_dri.c --- programs/Xserver/hw/xfree86/drivers/via/via_dri.c 6 Feb 2005 07:12:43 -0000 1.12 +++ programs/Xserver/hw/xfree86/drivers/via/via_dri.c 23 Apr 2005 20:35:37 -0000 @@ -560,10 +560,10 @@ { int major, minor, patch; DRIQueryVersion(&major, &minor, &patch); - if (major != 4 || minor < 0) { + if (major != 5 || minor < 0) { xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] VIADRIScreenInit failed because of a version mismatch.\n" - "[dri] libDRI version is %d.%d.%d but version 4.0.x is needed.\n" + "[dri] libDRI version is %d.%d.%d but version 5.0.x is needed.\n" "[dri] Disabling DRI.\n", major, minor, patch); return FALSE;