Minor driver cleanup. Remove unnecessery/unneded radeon/r200AllocDmaRegionVerts function. No longer compile the radeon_compat stuff which was for drm 1.1 compatibility presumably but unused since about forever into the driver.

7 files changed, 4 insertions, 45 deletions

diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.c b/src/mesa/drivers/dri/r200/r200_ioctl.c
index e45a59fe3a1..ca64907c38f 100644
--- a/src/mesa/drivers/dri/r200/r200_ioctl.c
+++ b/src/mesa/drivers/dri/r200/r200_ioctl.c
@@ -330,15 +330,6 @@ void r200AllocDmaRegion( r200ContextPtr rmesa,
    assert( rmesa->dma.current.ptr <= rmesa->dma.current.end );
 }
 
-void r200AllocDmaRegionVerts( r200ContextPtr rmesa, 
-				struct r200_dma_region *region,
-				int numverts,
-				int vertsize,
-				int alignment )
-{
-   r200AllocDmaRegion( rmesa, region, vertsize * numverts, alignment );
-}
-
 /* ================================================================
  * SwapBuffers with client-side throttling
  */
diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.h b/src/mesa/drivers/dri/r200/r200_ioctl.h
index 8927acd7faa..cf4188afe89 100644
--- a/src/mesa/drivers/dri/r200/r200_ioctl.h
+++ b/src/mesa/drivers/dri/r200/r200_ioctl.h
@@ -86,12 +86,6 @@ extern void r200AllocDmaRegion( r200ContextPtr rmesa,
 				  int bytes, 
 				  int alignment );
 
-extern void r200AllocDmaRegionVerts( r200ContextPtr rmesa,
-				       struct r200_dma_region *region,
-				       int numverts,
-				       int vertsize, 
-				       int alignment );
-
 extern void r200ReleaseDmaRegion( r200ContextPtr rmesa,
 				    struct r200_dma_region *region,
 				    const char *caller );
diff --git a/src/mesa/drivers/dri/radeon/Makefile b/src/mesa/drivers/dri/radeon/Makefile
index b0ef172993d..8a942cb4807 100644
--- a/src/mesa/drivers/dri/radeon/Makefile
+++ b/src/mesa/drivers/dri/radeon/Makefile
@@ -23,7 +23,6 @@ DRIVER_SOURCES = \
 	radeon_span.c \
 	radeon_maos.c \
 	radeon_sanity.c \
-	radeon_compat.c \
 	radeon_vtxfmt.c \
 	radeon_vtxfmt_c.c \
 	radeon_vtxfmt_sse.c \
diff --git a/src/mesa/drivers/dri/radeon/radeon_ioctl.c b/src/mesa/drivers/dri/radeon/radeon_ioctl.c
index 3d66d3e05ff..1cf5340b9cb 100644
--- a/src/mesa/drivers/dri/radeon/radeon_ioctl.c
+++ b/src/mesa/drivers/dri/radeon/radeon_ioctl.c
@@ -775,15 +775,6 @@ void radeonAllocDmaRegion( radeonContextPtr rmesa,
       rmesa->dma.current.ptr = (rmesa->dma.current.ptr + 0x7) & ~0x7;  
 }
 
-void radeonAllocDmaRegionVerts( radeonContextPtr rmesa, 
-				struct radeon_dma_region *region,
-				int numverts,
-				int vertsize,
-				int alignment )
-{
-   radeonAllocDmaRegion( rmesa, region, vertsize * numverts, alignment );
-}
-
 /* ================================================================
  * SwapBuffers with client-side throttling
  */
diff --git a/src/mesa/drivers/dri/radeon/radeon_ioctl.h b/src/mesa/drivers/dri/radeon/radeon_ioctl.h
index 8b21920c527..dd7ed19b847 100644
--- a/src/mesa/drivers/dri/radeon/radeon_ioctl.h
+++ b/src/mesa/drivers/dri/radeon/radeon_ioctl.h
@@ -83,12 +83,6 @@ extern void radeonAllocDmaRegion( radeonContextPtr rmesa,
 				  int bytes, 
 				  int alignment );
 
-extern void radeonAllocDmaRegionVerts( radeonContextPtr rmesa,
-				       struct radeon_dma_region *region,
-				       int numverts,
-				       int vertsize, 
-				       int alignment );
-
 extern void radeonReleaseDmaRegion( radeonContextPtr rmesa,
 				    struct radeon_dma_region *region,
 				    const char *caller );
@@ -103,13 +97,6 @@ extern void radeonInitIoctlFuncs( GLcontext *ctx );
 extern void radeonGetAllParams( radeonContextPtr rmesa );
 extern void radeonSetUpAtomList( radeonContextPtr rmesa );
 
-/* radeon_compat.c:
- */
-extern void radeonCompatEmitPrimitive( radeonContextPtr rmesa,
-				       GLuint vertex_format,
-				       GLuint hw_primitive,
-				       GLuint nrverts );
-
 /* ================================================================
  * Helper macros:
  */
diff --git a/src/mesa/drivers/dri/radeon/radeon_maos_vbtmp.h b/src/mesa/drivers/dri/radeon/radeon_maos_vbtmp.h
index 8a07a01cb21..fc31aff47aa 100644
--- a/src/mesa/drivers/dri/radeon/radeon_maos_vbtmp.h
+++ b/src/mesa/drivers/dri/radeon/radeon_maos_vbtmp.h
@@ -67,8 +67,6 @@ static void TAG(emit)( GLcontext *ctx,
 	 tc2 = (GLuint (*)[4])VB->TexCoordPtr[t2]->data;
 	 tc2_stride = VB->TexCoordPtr[t2]->stride;
 	 if (DO_PTEX && VB->TexCoordPtr[t2]->size < 3) {
-	 /* since DO_PTEX is only true when we have 3 or more coords
-	    in the first place we don't really need this right? */
 	    fill_tex |= (1<<2);
 	 }
 	 else if (DO_PTEX && VB->TexCoordPtr[t2]->size < 4) {
diff --git a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c
index ac82a33732b..3d004adda68 100644
--- a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c
+++ b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c
@@ -315,11 +315,10 @@ void radeonEmitArrays( GLcontext *ctx, GLuint inputs )
    if (rmesa->tcl.indexed_verts.buf)
       radeonReleaseArrays( ctx, ~0 );
 
-   radeonAllocDmaRegionVerts( rmesa, 
-			      &rmesa->tcl.indexed_verts, 
-			      VB->Count,
-			      setup_tab[i].vertex_size * 4, 
-			      4);
+   radeonAllocDmaRegion( rmesa,
+			 &rmesa->tcl.indexed_verts, 
+			 VB->Count * setup_tab[i].vertex_size * 4, 
+			 4);
 
    /* The vertex code expects Obj to be clean to element 3.  To fix
     * this, add more vertex code (for obj-2, obj-3) or preferably move