xf86-video-intel: configure.ac src/legacy/i810
Kristian Høgsberg
krh at kemper.freedesktop.org
Wed Jul 28 05:15:45 PDT 2010
configure.ac | 2
src/legacy/i810/i810_dri.c | 128 ---------------------------------------------
2 files changed, 2 insertions(+), 128 deletions(-)
New commits:
commit 938ef4eaec0e406e198105d866f6d2a1be5e0ef8
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Wed Jul 28 07:57:42 2010 -0400
legacy: Remove long gone use of GlxSetVisualConfigs()
This removes the last dependeny on anything GL/GLX in the driver.
diff --git a/configure.ac b/configure.ac
index d5989a6..2845702 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,7 +111,7 @@ CFLAGS="$save_CFLAGS $DEBUGFLAGS"
AM_CONDITIONAL(DRI, test x$DRI = xyes)
if test "$DRI" = yes; then
- PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
+ PKG_CHECK_MODULES(DRI, [xf86driproto])
AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
fi
diff --git a/src/legacy/i810/i810_dri.c b/src/legacy/i810/i810_dri.c
index ecb94af..3326c37 100644
--- a/src/legacy/i810/i810_dri.c
+++ b/src/legacy/i810/i810_dri.c
@@ -18,15 +18,12 @@
#include "shadow.h"
#include "shadowfb.h"
-#include "GL/glxtokens.h"
-
#include "i810.h"
#include "i810_dri.h"
static char I810KernelDriverName[] = "i810";
static char I810ClientDriverName[] = "i810";
-static Bool I810InitVisualConfigs(ScreenPtr pScreen);
static Bool I810CreateContext(ScreenPtr pScreen, VisualPtr visual,
drm_context_t hwContext, void *pVisualConfigPriv,
DRIContextType contextStore);
@@ -51,10 +48,6 @@ static void I810DRITransitionTo2d(ScreenPtr pScreen);
static void I810DRIRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
-extern void GlxSetVisualConfigs(int nconfigs,
- __GLXvisualConfig * configs,
- void **configprivs);
-
static int i810_pitches[] = {
512,
1024,
@@ -151,116 +144,6 @@ I810InitDma(ScrnInfoPtr pScrn)
return TRUE;
}
-static Bool
-I810InitVisualConfigs(ScreenPtr pScreen)
-{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- I810Ptr pI810 = I810PTR(pScrn);
- int numConfigs = 0;
- __GLXvisualConfig *pConfigs = NULL;
- I810ConfigPrivPtr pI810Configs = NULL;
- I810ConfigPrivPtr *pI810ConfigPtrs = NULL;
- int accum, stencil, db, depth;
- int i;
-
- switch (pScrn->bitsPerPixel) {
- case 8:
- case 24:
- case 32:
- break;
- case 16:
- numConfigs = 8;
-
- pConfigs =
- (__GLXvisualConfig *) calloc(sizeof(__GLXvisualConfig),
- numConfigs);
- if (!pConfigs)
- return FALSE;
-
- pI810Configs =
- (I810ConfigPrivPtr) calloc(sizeof(I810ConfigPrivRec),
- numConfigs);
- if (!pI810Configs) {
- free(pConfigs);
- return FALSE;
- }
-
- pI810ConfigPtrs =
- (I810ConfigPrivPtr *) calloc(sizeof(I810ConfigPrivPtr),
- numConfigs);
- if (!pI810ConfigPtrs) {
- free(pConfigs);
- free(pI810Configs);
- return FALSE;
- }
-
- for (i = 0; i < numConfigs; i++)
- pI810ConfigPtrs[i] = &pI810Configs[i];
-
- i = 0;
- depth = 1;
- for (accum = 0; accum <= 1; accum++) {
- for (stencil = 0; stencil <= 1; stencil++) {
- for (db = 1; db >= 0; db--) {
- pConfigs[i].vid = -1;
- pConfigs[i].class = -1;
- pConfigs[i].rgba = TRUE;
- pConfigs[i].redSize = 5;
- pConfigs[i].greenSize = 6;
- pConfigs[i].blueSize = 5;
- pConfigs[i].alphaSize = 0;
- pConfigs[i].redMask = 0x0000F800;
- pConfigs[i].greenMask = 0x000007E0;
- pConfigs[i].blueMask = 0x0000001F;
- pConfigs[i].alphaMask = 0;
- if (accum) {
- pConfigs[i].accumRedSize = 16;
- pConfigs[i].accumGreenSize = 16;
- pConfigs[i].accumBlueSize = 16;
- pConfigs[i].accumAlphaSize = 0;
- } else {
- pConfigs[i].accumRedSize = 0;
- pConfigs[i].accumGreenSize = 0;
- pConfigs[i].accumBlueSize = 0;
- pConfigs[i].accumAlphaSize = 0;
- }
- pConfigs[i].doubleBuffer = db ? TRUE : FALSE;
- pConfigs[i].stereo = FALSE;
- pConfigs[i].bufferSize = 16;
- if (depth)
- pConfigs[i].depthSize = 16;
- else
- pConfigs[i].depthSize = 0;
- if (stencil)
- pConfigs[i].stencilSize = 8;
- else
- pConfigs[i].stencilSize = 0;
- pConfigs[i].auxBuffers = 0;
- pConfigs[i].level = 0;
- if (stencil || accum)
- pConfigs[i].visualRating = GLX_SLOW_CONFIG;
- else
- pConfigs[i].visualRating = GLX_NONE;
- pConfigs[i].transparentPixel = GLX_NONE;
- pConfigs[i].transparentRed = 0;
- pConfigs[i].transparentGreen = 0;
- pConfigs[i].transparentBlue = 0;
- pConfigs[i].transparentAlpha = 0;
- pConfigs[i].transparentIndex = 0;
- i++;
- }
- }
- }
- assert(i == numConfigs);
- break;
- }
- pI810->numVisualConfigs = numConfigs;
- pI810->pVisualConfigs = pConfigs;
- pI810->pVisualConfigsPriv = pI810Configs;
- GlxSetVisualConfigs(numConfigs, pConfigs, (void **)pI810ConfigPtrs);
- return TRUE;
-}
-
static unsigned int
mylog2(unsigned int n)
{
@@ -293,10 +176,8 @@ I810DRIScreenInit(ScreenPtr pScreen)
if (pScrn->depth != 16)
return FALSE;
- /* Check that the GLX, DRI, and DRM modules have been loaded by testing
+ /* Check that the DRI, and DRM modules have been loaded by testing
* for known symbols in each module. */
- if (!xf86LoaderCheckSymbol("GlxSetVisualConfigs"))
- return FALSE;
if (!xf86LoaderCheckSymbol("drmAvailable"))
return FALSE;
if (!xf86LoaderCheckSymbol("DRIQueryVersion")) {
@@ -1002,13 +883,6 @@ I810DRIScreenInit(ScreenPtr pScreen)
pI810DRI->auxPitchBits = pI810->auxPitchBits;
pI810DRI->sarea_priv_offset = sizeof(XF86DRISAREARec);
- if (!(I810InitVisualConfigs(pScreen))) {
- xf86DrvMsg(pScreen->myNum, X_ERROR,
- "[dri] I810InitVisualConfigs failed. Disabling DRI.\n");
- DRICloseScreen(pScreen);
- return FALSE;
- }
-
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"[dri] visual configs initialized.\n");
pI810->pDRIInfo->driverSwapMethod = DRI_HIDE_X_CONTEXT;
More information about the xorg-commit
mailing list