DRI trunk-20040613 importDRI-trunk-20040721DRI-trunk-20040613

2 files changed, 12 insertions, 12 deletions

diff --git a/src/ffb_dri.c b/src/ffb_dri.c
index 334bdfd..b905216 100644
--- a/src/ffb_dri.c
+++ b/src/ffb_dri.c
@@ -57,9 +57,9 @@ static char FFBKernelDriverName[] = "ffb";
 static char FFBClientDriverName[] = "ffb";
 
 /* Forward declarations. */
-static Bool FFBDRICreateContext(ScreenPtr, VisualPtr, drmContext,
+static Bool FFBDRICreateContext(ScreenPtr, VisualPtr, drm_context_t,
 				void *, DRIContextType);
-static void FFBDRIDestroyContext(ScreenPtr, drmContext, DRIContextType);
+static void FFBDRIDestroyContext(ScreenPtr, drm_context_t, DRIContextType);
 
 static void FFBDRIInitBuffers(WindowPtr, RegionPtr, CARD32);
 static void FFBDRIMoveBuffers(WindowPtr, DDXPointRec, RegionPtr, CARD32);
@@ -123,8 +123,8 @@ FFBDRIInitVisualConfigs(ScreenPtr pScreen)
 	pConfigs->stencilSize = 0;
 	pConfigs->auxBuffers = 0;
 	pConfigs->level = 0;
-	pConfigs->visualRating = 0;
-	pConfigs->transparentPixel = 0;
+	pConfigs->visualRating = GLX_NONE;
+	pConfigs->transparentPixel = GLX_NONE;
 	pConfigs->transparentRed = 0;
 	pConfigs->transparentGreen = 0;
 	pConfigs->transparentBlue = 0;
@@ -416,7 +416,7 @@ FFBDRICloseScreen(ScreenPtr pScreen)
 }
 
 static Bool
-FFBDRICreateContext(ScreenPtr pScreen, VisualPtr visual, drmContext hwContext,
+FFBDRICreateContext(ScreenPtr pScreen, VisualPtr visual, drm_context_t hwContext,
 		 void *pVisualConfigPriv, DRIContextType context)
 {
 	/* Nothing to do... */
@@ -424,7 +424,7 @@ FFBDRICreateContext(ScreenPtr pScreen, VisualPtr visual, drmContext hwContext,
 }
 
 static void
-FFBDRIDestroyContext(ScreenPtr pScreen, drmContext hwContext, DRIContextType context)
+FFBDRIDestroyContext(ScreenPtr pScreen, drm_context_t hwContext, DRIContextType context)
 {
 	/* Nothing to do... */
 }
diff --git a/src/ffb_drishare.h b/src/ffb_drishare.h
index 501dd5b..f023920 100644
--- a/src/ffb_drishare.h
+++ b/src/ffb_drishare.h
@@ -16,26 +16,26 @@ typedef struct ffb_dri_state {
 } ffb_dri_state_t;
 
 #define FFB_DRISHARE(SAREA)	\
-	((ffb_dri_state_t *) (((char *)(SAREA)) + sizeof(XF86DRISAREARec)))
+	((ffb_dri_state_t *) (((char *)(SAREA)) + sizeof(drm_sarea_t)))
 
 typedef struct {
-	drmHandle	hFbcRegs;
+	drm_handle_t	hFbcRegs;
 	drmSize		sFbcRegs;
 	drmAddress	mFbcRegs;
 
-	drmHandle	hDacRegs;
+	drm_handle_t	hDacRegs;
 	drmSize		sDacRegs;
 	drmAddress	mDacRegs;
 
-	drmHandle	hSfb8r;
+	drm_handle_t	hSfb8r;
 	drmSize		sSfb8r;
 	drmAddress	mSfb8r;
 
-	drmHandle	hSfb32;
+	drm_handle_t	hSfb32;
 	drmSize		sSfb32;
 	drmAddress	mSfb32;
 
-	drmHandle	hSfb64;
+	drm_handle_t	hSfb64;
 	drmSize		sSfb64;
 	drmAddress	mSfb64;