Minor driver cleanup. Remove unnecessery/unneded radeon/r200AllocDmaRegionVerts funct...

diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.c b/src/mesa/drivers/dri/r200/r200_ioctl.c
index e45a59fe3a11b1a6467b52d4ae703db374ddb53b..ca64907c38ffa4b058ac0c1278ffbb016868a181 100644 (file)
--- 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 8927acd7faa447bb70e9348ece54c6d326187e78..cf4188afe895e1829e287b369506fc9df3b37feb 100644 (file)
--- 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 b0ef172993d6ecc51aacf1d8d945fbee0170c6d9..8a942cb480799c8021b316d3809762e38d5eb141 100644 (file)
--- 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 3d66d3e05ff927912db2eda6269ac4ab9eed66ea..1cf5340b9cb66cb1ea79e10f197b06f6a3327344 100644 (file)
--- 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 8b21920c5274365f36dfbeb37e549d86669c6b75..dd7ed19b8471d355980e27b190688a0e2348a580 100644 (file)
--- 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 8a07a01cb21e60e7f9da53ebc0c3f2cb28101577..fc31aff47aaa3882904f8a134a0a1510875f9a68 100644 (file)
--- 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 ac82a33732b2d59feee9924c5f626be0fc7411b2..3d004adda683a37a772acbb7b2f59f945d01c194 100644 (file)
--- 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