diff options
| author | José Fonseca <jfonseca@vmware.com> | 2009-02-23 17:21:36 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2009-02-23 17:21:36 +0000 |
| commit | 37f21fce3bd323c361291215edeb7d8cf5f4335b (patch) | |
| tree | 2909c90da7bff47ba359d50bde242b79a632210b /src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c | |
| parent | 7399d56ec6019e00297eef57f802a53698baa8ad (diff) | |
| parent | 60e35ebf1476c31eb5d7c207ab8e9db77fcad896 (diff) | |
Merge commit 'origin/gallium-0.1'
Conflicts:
src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
src/gallium/auxiliary/util/u_tile.c
Diffstat (limited to 'src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c')
| -rw-r--r-- | src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c index f3b1ca73b0..85ff3a09de 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c +++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c @@ -204,13 +204,9 @@ mm_bufmgr_create_buffer(struct pb_manager *mgr, #if 0 mmDumpMemInfo(mm->heap); #endif - - mm_buf->block = u_mmAllocMem(mm->heap, size, mm->align2, 0); - if(!mm_buf->block) { - FREE(mm_buf); - pipe_mutex_unlock(mm->mutex); - return NULL; - } + FREE(mm_buf); + pipe_mutex_unlock(mm->mutex); + return NULL; } /* Some sanity checks */ |