[PATCH xf86-video-tdfx] xf86-video-tdfx: remove the GlxSetVisualConfigs stub and friends
Emil Velikov
emil.l.velikov at gmail.com
Mon Jul 31 13:13:55 UTC 2017
From: Emil Velikov <emil.velikov at collabora.com>
The function was an empty since 2008 at least. Remove it alongside the
unused GLX visuals code.
With this all the GL/GLX dependencies in the driver are gone.
Cc: Guillem Jover <guillem at hadrons.org>
Cc: Adam Jackson <ajax at redhat.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
src/tdfx.h | 4 -
src/tdfx_dri.c | 217 +----------------------------------------------------
src/tdfx_dripriv.h | 11 ---
src/tdfx_driver.c | 3 +-
4 files changed, 2 insertions(+), 233 deletions(-)
diff --git a/src/tdfx.h b/src/tdfx.h
index 38a7ad3..7411208 100644
--- a/src/tdfx.h
+++ b/src/tdfx.h
@@ -26,7 +26,6 @@
#include "sarea.h"
#define _XF86DRI_SERVER_
#include "dri.h"
-#include "GL/glxint.h"
#include "tdfx_dri.h"
#include "tdfx_dripriv.h"
#endif
@@ -276,9 +275,6 @@ typedef struct _TDFXRec {
Bool directRenderingEnabled;
DRIInfoPtr pDRIInfo;
int drmSubFD;
- int numVisualConfigs;
- __GLXvisualConfig* pVisualConfigs;
- TDFXConfigPrivPtr pVisualConfigsPriv;
TDFXRegRec DRContextRegs;
#endif
/* State for video */
diff --git a/src/tdfx_dri.c b/src/tdfx_dri.c
index 981867a..483ca20 100644
--- a/src/tdfx_dri.c
+++ b/src/tdfx_dri.c
@@ -8,8 +8,6 @@
#include "xf86Pci.h"
#include "fb.h"
#include "miline.h"
-#include "GL/glxint.h"
-#include "GL/glxtokens.h"
#include "tdfx.h"
#include "tdfx_dri.h"
#include "tdfx_dripriv.h"
@@ -35,211 +33,6 @@ static void TDFXDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
static void TDFXDRITransitionTo2d(ScreenPtr pScreen);
static void TDFXDRITransitionTo3d(ScreenPtr pScreen);
-static Bool
-TDFXInitVisualConfigs(ScreenPtr pScreen)
-{
- ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- TDFXPtr pTDFX = TDFXPTR(pScrn);
- int numConfigs = 0;
- __GLXvisualConfig *pConfigs = 0;
- TDFXConfigPrivPtr pTDFXConfigs = 0;
- TDFXConfigPrivPtr *pTDFXConfigPtrs = 0;
- int i, db, stencil, accum, depth;
-
- switch (pScrn->bitsPerPixel) {
- case 8:
- case 16:
- numConfigs = 16;
-
- if (!(pConfigs = (__GLXvisualConfig*)calloc(sizeof(__GLXvisualConfig),
- numConfigs))) {
- return FALSE;
- }
- if (!(pTDFXConfigs = (TDFXConfigPrivPtr)calloc(sizeof(TDFXConfigPrivRec),
- numConfigs))) {
- free(pConfigs);
- return FALSE;
- }
- if (!(pTDFXConfigPtrs = (TDFXConfigPrivPtr*)calloc(sizeof(TDFXConfigPrivPtr),
- numConfigs))) {
- free(pConfigs);
- free(pTDFXConfigs);
- return FALSE;
- }
- for (i=0; i<numConfigs; i++)
- pTDFXConfigPtrs[i] = &pTDFXConfigs[i];
-
- i=0;
- depth=1;
- for (db = 0; db <=1; db++) {
- for (depth = 0; depth<=1; depth++) {
- for (accum = 0; accum <= 1; accum++) {
- for (stencil = 0; stencil <= 1; stencil++) {
- 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].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;
- }
- if (db)
- pConfigs[i].doubleBuffer = TRUE;
- else
- pConfigs[i].doubleBuffer = FALSE;
- pConfigs[i].stereo = FALSE;
- pConfigs[i].bufferSize = 16;
- if (depth) {
- if (pTDFX->cpp>2)
- pConfigs[i].depthSize = 24;
- else
- 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++;
- }
- }
- }
- }
- if (i!=numConfigs) {
- xf86DrvMsg(pScreen->myNum, X_ERROR,
- "[dri] TDFXInitVisualConfigs: wrong number of visuals\n");
- return FALSE;
- }
- break; /* 16bpp */
-
- case 24:
- case 32:
- numConfigs = 8;
-
- pConfigs = (__GLXvisualConfig*) calloc(sizeof(__GLXvisualConfig), numConfigs);
- if (!pConfigs)
- return FALSE;
-
- pTDFXConfigs = (TDFXConfigPrivPtr) calloc(sizeof(TDFXConfigPrivRec), numConfigs);
- if (!pTDFXConfigs) {
- free(pConfigs);
- return FALSE;
- }
-
- pTDFXConfigPtrs = (TDFXConfigPrivPtr *) calloc(sizeof(TDFXConfigPrivPtr), numConfigs);
- if (!pTDFXConfigPtrs) {
- free(pConfigs);
- free(pTDFXConfigs);
- return FALSE;
- }
-
- for (i = 0; i < numConfigs; i++)
- pTDFXConfigPtrs[i] = &pTDFXConfigs[i];
-
- i=0;
- for (db = 0; db <=1; db++) {
- for (depth = 0; depth<=1; depth++) {
- /*stencil = depth;*/ /* Z and stencil share the same memory */
- for (accum = 0; accum <= 1; accum++) {
- /*for (stencil = 0; stencil <=1; stencil++) {*/
- stencil = depth;
- pConfigs[i].vid = -1;
- pConfigs[i].class = -1;
- pConfigs[i].rgba = TRUE;
- pConfigs[i].redSize = 8;
- pConfigs[i].greenSize = 8;
- pConfigs[i].blueSize = 8;
- pConfigs[i].alphaSize = (pScrn->bitsPerPixel==32) ? 8 : 0;
- pConfigs[i].redMask = 0x00ff0000;
- pConfigs[i].greenMask = 0x0000ff00;
- pConfigs[i].blueMask = 0x000000ff;
- pConfigs[i].alphaMask = (pScrn->bitsPerPixel==32) ? 0xff000000 : 0;
- if (accum) {
- pConfigs[i].accumRedSize = 16;
- pConfigs[i].accumGreenSize = 16;
- pConfigs[i].accumBlueSize = 16;
- pConfigs[i].accumAlphaSize = (pScrn->bitsPerPixel==32) ? 16 : 0;
- } else {
- pConfigs[i].accumRedSize = 0;
- pConfigs[i].accumGreenSize = 0;
- pConfigs[i].accumBlueSize = 0;
- pConfigs[i].accumAlphaSize = 0;
- }
- if (db)
- pConfigs[i].doubleBuffer = TRUE;
- else
- pConfigs[i].doubleBuffer = FALSE;
- pConfigs[i].stereo = FALSE;
- pConfigs[i].bufferSize = (pScrn->bitsPerPixel==32) ? 32 : 24;
- if (depth) {
- if (pTDFX->cpp > 2)
- pConfigs[i].depthSize = 24;
- else
- 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 (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++;
- /*}*/
- }
- }
- }
- if (i!=numConfigs) {
- xf86DrvMsg(pScreen->myNum, X_ERROR,
- "[dri] TDFXInitVisualConfigs: wrong number of visuals\n");
- return FALSE;
- }
- break;
- }
- pTDFX->numVisualConfigs = numConfigs;
- pTDFX->pVisualConfigs = pConfigs;
- pTDFX->pVisualConfigsPriv = pTDFXConfigs;
- GlxSetVisualConfigs(numConfigs, pConfigs, (void**)pTDFXConfigPtrs);
- return TRUE;
-}
-
static void
TDFXDoWakeupHandler(WAKEUPHANDLER_ARGS_DECL)
{
@@ -304,9 +97,8 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen)
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 canonical symbols in each module. */
- if (!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) return FALSE;
if (!xf86LoaderCheckSymbol("drmAvailable")) return FALSE;
if (!xf86LoaderCheckSymbol("DRIQueryVersion")) {
xf86DrvMsg(pScreen->myNum, X_ERROR,
@@ -457,11 +249,6 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen)
xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Registers = 0x%08x\n",
pTDFXDRI->regs);
- if (!(TDFXInitVisualConfigs(pScreen))) {
- TDFXDRICloseScreen(pScreen);
- xf86DrvMsg(pScreen->myNum, X_ERROR, "TDFXInitVisualConfigs failed, disabling DRI.\n");
- return FALSE;
- }
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "visual configs initialized\n" );
return TRUE;
@@ -483,8 +270,6 @@ TDFXDRICloseScreen(ScreenPtr pScreen)
DRIDestroyInfoRec(pTDFX->pDRIInfo);
pTDFX->pDRIInfo=0;
}
- if (pTDFX->pVisualConfigs) free(pTDFX->pVisualConfigs);
- if (pTDFX->pVisualConfigsPriv) free(pTDFX->pVisualConfigsPriv);
}
static Bool
diff --git a/src/tdfx_dripriv.h b/src/tdfx_dripriv.h
index 322633c..553cf99 100644
--- a/src/tdfx_dripriv.h
+++ b/src/tdfx_dripriv.h
@@ -4,17 +4,6 @@
#define TDFX_MAX_DRAWABLES 256
-extern void GlxSetVisualConfigs(
- int nconfigs,
- __GLXvisualConfig *configs,
- void **configprivs
-);
-
-typedef struct {
- /* Nothing here yet */
- int dummy;
-} TDFXConfigPrivRec, *TDFXConfigPrivPtr;
-
typedef struct {
/* Nothing here yet */
int dummy;
diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
index 03fa165..ff0a957 100644
--- a/src/tdfx_driver.c
+++ b/src/tdfx_driver.c
@@ -2325,8 +2325,7 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) {
#ifdef TDFXDRI
/*
* Setup DRI after visuals have been established, but before fbScreenInit
- * is called. fbScreenInit will eventually call into the drivers
- * InitGLXVisuals call back.
+ * is called.
*/
if (!xf86ReturnOptValBool(pTDFX->Options, OPTION_DRI, TRUE) || pTDFX->NoAccel) {
pTDFX->directRenderingEnabled = FALSE;
--
2.13.0
More information about the xorg-devel
mailing list