vbo: initialize num_instances in a few places

This fixes https://bugs.freedesktop.org/show_bug.cgi?id=33247
There might still be some issues with drawing multiple instances
with VBO splitting to investigate someday.

diff --git a/src/mesa/vbo/vbo_split_copy.c b/src/mesa/vbo/vbo_split_copy.c
index 26d0046e83d8cc2c43e8e2f763608b8c785a552e..8c981f93e5c66c0f25204ae4d55e474462e833c9 100644 (file)
--- a/src/mesa/vbo/vbo_split_copy.c
+++ b/src/mesa/vbo/vbo_split_copy.c
@@ -222,6 +222,7 @@ begin( struct copy_context *copy, GLenum mode, GLboolean begin_flag )
 
    prim->mode = mode;
    prim->begin = begin_flag;
+   prim->num_instances = 1;
 }
 
 

diff --git a/src/mesa/vbo/vbo_split_inplace.c b/src/mesa/vbo/vbo_split_inplace.c
index fd5044fac0590b1f4dd62b881bd0b48a66b371e5..f6aa576b6c8eb4292ed32f1816437276c455063f 100644 (file)
--- a/src/mesa/vbo/vbo_split_inplace.c
+++ b/src/mesa/vbo/vbo_split_inplace.c
@@ -222,6 +222,7 @@ static void split_prims( struct split_context *split)
         tmpprim.indexed = 1;
         tmpprim.start = 0;
         tmpprim.count = count;
+         tmpprim.num_instances = 1;
 
         flush_vertex(split);