diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:06 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:06 +0000 |
| commit | 7cfa3336b5db555bbc39ae32169160768e8f3e51 (patch) | |
| tree | 51bbdbcf3ef90aa98bb91b8ed83022ff2b3aa5c3 | |
| parent | eed638e2cb838bab10c3a0f3aac1143c6e12e57a (diff) | |
Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_2-MERGECYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGE
| -rw-r--r-- | src/ffb_dri.c | 12 | ||||
| -rw-r--r-- | src/ffb_drishare.h | 12 | ||||
| -rw-r--r-- | src/ffb_driver.c | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/ffb_dri.c b/src/ffb_dri.c index c5e624f..d6230e3 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 4cb8588..c439129 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; diff --git a/src/ffb_driver.c b/src/ffb_driver.c index e699eef..0c3d4ce 100644 --- a/src/ffb_driver.c +++ b/src/ffb_driver.c @@ -114,7 +114,7 @@ static XF86ModuleVersionInfo sunffbVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, FFB_MAJOR_VERSION, FFB_MINOR_VERSION, FFB_PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, |