diff options
author | Ben Skeggs <skeggsb@gmail.com> | 2008-05-27 00:59:41 +1000 |
---|---|---|
committer | Ben Skeggs <skeggsb@gmail.com> | 2008-05-27 00:59:41 +1000 |
commit | 0f9635d9d522ea712724415599ceb44d53e67819 (patch) | |
tree | 91484d00053baeb265d04a54a116229562194217 /src/gallium/auxiliary/pipebuffer/pb_bufmgr.h | |
parent | 8f67f98959261d193cb5f3db274b55fb24e2bb1e (diff) | |
parent | 253066d716e3039522eeb7b072811cccd89b4a82 (diff) |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/auxiliary/pipebuffer/pb_bufmgr.h')
-rw-r--r-- | src/gallium/auxiliary/pipebuffer/pb_bufmgr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h b/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h index 8de286e3f9..f6cc7a525b 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h +++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h @@ -50,7 +50,8 @@ #define PB_BUFMGR_H_ -#include <stddef.h> +#include "pipe/p_compiler.h" +#include "pipe/p_error.h" #ifdef __cplusplus @@ -68,7 +69,6 @@ struct pipe_winsys; */ struct pb_manager { - /* XXX: we will likely need more allocation flags */ struct pb_buffer * (*create_buffer)( struct pb_manager *mgr, size_t size, |