3 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/tnl/t_rebase.c b/src/mesa/tnl/t_rebase.c
index 07e603b0107..e6e5c9f3dfa 100644
--- a/src/mesa/tnl/t_rebase.c
+++ b/src/mesa/tnl/t_rebase.c
@@ -151,7 +151,7 @@ void t_rebase_prims( struct gl_context *ctx,
    } else if (ib) {
       /* Unfortunately need to adjust each index individually.
        */
-      GLboolean map_ib = ib->obj->Name &&
+      GLboolean map_ib = ib->obj &&
                          !ib->obj->Mappings[MAP_INTERNAL].Pointer;
       void *ptr;
 
@@ -184,7 +184,7 @@ void t_rebase_prims( struct gl_context *ctx,
          return;
       }
 
-      tmp_ib.obj = ctx->Shared->NullBufferObj;
+      tmp_ib.obj = NULL;
       tmp_ib.ptr = tmp_indices;
       tmp_ib.count = ib->count;
       tmp_ib.index_size_shift = ib->index_size_shift;
diff --git a/src/mesa/tnl/t_split_copy.c b/src/mesa/tnl/t_split_copy.c
index 5b300e93553..9df55c78558 100644
--- a/src/mesa/tnl/t_split_copy.c
+++ b/src/mesa/tnl/t_split_copy.c
@@ -555,7 +555,7 @@ replay_init(struct copy_context *copy)
     */
    copy->dstib.count = 0;        /* duplicates dstelt_nr */
    copy->dstib.index_size_shift = 2;
-   copy->dstib.obj = ctx->Shared->NullBufferObj;
+   copy->dstib.obj = NULL;
    copy->dstib.ptr = copy->dstelt;
 }
 
diff --git a/src/mesa/tnl/t_split_inplace.c b/src/mesa/tnl/t_split_inplace.c
index 76d3d89094a..817b641e515 100644
--- a/src/mesa/tnl/t_split_inplace.c
+++ b/src/mesa/tnl/t_split_inplace.c
@@ -228,7 +228,7 @@ split_prims(struct split_context *split)
 
          ib.count = count;
          ib.index_size_shift = 2;
-         ib.obj = split->ctx->Shared->NullBufferObj;
+         ib.obj = NULL;
          ib.ptr = elts;
 
          tmpprim = *prim;