mesa: treat Color._AdvancedBlendMode as enum

[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 528f8b5613115865350861ea01f2d66d45597dc5..02f521c7fb38f228767ced9c0c828c6dd1bd80f4 100644 (file)
--- a/src/mesa/tnl/t_vb_render.c
+++ b/src/mesa/tnl/t_vb_render.c
@@ -22,7 +22,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
+ *    Keith Whitwell <keithw@vmware.com>
  */
 
 
@@ -38,13 +38,15 @@
  */
 
 
+#include <stdio.h>
 #include "main/glheader.h"
 #include "main/context.h"
 #include "main/enums.h"
 #include "main/macros.h"
-#include "main/imports.h"
+
 #include "main/mtypes.h"
 #include "math/m_xform.h"
+#include "util/bitscan.h"
 
 #include "t_pipeline.h"
 
@@ -271,22 +273,22 @@ static GLboolean run_render( struct gl_context *ctx,
     * that window coordinates are guarenteed not to change before
     * rendering.
     */
-   ASSERT(tnl->Driver.Render.Start);
+   assert(tnl->Driver.Render.Start);
 
    tnl->Driver.Render.Start( ctx );
 
-   ASSERT(tnl->Driver.Render.BuildVertices);
-   ASSERT(tnl->Driver.Render.PrimitiveNotify);
-   ASSERT(tnl->Driver.Render.Points);
-   ASSERT(tnl->Driver.Render.Line);
-   ASSERT(tnl->Driver.Render.Triangle);
-   ASSERT(tnl->Driver.Render.Quad);
-   ASSERT(tnl->Driver.Render.ResetLineStipple);
-   ASSERT(tnl->Driver.Render.Interp);
-   ASSERT(tnl->Driver.Render.CopyPV);
-   ASSERT(tnl->Driver.Render.ClippedLine);
-   ASSERT(tnl->Driver.Render.ClippedPolygon);
-   ASSERT(tnl->Driver.Render.Finish);
+   assert(tnl->Driver.Render.BuildVertices);
+   assert(tnl->Driver.Render.PrimitiveNotify);
+   assert(tnl->Driver.Render.Points);
+   assert(tnl->Driver.Render.Line);
+   assert(tnl->Driver.Render.Triangle);
+   assert(tnl->Driver.Render.Quad);
+   assert(tnl->Driver.Render.ResetLineStipple);
+   assert(tnl->Driver.Render.Interp);
+   assert(tnl->Driver.Render.CopyPV);
+   assert(tnl->Driver.Render.ClippedLine);
+   assert(tnl->Driver.Render.ClippedPolygon);
+   assert(tnl->Driver.Render.Finish);
 
    tnl->Driver.Render.BuildVertices( ctx, 0, VB->Count, ~0 );
 
@@ -295,8 +297,8 @@ static GLboolean run_render( struct gl_context *ctx,
       clip_render_tab_elts[GL_TRIANGLES] = clip_elt_triangles;
    }
    else {
-      tab = (VB->Elts ? 
-            tnl->Driver.Render.PrimTabElts : 
+      tab = (VB->Elts ?
+            tnl->Driver.Render.PrimTabElts :
             tnl->Driver.Render.PrimTabVerts);
    }
 
@@ -312,9 +314,9 @@ static GLboolean run_render( struct gl_context *ctx,
 
         assert((prim & PRIM_MODE_MASK) <= GL_POLYGON);
 
-        if (MESA_VERBOSE & VERBOSE_PRIMS) 
-           _mesa_debug(NULL, "MESA prim %s %d..%d\n", 
-                       _mesa_lookup_enum_by_nr(prim & PRIM_MODE_MASK), 
+        if (MESA_VERBOSE & VERBOSE_PRIMS)
+           _mesa_debug(NULL, "MESA prim %s %d..%d\n",
+                       _mesa_enum_to_string(prim & PRIM_MODE_MASK),
                        start, start+length);
 
         if (length)