From 550009441375e55bda3896eba7375b9228c7fdec Mon Sep 17 00:00:00 2001 From: Jon Smirl Date: Mon, 5 Jul 2004 23:42:02 +0000 Subject: Convert miniglx to use Ian's fancy new driver config code. This removes the miniglx driver function InitContextModes(). All of the server directories were edited to remove the implementations. --- src/mesa/drivers/dri/i810/server/i810_dri.c | 35 ---------------- src/mesa/drivers/dri/i915/intel_ioctl.c | 1 + src/mesa/drivers/dri/mga/server/mga_dri.c | 45 --------------------- src/mesa/drivers/dri/r128/server/r128_dri.c | 44 -------------------- src/mesa/drivers/dri/radeon/server/radeon_dri.c | 45 --------------------- src/mesa/drivers/dri/tdfx/server/tdfx_dri.c | 54 ------------------------- src/mesa/drivers/dri/unichrome/server/via_dri.c | 34 ---------------- 7 files changed, 1 insertion(+), 257 deletions(-) (limited to 'src/mesa/drivers/dri') diff --git a/src/mesa/drivers/dri/i810/server/i810_dri.c b/src/mesa/drivers/dri/i810/server/i810_dri.c index d1bd4b6a89c..2f3dfa159d2 100644 --- a/src/mesa/drivers/dri/i810/server/i810_dri.c +++ b/src/mesa/drivers/dri/i810/server/i810_dri.c @@ -861,40 +861,6 @@ static int I810ScreenInit( DRIDriverContext *ctx, I810Ptr info ) } -/** - * \brief Establish the set of modes available for the display. - * - * \param ctx display handle. - * \param numModes will receive the number of supported modes. - * \param modes will point to the list of supported modes. - * - * \return one on success, or zero on failure. - * - * Allocates a single visual and fills it with information according to the - * display bit depth. Supports only 16 and 32 bpp bit depths, aborting - * otherwise. - */ -const __GLcontextModes __glModes[] = { - - /* 16 bit, RGB Depth=16 */ - {.rgbMode = GL_TRUE, .colorIndexMode = GL_FALSE, .doubleBufferMode = GL_TRUE, .stereoMode = GL_FALSE, - .haveAccumBuffer = GL_FALSE, .haveDepthBuffer = GL_TRUE, .haveStencilBuffer = GL_FALSE, - .redBits = 5, .greenBits = 6, .blueBits = 5, .alphaBits = 0, - .redMask = 0xf800, .greenMask = 0x07e0, .blueMask = 0x001f, .alphaMask = 0x0, - .rgbBits = 16, .indexBits = 0, - .accumRedBits = 0, .accumGreenBits = 0, .accumBlueBits = 0, .accumAlphaBits = 0, - .depthBits = 16, .stencilBits = 0, - .numAuxBuffers= 0, .level = 0, .pixmapMode = GL_FALSE, }, -}; -static int i810InitContextModes( const DRIDriverContext *ctx, - int *numModes, const __GLcontextModes **modes) -{ - *numModes = sizeof(__glModes)/sizeof(__GLcontextModes *); - *modes = &__glModes[0]; - return 1; -} - - /** * \brief Validate the fbdev mode. * @@ -1005,7 +971,6 @@ extern void i810NotifyFocus( int ); * \sa DRIDriverRec. */ const struct DRIDriverRec __driDriver = { - i810InitContextModes, i810ValidateMode, i810PostValidateMode, i810InitFBDev, diff --git a/src/mesa/drivers/dri/i915/intel_ioctl.c b/src/mesa/drivers/dri/i915/intel_ioctl.c index dec0166605b..db6d2cd2dda 100644 --- a/src/mesa/drivers/dri/i915/intel_ioctl.c +++ b/src/mesa/drivers/dri/i915/intel_ioctl.c @@ -29,6 +29,7 @@ #include #include #include +#include #include "mtypes.h" #include "context.h" diff --git a/src/mesa/drivers/dri/mga/server/mga_dri.c b/src/mesa/drivers/dri/mga/server/mga_dri.c index 896bb56ccec..958252b3e47 100644 --- a/src/mesa/drivers/dri/mga/server/mga_dri.c +++ b/src/mesa/drivers/dri/mga/server/mga_dri.c @@ -876,50 +876,6 @@ static int MGAScreenInit( struct DRIDriverContextRec *ctx, MGAPtr pMga ) } -/** - * \brief Establish the set of modes available for the display. - * - * \param ctx display handle. - * \param numModes will receive the number of supported modes. - * \param modes will point to the list of supported modes. - * - * \return one on success, or zero on failure. - * - * Allocates a single visual and fills it with information according to the - * display bit depth. Supports only 16 and 32 bpp bit depths, aborting - * otherwise. - */ -const __GLcontextModes __glModes[] = { - - /* 32 bit, RGBA Depth=24 Stencil=8 */ - {.rgbMode = GL_TRUE, .colorIndexMode = GL_FALSE, .doubleBufferMode = GL_TRUE, .stereoMode = GL_FALSE, - .haveAccumBuffer = GL_FALSE, .haveDepthBuffer = GL_TRUE, .haveStencilBuffer = GL_TRUE, - .redBits = 8, .greenBits = 8, .blueBits = 8, .alphaBits = 8, - .redMask = 0xff0000, .greenMask = 0xff00, .blueMask = 0xff, .alphaMask = 0xff000000, - .rgbBits = 32, .indexBits = 0, - .accumRedBits = 0, .accumGreenBits = 0, .accumBlueBits = 0, .accumAlphaBits = 0, - .depthBits = 24, .stencilBits = 8, - .numAuxBuffers= 0, .level = 0, .pixmapMode = GL_FALSE, }, - - /* 16 bit, RGB Depth=16 */ - {.rgbMode = GL_TRUE, .colorIndexMode = GL_FALSE, .doubleBufferMode = GL_TRUE, .stereoMode = GL_FALSE, - .haveAccumBuffer = GL_FALSE, .haveDepthBuffer = GL_TRUE, .haveStencilBuffer = GL_FALSE, - .redBits = 5, .greenBits = 6, .blueBits = 5, .alphaBits = 0, - .redMask = 0xf800, .greenMask = 0x07e0, .blueMask = 0x001f, .alphaMask = 0x0, - .rgbBits = 16, .indexBits = 0, - .accumRedBits = 0, .accumGreenBits = 0, .accumBlueBits = 0, .accumAlphaBits = 0, - .depthBits = 16, .stencilBits = 0, - .numAuxBuffers= 0, .level = 0, .pixmapMode = GL_FALSE, }, -}; -static int mgaInitContextModes( const DRIDriverContext *ctx, - int *numModes, const __GLcontextModes **modes) -{ - *numModes = sizeof(__glModes)/sizeof(__GLcontextModes *); - *modes = &__glModes[0]; - return 1; -} - - /** * \brief Validate the fbdev mode. * @@ -1043,7 +999,6 @@ static int mgaEngineRestore( const DRIDriverContext *ctx ) * \sa DRIDriverRec. */ struct DRIDriverRec __driDriver = { - mgaInitContextModes, mgaValidateMode, mgaPostValidateMode, mgaInitFBDev, diff --git a/src/mesa/drivers/dri/r128/server/r128_dri.c b/src/mesa/drivers/dri/r128/server/r128_dri.c index fff2549aefb..1df8876fafd 100644 --- a/src/mesa/drivers/dri/r128/server/r128_dri.c +++ b/src/mesa/drivers/dri/r128/server/r128_dri.c @@ -66,49 +66,6 @@ # define DRM_PAGE_SIZE 4096 #endif -/** - * \brief Establish the set of modes available for the display. - * - * \param ctx display handle. - * \param numModes will receive the number of supported modes. - * \param modes will point to the list of supported modes. - * - * \return one on success, or zero on failure. - * - * Allocates a single visual and fills it with information according to the - * display bit depth. Supports only 16 and 32 bpp bit depths, aborting - * otherwise. - */ -const __GLcontextModes __glModes[] = { - - /* 32 bit, RGBA Depth=24 Stencil=8 */ - {.rgbMode = GL_TRUE, .colorIndexMode = GL_FALSE, .doubleBufferMode = GL_TRUE, .stereoMode = GL_FALSE, - .haveAccumBuffer = GL_FALSE, .haveDepthBuffer = GL_TRUE, .haveStencilBuffer = GL_TRUE, - .redBits = 8, .greenBits = 8, .blueBits = 8, .alphaBits = 8, - .redMask = 0xff0000, .greenMask = 0xff00, .blueMask = 0xff, .alphaMask = 0xff000000, - .rgbBits = 32, .indexBits = 0, - .accumRedBits = 0, .accumGreenBits = 0, .accumBlueBits = 0, .accumAlphaBits = 0, - .depthBits = 24, .stencilBits = 8, - .numAuxBuffers= 0, .level = 0, .pixmapMode = GL_FALSE, }, - - /* 16 bit, RGB Depth=16 */ - {.rgbMode = GL_TRUE, .colorIndexMode = GL_FALSE, .doubleBufferMode = GL_TRUE, .stereoMode = GL_FALSE, - .haveAccumBuffer = GL_FALSE, .haveDepthBuffer = GL_TRUE, .haveStencilBuffer = GL_FALSE, - .redBits = 5, .greenBits = 6, .blueBits = 5, .alphaBits = 0, - .redMask = 0xf800, .greenMask = 0x07e0, .blueMask = 0x001f, .alphaMask = 0x0, - .rgbBits = 16, .indexBits = 0, - .accumRedBits = 0, .accumGreenBits = 0, .accumBlueBits = 0, .accumAlphaBits = 0, - .depthBits = 16, .stencilBits = 0, - .numAuxBuffers= 0, .level = 0, .pixmapMode = GL_FALSE, }, -}; -static int R128InitContextModes( const DRIDriverContext *ctx, - int *numModes, const __GLcontextModes **modes) -{ - *numModes = sizeof(__glModes)/sizeof(__GLcontextModes *); - *modes = &__glModes[0]; - return 1; -} - /* Compute log base 2 of val. */ static int R128MinBits(int val) { @@ -1153,7 +1110,6 @@ static int R128EngineRestore( const DRIDriverContext *ctx ) * \sa DRIDriverRec. */ const struct DRIDriverRec __driDriver = { - R128InitContextModes, R128ValidateMode, R128PostValidateMode, R128InitFBDev, diff --git a/src/mesa/drivers/dri/radeon/server/radeon_dri.c b/src/mesa/drivers/dri/radeon/server/radeon_dri.c index b7e8026c5a3..5884624e22f 100644 --- a/src/mesa/drivers/dri/radeon/server/radeon_dri.c +++ b/src/mesa/drivers/dri/radeon/server/radeon_dri.c @@ -1027,50 +1027,6 @@ static int get_chipfamily_from_chipset( RADEONInfoPtr info ) } -/** - * \brief Establish the set of modes available for the display. - * - * \param ctx display handle. - * \param numModes will receive the number of supported modes. - * \param modes will point to the list of supported modes. - * - * \return one on success, or zero on failure. - * - * Allocates a single visual and fills it with information according to the - * display bit depth. Supports only 16 and 32 bpp bit depths, aborting - * otherwise. - */ -const __GLcontextModes __glModes[] = { - - /* 32 bit, RGBA Depth=24 Stencil=8 */ - {.rgbMode = GL_TRUE, .colorIndexMode = GL_FALSE, .doubleBufferMode = GL_TRUE, .stereoMode = GL_FALSE, - .haveAccumBuffer = GL_FALSE, .haveDepthBuffer = GL_TRUE, .haveStencilBuffer = GL_TRUE, - .redBits = 8, .greenBits = 8, .blueBits = 8, .alphaBits = 8, - .redMask = 0xff0000, .greenMask = 0xff00, .blueMask = 0xff, .alphaMask = 0xff000000, - .rgbBits = 32, .indexBits = 0, - .accumRedBits = 0, .accumGreenBits = 0, .accumBlueBits = 0, .accumAlphaBits = 0, - .depthBits = 24, .stencilBits = 8, - .numAuxBuffers= 0, .level = 0, .pixmapMode = GL_FALSE, }, - - /* 16 bit, RGB Depth=16 */ - {.rgbMode = GL_TRUE, .colorIndexMode = GL_FALSE, .doubleBufferMode = GL_TRUE, .stereoMode = GL_FALSE, - .haveAccumBuffer = GL_FALSE, .haveDepthBuffer = GL_TRUE, .haveStencilBuffer = GL_FALSE, - .redBits = 5, .greenBits = 6, .blueBits = 5, .alphaBits = 0, - .redMask = 0xf800, .greenMask = 0x07e0, .blueMask = 0x001f, .alphaMask = 0x0, - .rgbBits = 16, .indexBits = 0, - .accumRedBits = 0, .accumGreenBits = 0, .accumBlueBits = 0, .accumAlphaBits = 0, - .depthBits = 16, .stencilBits = 0, - .numAuxBuffers= 0, .level = 0, .pixmapMode = GL_FALSE, }, -}; -static int radeonInitContextModes( const DRIDriverContext *ctx, - int *numModes, const __GLcontextModes **modes) -{ - *numModes = sizeof(__glModes)/sizeof(__GLcontextModes *); - *modes = &__glModes[0]; - return 1; -} - - /** * \brief Validate the fbdev mode. * @@ -1204,7 +1160,6 @@ extern void radeonNotifyFocus( int ); * \sa DRIDriverRec. */ const struct DRIDriverRec __driDriver = { - radeonInitContextModes, radeonValidateMode, radeonPostValidateMode, radeonInitFBDev, diff --git a/src/mesa/drivers/dri/tdfx/server/tdfx_dri.c b/src/mesa/drivers/dri/tdfx/server/tdfx_dri.c index 8184f60361f..63fe875f59e 100644 --- a/src/mesa/drivers/dri/tdfx/server/tdfx_dri.c +++ b/src/mesa/drivers/dri/tdfx/server/tdfx_dri.c @@ -326,59 +326,6 @@ static int createScreen (DRIDriverContext *ctx, TDFXDRIPtr pTDFX) } -/** - * \brief Establish the set of modes available for the display. - * - * \param ctx display handle. - * \param numModes will receive the number of supported modes. - * \param modes will point to the list of supported modes. - * - * \return one on success, or zero on failure. - * - * Allocates a single visual and fills it with information according to the - * display bit depth. Supports only 16 and 32 bpp bit depths, aborting - * otherwise. - */ -const __GLcontextModes __glModes[] = { - - /* 32 bit, RGBA Depth=24 Stencil=8 */ - {.rgbMode = GL_TRUE, .colorIndexMode = GL_FALSE, .doubleBufferMode = GL_TRUE, .stereoMode = GL_FALSE, - .haveAccumBuffer = GL_FALSE, .haveDepthBuffer = GL_TRUE, .haveStencilBuffer = GL_TRUE, - .redBits = 8, .greenBits = 8, .blueBits = 8, .alphaBits = 8, - .redMask = 0xff0000, .greenMask = 0xff00, .blueMask = 0xff, .alphaMask = 0xff000000, - .rgbBits = 32, .indexBits = 0, - .accumRedBits = 0, .accumGreenBits = 0, .accumBlueBits = 0, .accumAlphaBits = 0, - .depthBits = 24, .stencilBits = 8, - .numAuxBuffers= 0, .level = 0, .pixmapMode = GL_FALSE, }, - - /* 16 bit, RGB Depth=16 */ - {.rgbMode = GL_TRUE, .colorIndexMode = GL_FALSE, .doubleBufferMode = GL_TRUE, .stereoMode = GL_FALSE, - .haveAccumBuffer = GL_FALSE, .haveDepthBuffer = GL_TRUE, .haveStencilBuffer = GL_FALSE, - .redBits = 5, .greenBits = 6, .blueBits = 5, .alphaBits = 0, - .redMask = 0xf800, .greenMask = 0x07e0, .blueMask = 0x001f, .alphaMask = 0x0, - .rgbBits = 16, .indexBits = 0, - .accumRedBits = 0, .accumGreenBits = 0, .accumBlueBits = 0, .accumAlphaBits = 0, - .depthBits = 16, .stencilBits = 0, - .numAuxBuffers= 0, .level = 0, .pixmapMode = GL_FALSE, }, -}; -static int tdfxInitContextModes( const DRIDriverContext *ctx, - int *numModes, const __GLcontextModes **modes) -{ - int n = sizeof(__glModes)/sizeof(__glModes[0]); - const __GLcontextModes *m = &__glModes[0]; - - if (ctx->chipset < PCI_CHIP_VOODOO4) { - n /= 2; - m += n; - } - - *numModes = n; - *modes = m; - - return 1; -} - - /** * \brief Validate the fbdev mode. * @@ -514,7 +461,6 @@ static int tdfxEngineRestore( const DRIDriverContext *ctx ) * \sa DRIDriverRec. */ struct DRIDriverRec __driDriver = { - tdfxInitContextModes, tdfxValidateMode, tdfxPostValidateMode, tdfxInitFBDev, diff --git a/src/mesa/drivers/dri/unichrome/server/via_dri.c b/src/mesa/drivers/dri/unichrome/server/via_dri.c index 4718935da5b..92c97003709 100644 --- a/src/mesa/drivers/dri/unichrome/server/via_dri.c +++ b/src/mesa/drivers/dri/unichrome/server/via_dri.c @@ -407,39 +407,6 @@ static int VIADRIMapInit(DRIDriverContext * ctx, VIAPtr pVia) return GL_TRUE; } -const __GLcontextModes __glModes[] = -{ - /* 32 bit, RGBA Depth=16 Stencil=8 */ - {.rgbMode = GL_TRUE, .colorIndexMode = GL_FALSE, .doubleBufferMode = GL_TRUE, .stereoMode = GL_FALSE, - .haveAccumBuffer = GL_FALSE, .haveDepthBuffer = GL_TRUE, .haveStencilBuffer = GL_TRUE, - .redBits = 8, .greenBits = 8, .blueBits = 8, .alphaBits = 8, - .redMask = 0xff0000, .greenMask = 0xff00, .blueMask = 0xff, .alphaMask = 0xff000000, - .rgbBits = 32, .indexBits = 0, - .accumRedBits = 0, .accumGreenBits = 0, .accumBlueBits = 0, .accumAlphaBits = 0, - .depthBits = 16, .stencilBits = 8, - .numAuxBuffers= 0, .level = 0, .pixmapMode = GL_TRUE, }, - -#if 0 - /* 16 bit, RGB Depth=16 */ - {.rgbMode = GL_TRUE, .colorIndexMode = GL_FALSE, .doubleBufferMode = GL_TRUE, .stereoMode = GL_FALSE, - .haveAccumBuffer = GL_FALSE, .haveDepthBuffer = GL_TRUE, .haveStencilBuffer = GL_FALSE, - .redBits = 5, .greenBits = 6, .blueBits = 5, .alphaBits = 0, - .redMask = 0xf800, .greenMask = 0x07e0, .blueMask = 0x001f, .alphaMask = 0x0, - .rgbBits = 16, .indexBits = 0, - .accumRedBits = 0, .accumGreenBits = 0, .accumBlueBits = 0, .accumAlphaBits = 0, - .depthBits = 16, .stencilBits = 0, - .numAuxBuffers= 0, .level = 0, .pixmapMode = GL_TRUE, }, -#endif -}; - -static int viaInitContextModes(const DRIDriverContext *ctx, - int *numModes, const __GLcontextModes **modes) -{ - *numModes = sizeof(__glModes)/sizeof(__glModes[0]); - *modes = &__glModes[0]; - return 1; -} - static int viaValidateMode(const DRIDriverContext *ctx) { VIAPtr pVia = VIAPTR(ctx); @@ -1134,7 +1101,6 @@ static int viaEngineRestore(const DRIDriverContext *ctx) const struct DRIDriverRec __driDriver = { - viaInitContextModes, viaValidateMode, viaPostValidateMode, viaInitFBDev, -- cgit v1.2.3