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 f170347fbe4115737328ee8f17049b216337ab50..1faf3a68229defd09c37c5e8349021598052f932 100644 (file)
--- a/src/mesa/vbo/vbo_primitive_restart.c
+++ b/src/mesa/vbo/vbo_primitive_restart.c
@@ -28,6 +28,7 @@
  *
  */
 
+#include "main/errors.h"
 #include "main/imports.h"
 #include "main/macros.h"
 #include "main/varray.h"
@@ -180,7 +181,7 @@ vbo_sw_primitive_restart(struct gl_context *ctx,
    void *ptr;
 
    /* If there is an indirect buffer, map it and extract the draw params */
-   if (indirect && prims[0].is_indirect) {
+   if (indirect) {
       const uint32_t *indirect_params;
       if (!ctx->Driver.MapBufferRange(ctx, 0, indirect->Size, GL_MAP_READ_BIT,
                                       indirect, MAP_INTERNAL)) {
@@ -197,7 +198,6 @@ vbo_sw_primitive_restart(struct gl_context *ctx,
                         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];