Remove some unused cruft

3 files changed, 0 insertions, 13 deletions

diff --git a/src/nv_dma.c b/src/nv_dma.c
index 6f66e9d..c29fadc 100644
--- a/src/nv_dma.c
+++ b/src/nv_dma.c
@@ -154,10 +154,6 @@ void NVResetGraphics(ScrnInfoPtr pScrn)
 	if (pNv->useEXA) {
 		if (pNv->AGPScratch)
 			NVDmaSetObjectOnSubchannel(pNv, NvSubMemFormat, NvMemFormat);
-		if (pNv->use3D) {
-			NVDmaSetObjectOnSubchannel(pNv, NvSub3D, Nv3D);
-			pNv->Reset3D(pNv);
-		}
 	} else if (!pNv->useEXA) {
 		NVDmaSetObjectOnSubchannel(pNv, NvSubClipRectangle, NvClipRectangle);
 		NVDmaSetObjectOnSubchannel(pNv, NvSubSolidLine, NvSolidLine);
diff --git a/src/nv_exa.c b/src/nv_exa.c
index da05f61..995e531 100644
--- a/src/nv_exa.c
+++ b/src/nv_exa.c
@@ -580,11 +580,6 @@ Bool NVExaInit(ScreenPtr pScreen)
 		break;
 	}
 
-	/* If we're going to try and use 3D, let the card-specific function
-	 * override whatever hooks it wants.
-	 */
-	if (pNv->use3D) pNv->InitEXA3D(pNv);
-
 	return exaDriverInit(pScreen, pNv->EXADriverPtr);
 }
 
diff --git a/src/nv_type.h b/src/nv_type.h
index c56c9f5..774300a 100644
--- a/src/nv_type.h
+++ b/src/nv_type.h
@@ -243,10 +243,6 @@ typedef struct _NVRec {
     CARD32              dmaMax;
     CARD32              *dmaBase;
 
-    Bool                use3D;
-    void                (*Reset3D)(NVPtr pNv);
-    void		(*InitEXA3D)(NVPtr pNv);
-
     CARD32              currentRop;
     int                 M2MFDirection;