diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-02-18 14:27:47 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-02-18 14:27:47 +0000 |
| commit | ebd2f2073fd553f5742f3748025e56dd808c3edc (patch) | |
| tree | 506b1538d2ca6d62a59a9aa1baa1af87bd6cb7b6 /src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c | |
| parent | b89aa1d87ad6cebdbb3f2067863c600f50bf0ff1 (diff) | |
| parent | 89e2b9c6c24e1a0b7690b9a7502b0ea198069d10 (diff) | |
Merge commit 'origin/master' into gallium-texture-transfergallium-texture-transfer
Conflicts:
src/gallium/drivers/softpipe/sp_tile_cache.c
Diffstat (limited to 'src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c')
| -rw-r--r-- | src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c index 26d9c24aec..070bf3f517 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c +++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c @@ -34,7 +34,7 @@ #include "pipe/p_compiler.h" -#include "pipe/p_debug.h" +#include "util/u_debug.h" #include "pipe/p_thread.h" #include "util/u_math.h" #include "util/u_memory.h" |