diff options
| author | Aapo Tahkola <aet@rasterburn.org> | 2006-01-27 13:05:56 +0000 |
|---|---|---|
| committer | Aapo Tahkola <aet@rasterburn.org> | 2006-01-27 13:05:56 +0000 |
| commit | a7bd2563c3ede7db0b06c61788a11b2a09583e0d (patch) | |
| tree | 027497d885245a5b3583f6e44507c41f629478e5 /src/mesa/drivers/dri/r300/radeon_mm.h | |
| parent | 875df252a7aac1f2a615e17ce168cc2e6360bed2 (diff) | |
drop all that (slow) locking stuff and make u_list per context.
Diffstat (limited to 'src/mesa/drivers/dri/r300/radeon_mm.h')
| -rw-r--r-- | src/mesa/drivers/dri/r300/radeon_mm.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r300/radeon_mm.h b/src/mesa/drivers/dri/r300/radeon_mm.h index 637ecb1dda..5fdeac52a7 100644 --- a/src/mesa/drivers/dri/r300/radeon_mm.h +++ b/src/mesa/drivers/dri/r300/radeon_mm.h @@ -10,7 +10,6 @@ struct radeon_memory_manager { uint32_t vb_age; - /*uint32_t ages[1024];*/ struct { void *ptr; @@ -19,15 +18,20 @@ struct radeon_memory_manager { uint32_t h_pending; int pending; int mapped; - } u_list[/*4096*/2048]; - int u_head, u_tail, u_size; + int ref_count; + struct mem_block *fb; + } *u_list; + int u_head, u_tail, u_size, u_last; }; extern void radeon_mm_init(r300ContextPtr rmesa); extern void *radeon_mm_ptr(r300ContextPtr rmesa, int id); +extern int radeon_mm_find(r300ContextPtr rmesa, void *ptr); extern int radeon_mm_alloc(r300ContextPtr rmesa, int alignment, int size); extern void radeon_mm_use(r300ContextPtr rmesa, int id); +extern unsigned long radeon_mm_offset(r300ContextPtr rmesa, int id); +extern int radeon_mm_on_card(r300ContextPtr rmesa, int id); extern void *radeon_mm_map(r300ContextPtr rmesa, int id, int access); extern void radeon_mm_unmap(r300ContextPtr rmesa, int id); extern void radeon_mm_free(r300ContextPtr rmesa, int id); |