Add Egberts fixes for 64bit architectures

Add additional checks for the *DRIRec info structure passed in from the
device driver. This ensures that things fallback to indirect rendering if
the DDX driver has had modifications (i.e. removal of the drmAddress field).

2 files changed, 7 insertions, 6 deletions

diff --git a/src/mesa/drivers/dri/ffb/ffb_xmesa.c b/src/mesa/drivers/dri/ffb/ffb_xmesa.c
index e260e1de24b..5b50d24d9e3 100644
--- a/src/mesa/drivers/dri/ffb/ffb_xmesa.c
+++ b/src/mesa/drivers/dri/ffb/ffb_xmesa.c
@@ -68,6 +68,12 @@ ffbInitDriver(__DRIscreenPrivate *sPriv)
 	if (getenv("LIBGL_FORCE_XSERVER"))
 		return GL_FALSE;
 
+
+   	if (sPriv->devPrivSize != sizeof(FFBDRIRec)) {
+      		fprintf(stderr,"\nERROR!  sizeof(FFBDRIRec) does not match passed size from device driver\n");
+      		return GL_FALSE;
+   	}
+
 	/* Allocate the private area. */
 	ffbScreen = (ffbScreenPrivate *) MALLOC(sizeof(ffbScreenPrivate));
 	if (!ffbScreen)
@@ -721,7 +727,7 @@ void * __driCreateNewScreen_20050727( __DRInativeDisplay *dpy, int scrn, __DRIsc
 			     
 {
    __DRIscreenPrivate *psp;
-   static const __DRIversion ddx_expected = { 0, 0, 1 };
+   static const __DRIversion ddx_expected = { 0, 1, 1 };
    static const __DRIversion dri_expected = { 4, 0, 0 };
    static const __DRIversion drm_expected = { 0, 0, 1 };
 
diff --git a/src/mesa/drivers/dri/ffb/server/ffb_drishare.h b/src/mesa/drivers/dri/ffb/server/ffb_drishare.h
index f023920a1fc..baf2f0d0a65 100644
--- a/src/mesa/drivers/dri/ffb/server/ffb_drishare.h
+++ b/src/mesa/drivers/dri/ffb/server/ffb_drishare.h
@@ -21,23 +21,18 @@ typedef struct ffb_dri_state {
 typedef struct {
 	drm_handle_t	hFbcRegs;
 	drmSize		sFbcRegs;
-	drmAddress	mFbcRegs;
 
 	drm_handle_t	hDacRegs;
 	drmSize		sDacRegs;
-	drmAddress	mDacRegs;
 
 	drm_handle_t	hSfb8r;
 	drmSize		sSfb8r;
-	drmAddress	mSfb8r;
 
 	drm_handle_t	hSfb32;
 	drmSize		sSfb32;
-	drmAddress	mSfb32;
 
 	drm_handle_t	hSfb64;
 	drmSize		sSfb64;
-	drmAddress	mSfb64;
 
 	/* Fastfill/Pagefill parameters. */
 	unsigned char	disable_pagefill;