From: Brian Paul <brianp@vmware.com>
Date: Thu, 5 Mar 2009 17:01:53 +0000 (-0700)
Subject: Revert "softpipe: added null ptr check for align_free() call in vbuf code"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9d9a7edfbc7259b532123d7d85f6238f59a9a41a;p=mesa.git

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.
---

diff --git a/src/gallium/drivers/softpipe/sp_prim_vbuf.c b/src/gallium/drivers/softpipe/sp_prim_vbuf.c
index e2b6a041b38..eef6e5806c9 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;
    }