Cell: generalize the batch buffer code for vertex buffers...

[mesa.git] / src / mesa / vbo / vbo_split_inplace.c

diff --git a/src/mesa/vbo/vbo_split_inplace.c b/src/mesa/vbo/vbo_split_inplace.c
index 66c94aceaa26c3fa8e2adfc7dc935f11018620ec..958afccd0c0a278e2c30a5288a6cc2a5f64e89a0 100644 (file)
--- a/src/mesa/vbo/vbo_split_inplace.c
+++ b/src/mesa/vbo/vbo_split_inplace.c
@@ -27,9 +27,9 @@
  */
 
 
-#include "mtypes.h"
-#include "macros.h"
-#include "enums.h"
+#include "main/mtypes.h"
+#include "main/macros.h"
+#include "main/enums.h"
 #include "vbo_split.h"
 
 
@@ -49,9 +49,6 @@ struct split_context {
 
    const struct split_limits *limits;
 
-/*    GLuint out_maxindex; */
-/*    GLuint out_minindex; */
-
    struct _mesa_prim dstprim[MAX_PRIM];
    GLuint dstprim_nr;
 };
@@ -151,13 +148,6 @@ static void split_prims( struct split_context *split)
       GLuint available = align(split->limits->max_verts - csr - 1, 2); 
       assert(split->limits->max_verts >= csr);
 
-      _mesa_printf("%s: prim %d: %s %d..%d\n", __FUNCTION__,
-                  i,
-                  _mesa_lookup_enum_by_nr(prim->mode),
-                  prim->start, prim->count);
-
-      _mesa_printf("a: available %d\n", available);
-
       if (prim->count < first)
         continue;
       
@@ -171,15 +161,13 @@ static void split_prims( struct split_context *split)
         available = align(split->limits->max_verts - csr - 1, 2);
       }
       
-      _mesa_printf("b: available %d\n", available);
-
       if (available >= count) {
         struct _mesa_prim *outprim = next_outprim(split);
         *outprim = *prim;
         csr += prim->count;
         available = align(split->limits->max_verts - csr - 1, 2); 
       } 
-      else if (0 && split_inplace) {
+      else if (split_inplace) {
         GLuint j, nr;
 
 
@@ -207,8 +195,6 @@ static void split_prims( struct split_context *split)
            else {
               /* Wrapped the primitive: 
                */
-              _mesa_printf("wrap %d %d\n", nr, first-incr);
-
               j += nr - (first - incr);
               flush_vertex(split);
               csr = 0;
@@ -237,7 +223,6 @@ static void split_prims( struct split_context *split)
         ib.type = GL_UNSIGNED_INT;
         ib.obj = split->ctx->Array.NullBufferObj;
         ib.ptr = elts;
-        ib.rebase = 0;         /* ? */
            
         tmpprim = *prim;
         tmpprim.indexed = 1;