diff options
author | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-18 19:06:20 +0100 |
---|---|---|
committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-18 19:07:33 +0100 |
commit | a8d1521f30766b6a4707aa9966e1f2f9c0b3ac00 (patch) | |
tree | 3d457d02a4d6167c2b720f8b55a59a32f33aaed9 /src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c | |
parent | 89ab66448e1bcd78caab6678261c2885dcff741c (diff) | |
parent | 0b8e19ffc51c29543796d4f1e3243e97d8c32671 (diff) |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/mesa/shader/slang/slang_link.c
Diffstat (limited to 'src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c')
-rw-r--r-- | src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c index 3ef72c5bbb..61ac291ed7 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c +++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c @@ -203,6 +203,13 @@ pool_bufmgr_create_buffer(struct pb_manager *mgr, static void +pool_bufmgr_flush(struct pb_manager *mgr) +{ + /* No-op */ +} + + +static void pool_bufmgr_destroy(struct pb_manager *mgr) { struct pool_pb_manager *pool = pool_pb_manager(mgr); @@ -238,6 +245,7 @@ pool_bufmgr_create(struct pb_manager *provider, pool->base.destroy = pool_bufmgr_destroy; pool->base.create_buffer = pool_bufmgr_create_buffer; + pool->base.flush = pool_bufmgr_flush; LIST_INITHEAD(&pool->free); |