Convert all uses of CARD32 and CARD8 to int32_t and int8_t.

[mesa.git] / src / mesa / drivers / dri / radeon / radeon_maos_arrays.c

diff --git a/src/mesa/drivers/dri/radeon/radeon_maos_arrays.c b/src/mesa/drivers/dri/radeon/radeon_maos_arrays.c
index cec05a89d7ed58316da2235f36c6ca99d288bd24..07958b7d13959200f5e4849a7a2c249d860606a3 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_maos_arrays.c
+++ b/src/mesa/drivers/dri/radeon/radeon_maos_arrays.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_maos_arrays.c,v 1.1 2002/10/30 12:51:55 alanh Exp $ */
 /**************************************************************************
 
 Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
@@ -36,7 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "glheader.h"
 #include "imports.h"
 #include "mtypes.h"
-#include "mmath.h"
 #include "macros.h"
 
 #include "swrast_setup/swrast_setup.h"
@@ -409,7 +408,7 @@ static void emit_tex_vector( GLcontext *ctx,
 
 
 
-/* Emit any changed arrays to new agp memory, re-emit a packet to
+/* Emit any changed arrays to new GART memory, re-emit a packet to
  * update the arrays.  
  */
 void radeonEmitArrays( GLcontext *ctx, GLuint inputs )
@@ -422,8 +421,10 @@ void radeonEmitArrays( GLcontext *ctx, GLuint inputs )
    GLuint count = VB->Count;
    GLuint vtx;
    
+#if 0
    if (RADEON_DEBUG & DEBUG_VERTS) 
       _tnl_print_vert_flags( __FUNCTION__, inputs );
+#endif
 
    if (1) {
       if (!rmesa->tcl.obj.buf) 
@@ -498,8 +499,6 @@ void radeonEmitArrays( GLcontext *ctx, GLuint inputs )
 
    if (inputs & VERT_BIT_COLOR1) {
       if (!rmesa->tcl.spec.buf) {
-        if (VB->SecondaryColorPtr[0]->Type != GL_UNSIGNED_BYTE)
-           radeon_import_float_spec_colors( ctx );
 
         emit_ubyte_rgba( ctx, 
                          &rmesa->tcl.spec, 
@@ -568,8 +567,10 @@ void radeonReleaseArrays( GLcontext *ctx, GLuint newinputs )
 {
    radeonContextPtr rmesa = RADEON_CONTEXT( ctx );
 
+#if 0
    if (RADEON_DEBUG & DEBUG_VERTS) 
       _tnl_print_vert_flags( __FUNCTION__, newinputs );
+#endif
 
    if (newinputs & VERT_BIT_POS) 
      radeonReleaseDmaRegion( rmesa, &rmesa->tcl.obj, __FUNCTION__ );