summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-03-05 10:01:53 -0700
committerBrian Paul <brianp@vmware.com>2009-03-05 10:01:53 -0700
commit9d9a7edfbc7259b532123d7d85f6238f59a9a41a (patch)
tree5a9ff5b5bb949ae34df106370025626ea831e628
parentca640ca9598c22970b15bf16acf74409d860a30a (diff)
downloadexternal_mesa3d-9d9a7edfbc7259b532123d7d85f6238f59a9a41a.zip
external_mesa3d-9d9a7edfbc7259b532123d7d85f6238f59a9a41a.tar.gz
external_mesa3d-9d9a7edfbc7259b532123d7d85f6238f59a9a41a.tar.bz2
Revert "softpipe: added null ptr check for align_free() call in vbuf code"
This reverts commit 6db24f449de9cc81e1f7bb2dde55a9819463d5e5. With a null ptr check in align_free() this is no longer needed.
-rw-r--r--src/gallium/drivers/softpipe/sp_prim_vbuf.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/drivers/softpipe/sp_prim_vbuf.c b/src/gallium/drivers/softpipe/sp_prim_vbuf.c
index e2b6a04..eef6e58 100644
--- a/src/gallium/drivers/softpipe/sp_prim_vbuf.c
+++ b/src/gallium/drivers/softpipe/sp_prim_vbuf.c
@@ -90,8 +90,7 @@ sp_vbuf_allocate_vertices(struct vbuf_render *vbr,
unsigned size = vertex_size * nr_vertices;
if (cvbr->vertex_buffer_size < size) {
- if (cvbr->vertex_buffer)
- align_free(cvbr->vertex_buffer);
+ align_free(cvbr->vertex_buffer);
cvbr->vertex_buffer = align_malloc(size, 16);
cvbr->vertex_buffer_size = size;
}