diff options
| author | Eric Anholt <eric@anholt.net> | 2007-11-30 14:15:36 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-11-30 18:06:32 -0800 |
| commit | ddd92ee9a173bbb087ef67b4a36ac231e30c941f (patch) | |
| tree | 3ba69febea9c2da14da922a402966aceab5eb890 /src/mesa/drivers/dri/common/dri_bufmgr.c | |
| parent | 6f8dee03aaeab67532bbadef27f9e2a91e0022d8 (diff) | |
[intel] Fix the type and naming of the flags/mask args to TTM functions.
The uint64_t flags (as defined by drm.h) were being used as unsigned ints in
many places.
Diffstat (limited to 'src/mesa/drivers/dri/common/dri_bufmgr.c')
| -rw-r--r-- | src/mesa/drivers/dri/common/dri_bufmgr.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/common/dri_bufmgr.c b/src/mesa/drivers/dri/common/dri_bufmgr.c index 72a4a17150..757a237494 100644 --- a/src/mesa/drivers/dri/common/dri_bufmgr.c +++ b/src/mesa/drivers/dri/common/dri_bufmgr.c @@ -35,7 +35,7 @@ dri_bo * dri_bo_alloc(dri_bufmgr *bufmgr, const char *name, unsigned long size, - unsigned int alignment, unsigned int location_mask) + unsigned int alignment, uint64_t location_mask) { assert((location_mask & ~(DRM_BO_FLAG_MEM_LOCAL | DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_MEM_VRAM | DRM_BO_FLAG_MEM_PRIV0 | @@ -48,7 +48,7 @@ dri_bo_alloc(dri_bufmgr *bufmgr, const char *name, unsigned long size, dri_bo * dri_bo_alloc_static(dri_bufmgr *bufmgr, const char *name, unsigned long offset, unsigned long size, void *virtual, - unsigned int location_mask) + uint64_t location_mask) { assert((location_mask & ~(DRM_BO_FLAG_MEM_LOCAL | DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_MEM_VRAM | DRM_BO_FLAG_MEM_PRIV0 | @@ -139,9 +139,10 @@ dri_bufmgr_destroy(dri_bufmgr *bufmgr) } -void dri_emit_reloc(dri_bo *batch_buf, GLuint flags, GLuint delta, GLuint offset, dri_bo *relocatee) +void dri_emit_reloc(dri_bo *reloc_buf, uint64_t flags, GLuint delta, + GLuint offset, dri_bo *target_buf) { - batch_buf->bufmgr->emit_reloc(batch_buf, flags, delta, offset, relocatee); + reloc_buf->bufmgr->emit_reloc(reloc_buf, flags, delta, offset, target_buf); } void *dri_process_relocs(dri_bo *batch_buf, GLuint *count) |