diff options
author | Keith Whitwell <keithw@vmware.com> | 2009-02-10 19:22:57 +0000 |
---|---|---|
committer | Keith Whitwell <keithw@vmware.com> | 2009-02-10 19:22:57 +0000 |
commit | 9c9ba66fbae8089e9423f6b09ad1091cccf9b006 (patch) | |
tree | 81ecce3d6b19e5b77fcf31e5f081e1c546f398b9 /src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c | |
parent | ebb864da9e98003be9ea388013ae4385d341e46f (diff) | |
parent | 1e8177ee178b131afa86d874b062a8ae3fae0cca (diff) |
Merge commit 'origin/gallium-0.2' into gallium-0.2
Conflicts:
src/gallium/state_trackers/wgl/icd/stw_icd.c
Diffstat (limited to 'src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c')
-rw-r--r-- | src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c index 513ed28ca6..47e9fee533 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c +++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c @@ -122,7 +122,7 @@ fenced_bufmgr_destroy(struct pb_manager *mgr) struct pb_manager * fenced_bufmgr_create(struct pb_manager *provider, - struct pipe_winsys *winsys) + struct pb_fence_ops *ops) { struct fenced_pb_manager *fenced_mgr; @@ -138,7 +138,7 @@ fenced_bufmgr_create(struct pb_manager *provider, fenced_mgr->base.flush = fenced_bufmgr_flush; fenced_mgr->provider = provider; - fenced_mgr->fenced_list = fenced_buffer_list_create(winsys); + fenced_mgr->fenced_list = fenced_buffer_list_create(ops); if(!fenced_mgr->fenced_list) { FREE(fenced_mgr); return NULL; |