diff options
author | Brian Paul <brianp@vmware.com> | 2009-02-10 16:34:51 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-02-10 16:34:51 -0700 |
commit | ee4c921b65fb76998711f3c40330505cbc49a0e0 (patch) | |
tree | b4c702af3d93a76e204a3aad012541d4fbcb2101 /src/gallium/auxiliary/pipebuffer/pb_bufmgr.h | |
parent | 767b1acbb757186bde30973394f256ab7498a075 (diff) | |
parent | 14d808f8fdc41a26cea5264e47a24c903e54ce93 (diff) |
Merge commit 'origin/gallium-0.2' into gallium-master-merge
Diffstat (limited to 'src/gallium/auxiliary/pipebuffer/pb_bufmgr.h')
-rw-r--r-- | src/gallium/auxiliary/pipebuffer/pb_bufmgr.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h b/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h index 0a8264a924..fec8db91c7 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h +++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h @@ -61,7 +61,6 @@ extern "C" { struct pb_desc; struct pipe_buffer; -struct pipe_winsys; /** @@ -163,6 +162,8 @@ pb_cache_manager_create(struct pb_manager *provider, unsigned usecs); +struct pb_fence_ops; + /** * Fenced buffer manager. * @@ -174,7 +175,7 @@ pb_cache_manager_create(struct pb_manager *provider, */ struct pb_manager * fenced_bufmgr_create(struct pb_manager *provider, - struct pipe_winsys *winsys); + struct pb_fence_ops *ops); struct pb_manager * |