Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into r6xx...
[mesa.git] / src / mesa / vbo / vbo_rebase.c
index 2fcaba236410e207ce61626c3de099e24f956d9c..ea87dede64627566052a5de2c0a0d18ca55a11f3 100644 (file)
@@ -49,7 +49,6 @@
 #include "main/glheader.h"
 #include "main/imports.h"
 #include "main/mtypes.h"
-#include "main/bufferobj.h"
 
 #include "vbo.h"
 
@@ -162,8 +161,7 @@ void vbo_rebase_prims( GLcontext *ctx,
                                 GL_ELEMENT_ARRAY_BUFFER,
                                 ib->obj);
 
-      _mesa_reference_buffer_object(ctx, &tmp_ib.obj,
-                                    ctx->Shared->NullBufferObj);
+      tmp_ib.obj = ctx->Shared->NullBufferObj;
       tmp_ib.ptr = tmp_indices;
       tmp_ib.count = ib->count;
       tmp_ib.type = ib->type;