vbo: remove dead code in vbo_can_merge_prims

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

diff --git a/src/mesa/vbo/vbo_primitive_restart.c b/src/mesa/vbo/vbo_primitive_restart.c
index 9c30554314c87197d41f4fa14c69443ab589c052..1faf3a68229defd09c37c5e8349021598052f932 100644 (file)
--- a/src/mesa/vbo/vbo_primitive_restart.c
+++ b/src/mesa/vbo/vbo_primitive_restart.c
@@ -28,21 +28,21 @@
  *
  */
 
+#include "main/errors.h"
 #include "main/imports.h"
-#include "main/bufferobj.h"
 #include "main/macros.h"
 #include "main/varray.h"
 
 #include "vbo.h"
-#include "vbo_context.h"
+
 
 #define UPDATE_MIN2(a, b) (a) = MIN2((a), (b))
 #define UPDATE_MAX2(a, b) (a) = MAX2((a), (b))
 
 /*
  * Notes on primitive restart:
- * The code below is used when the driver does not support primitive
- * restart itself. (ctx->Const.PrimitiveRestartInSoftware == GL_TRUE)
+ * The code below is used when the driver does not fully support primitive
+ * restart (for example, if it only does restart index of ~0).
  *
  * We map the index buffer, find the restart indexes, unmap
  * the index buffer then draw the sub-primitives delineated by the restarts.
@@ -167,26 +167,24 @@ vbo_sw_primitive_restart(struct gl_context *ctx,
                          struct gl_buffer_object *indirect)
 {
    GLuint prim_num;
+   struct _mesa_prim new_prim;
+   struct _mesa_index_buffer new_ib;
    struct sub_primitive *sub_prims;
    struct sub_primitive *sub_prim;
    GLuint num_sub_prims;
    GLuint sub_prim_num;
    GLuint end_index;
    GLuint sub_end_index;
-   GLuint restart_index = _mesa_primitive_restart_index(ctx, ib->type);
+   GLuint restart_index = _mesa_primitive_restart_index(ctx, ib->index_size);
    struct _mesa_prim temp_prim;
-   struct vbo_context *vbo = vbo_context(ctx);
-   vbo_draw_func draw_prims_func = vbo->draw_prims;
-   GLboolean map_ib = ib->obj->Name && !ib->obj->Pointer;
+   GLboolean map_ib = ib->obj->Name && !ib->obj->Mappings[MAP_INTERNAL].Pointer;
    void *ptr;
 
    /* If there is an indirect buffer, map it and extract the draw params */
-   if (indirect && prims[0].is_indirect) {
-      struct _mesa_prim new_prim = *prims;
-      struct _mesa_index_buffer new_ib = *ib;
+   if (indirect) {
       const uint32_t *indirect_params;
       if (!ctx->Driver.MapBufferRange(ctx, 0, indirect->Size, GL_MAP_READ_BIT,
-            indirect)) {
+                                      indirect, MAP_INTERNAL)) {
 
          /* something went wrong with mapping, give up */
          _mesa_error(ctx, GL_OUT_OF_MEMORY,
@@ -195,22 +193,24 @@ vbo_sw_primitive_restart(struct gl_context *ctx,
       }
 
       assert(nr_prims == 1);
-      indirect_params = (const uint32_t *) ADD_POINTERS(indirect->Pointer,
-            new_prim.indirect_offset);
+      new_prim = prims[0];
+      indirect_params = (const uint32_t *)
+                        ADD_POINTERS(indirect->Mappings[MAP_INTERNAL].Pointer,
+                                     new_prim.indirect_offset);
 
-      new_prim.is_indirect = 0;
       new_prim.count = indirect_params[0];
       new_prim.num_instances = indirect_params[1];
       new_prim.start = indirect_params[2];
       new_prim.basevertex = indirect_params[3];
       new_prim.base_instance = indirect_params[4];
 
+      new_ib = *ib;
       new_ib.count = new_prim.count;
 
       prims = &new_prim;
       ib = &new_ib;
 
-      ctx->Driver.UnmapBuffer(ctx, indirect);
+      ctx->Driver.UnmapBuffer(ctx, indirect, MAP_INTERNAL);
    }
 
    /* Find the sub-primitives. These are regions in the index buffer which
@@ -218,17 +218,17 @@ vbo_sw_primitive_restart(struct gl_context *ctx,
     */
    if (map_ib) {
       ctx->Driver.MapBufferRange(ctx, 0, ib->obj->Size, GL_MAP_READ_BIT,
-                                 ib->obj);
+                                 ib->obj, MAP_INTERNAL);
    }
 
-   ptr = ADD_POINTERS(ib->obj->Pointer, ib->ptr);
+   ptr = ADD_POINTERS(ib->obj->Mappings[MAP_INTERNAL].Pointer, ib->ptr);
 
-   sub_prims = find_sub_primitives(ptr, vbo_sizeof_ib_type(ib->type),
+   sub_prims = find_sub_primitives(ptr, ib->index_size,
                                    0, ib->count, restart_index,
                                    &num_sub_prims);
 
    if (map_ib) {
-      ctx->Driver.UnmapBuffer(ctx, ib->obj);
+      ctx->Driver.UnmapBuffer(ctx, ib->obj, MAP_INTERNAL);
    }
 
    /* Loop over the primitives, and use the located sub-primitives to draw
@@ -246,13 +246,13 @@ vbo_sw_primitive_restart(struct gl_context *ctx,
             temp_prim.count = MIN2(sub_end_index, end_index) - temp_prim.start;
             if ((temp_prim.start == sub_prim->start) &&
                 (temp_prim.count == sub_prim->count)) {
-               draw_prims_func(ctx, &temp_prim, 1, ib,
-                               GL_TRUE, sub_prim->min_index, sub_prim->max_index,
-                               NULL, NULL);
+               ctx->Driver.Draw(ctx, &temp_prim, 1, ib, GL_TRUE,
+                                sub_prim->min_index, sub_prim->max_index,
+                                NULL, 0, NULL);
             } else {
-               draw_prims_func(ctx, &temp_prim, 1, ib,
-                               GL_FALSE, -1, -1,
-                               NULL, NULL);
+               ctx->Driver.Draw(ctx, &temp_prim, 1, ib,
+                                GL_FALSE, -1, -1,
+                                NULL, 0, NULL);
             }
          }
          if (sub_end_index >= end_index) {