diff options
| author | Jakob Bornecrantz <[email protected]> | 2009-06-09 07:53:25 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <[email protected]> | 2009-06-09 07:53:25 +0200 |
| commit | ee98ae5a29ca870149c4a0d2a8f25f55e0fd333a (patch) | |
| tree | 308fa87e22a276c0f8f28fd9f0986d20b52be928 /src/gallium/auxiliary | |
| parent | d9617deb008b75f4a605a30408aeb1948139c33e (diff) | |
| parent | 76a1017e978f8e51114d765c8c98ff25da13042b (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
src/mesa/main/version.h
src/mesa/shader/slang/slang_preprocess.c
src/mesa/state_tracker/st_cb_bufferobjects.c
Diffstat (limited to 'src/gallium/auxiliary')
| -rw-r--r-- | src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c index 5a342fbf3b1..d8decba49df 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c +++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c @@ -200,8 +200,8 @@ mm_bufmgr_create_buffer(struct pb_manager *mgr, mm_buf->block = u_mmAllocMem(mm->heap, size, mm->align2, 0); if(!mm_buf->block) { - debug_printf("warning: heap full\n"); #if 0 + debug_printf("warning: heap full\n"); mmDumpMemInfo(mm->heap); #endif FREE(mm_buf); |