Header file clean-up:

[mesa.git] / src / mesa / tnl / t_vb_render.c

diff --git a/src/mesa/tnl/t_vb_render.c b/src/mesa/tnl/t_vb_render.c
index 496c22cc42dc4172604cd8ca2534b9631f3ed914..976d3fc3d75dd0f956bc8c72a31a4e0e0811de24 100644 (file)
--- a/src/mesa/tnl/t_vb_render.c
+++ b/src/mesa/tnl/t_vb_render.c
@@ -1,4 +1,4 @@
-/* $Id: t_vb_render.c,v 1.29 2002/04/09 16:56:52 keithw Exp $ */
+/* $Id: t_vb_render.c,v 1.32 2002/10/24 23:57:25 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -44,7 +44,7 @@
 #include "context.h"
 #include "enums.h"
 #include "macros.h"
-#include "mem.h"
+#include "imports.h"
 #include "mtypes.h"
 #include "mmath.h"
 
@@ -327,7 +327,7 @@ static GLboolean run_render( GLcontext *ctx,
         ASSERT((flags & PRIM_MODE_MASK) <= GL_POLYGON+1);
 
         if (MESA_VERBOSE & VERBOSE_PRIMS)
-           fprintf(stderr, "MESA prim %s %d..%d\n", 
+           _mesa_debug(NULL, "MESA prim %s %d..%d\n", 
                    _mesa_lookup_enum_by_nr(flags & PRIM_MODE_MASK), 
                    i, i+length);
 
@@ -365,7 +365,7 @@ static void check_render( GLcontext *ctx, struct gl_pipeline_stage *stage )
       if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR)
         inputs |= VERT_BIT_COLOR1;
 
-      if (ctx->Texture._ReallyEnabled) {
+      if (ctx->Texture._EnabledUnits) {
         for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++) {
            if (ctx->Texture.Unit[i]._ReallyEnabled)
               inputs |= VERT_BIT_TEX(i);