diff options
author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-13 10:08:02 -0700 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-13 10:08:02 -0700 |
commit | 2f03ba4aad1718a36168550b6a146b79540252e6 (patch) | |
tree | 7bc55a8948f00c60ad2354171dd345e35e6ff741 /libdrm/dri_bufmgr.h | |
parent | 085df6491e4975681a6e17ff9a67d01268aa7553 (diff) | |
parent | b0e68829462aad00ce68be998da6313bca754e9a (diff) |
Merge branch 'master' into modesetting-gem
Conflicts:
libdrm/Makefile.am
libdrm/xf86drm.h
shared-core/i915_dma.c
shared-core/i915_irq.c
Diffstat (limited to 'libdrm/dri_bufmgr.h')
-rw-r--r-- | libdrm/dri_bufmgr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libdrm/dri_bufmgr.h b/libdrm/dri_bufmgr.h index 7a7dd6e9..2005bdc6 100644 --- a/libdrm/dri_bufmgr.h +++ b/libdrm/dri_bufmgr.h @@ -150,7 +150,7 @@ struct _dri_bufmgr { void (*post_submit)(dri_bo *batch_buf); - int (*check_aperture_space)(dri_bo *bo); + int (*check_aperture_space)(dri_bo **bo_array, int count); int debug; /**< Enables verbose debugging printouts */ }; @@ -173,6 +173,6 @@ void dri_bufmgr_destroy(dri_bufmgr *bufmgr); void *dri_process_relocs(dri_bo *batch_buf); void dri_post_process_relocs(dri_bo *batch_buf); void dri_post_submit(dri_bo *batch_buf); -int dri_bufmgr_check_aperture_space(dri_bo *bo); +int dri_bufmgr_check_aperture_space(dri_bo **bo_array, int count); #endif |