Mesa (master): Revert "softpipe: added null ptr check for align_free() call in vbuf code"
Brian Paul
brianp at kemper.freedesktop.org
Thu Mar 5 17:02:28 UTC 2009
Module: Mesa
Branch: master
Commit: 9d9a7edfbc7259b532123d7d85f6238f59a9a41a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9d9a7edfbc7259b532123d7d85f6238f59a9a41a
Author: Brian Paul <brianp at vmware.com>
Date: Thu Mar 5 10:01:53 2009 -0700
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.
---
src/gallium/drivers/softpipe/sp_prim_vbuf.c | 3 +--
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;
}
More information about the mesa-commit
mailing list