diff options
author | Eric Anholt <eric@anholt.net> | 2010-06-07 09:52:57 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2010-06-08 13:42:02 -0700 |
commit | 34474fa4119378ef9fbb9fb557cc19c0a1ca1f7e (patch) | |
tree | 0d0a246b981cc60fc70d6cf6103b05d0df045c23 /src/mesa/drivers/dri/i965/brw_state_cache.c | |
parent | 22409756d4ed941f2ec6729ab0c312149749106f (diff) |
intel: Change dri_bo_* to drm_intel_bo* to consistently use new API.
The slightly less mechanical change of converting the emit_reloc calls
will follow.
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_state_cache.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_state_cache.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_state_cache.c b/src/mesa/drivers/dri/i965/brw_state_cache.c index c4431b5a32..415b645665 100644 --- a/src/mesa/drivers/dri/i965/brw_state_cache.c +++ b/src/mesa/drivers/dri/i965/brw_state_cache.c @@ -93,14 +93,14 @@ hash_key(struct brw_cache_item *item) */ static void update_cache_last(struct brw_cache *cache, enum brw_cache_id cache_id, - dri_bo *bo) + drm_intel_bo *bo) { if (bo == cache->last_bo[cache_id]) return; /* no change */ - dri_bo_unreference(cache->last_bo[cache_id]); + drm_intel_bo_unreference(cache->last_bo[cache_id]); cache->last_bo[cache_id] = bo; - dri_bo_reference(cache->last_bo[cache_id]); + drm_intel_bo_reference(cache->last_bo[cache_id]); cache->brw->state.dirty.cache |= 1 << cache_id; } @@ -114,7 +114,7 @@ brw_cache_item_equals(const struct brw_cache_item *a, (memcmp(a->key, b->key, a->key_size) == 0) && a->nr_reloc_bufs == b->nr_reloc_bufs && (memcmp(a->reloc_bufs, b->reloc_bufs, - a->nr_reloc_bufs * sizeof(dri_bo *)) == 0); + a->nr_reloc_bufs * sizeof(drm_intel_bo *)) == 0); } static struct brw_cache_item * @@ -168,12 +168,12 @@ rehash(struct brw_cache *cache) /** * Returns the buffer object matching cache_id and key, or NULL. */ -dri_bo * +drm_intel_bo * brw_search_cache(struct brw_cache *cache, enum brw_cache_id cache_id, const void *key, GLuint key_size, - dri_bo **reloc_bufs, GLuint nr_reloc_bufs, + drm_intel_bo **reloc_bufs, GLuint nr_reloc_bufs, void *aux_return) { struct brw_cache_item *item; @@ -198,7 +198,7 @@ brw_search_cache(struct brw_cache *cache, update_cache_last(cache, cache_id, item->bo); - dri_bo_reference(item->bo); + drm_intel_bo_reference(item->bo); return item->bo; } @@ -208,7 +208,7 @@ brw_upload_cache_with_auxdata(struct brw_cache *cache, enum brw_cache_id cache_id, const void *key, GLuint key_size, - dri_bo **reloc_bufs, + drm_intel_bo **reloc_bufs, GLuint nr_reloc_bufs, const void *data, GLuint data_size, @@ -218,9 +218,9 @@ brw_upload_cache_with_auxdata(struct brw_cache *cache, { struct brw_cache_item *item = CALLOC_STRUCT(brw_cache_item); GLuint hash; - GLuint relocs_size = nr_reloc_bufs * sizeof(dri_bo *); + GLuint relocs_size = nr_reloc_bufs * sizeof(drm_intel_bo *); void *tmp; - dri_bo *bo; + drm_intel_bo *bo; int i; item->cache_id = cache_id; @@ -232,8 +232,8 @@ brw_upload_cache_with_auxdata(struct brw_cache *cache, item->hash = hash; /* Create the buffer object to contain the data */ - bo = dri_bo_alloc(cache->brw->intel.bufmgr, - cache->name[cache_id], data_size, 1 << 6); + bo = drm_intel_bo_alloc(cache->brw->intel.bufmgr, + cache->name[cache_id], data_size, 1 << 6); /* Set up the memory containing the key, aux_data, and reloc_bufs */ @@ -244,14 +244,14 @@ brw_upload_cache_with_auxdata(struct brw_cache *cache, memcpy(tmp + key_size + aux_size, reloc_bufs, relocs_size); for (i = 0; i < nr_reloc_bufs; i++) { if (reloc_bufs[i] != NULL) - dri_bo_reference(reloc_bufs[i]); + drm_intel_bo_reference(reloc_bufs[i]); } item->key = tmp; item->reloc_bufs = tmp + key_size + aux_size; item->bo = bo; - dri_bo_reference(bo); + drm_intel_bo_reference(bo); if (cache->n_items > cache->size * 1.5) rehash(cache); @@ -271,7 +271,7 @@ brw_upload_cache_with_auxdata(struct brw_cache *cache, data_size, cache_id); /* Copy data to the buffer */ - dri_bo_subdata(bo, 0, data_size, data); + drm_intel_bo_subdata(bo, 0, data_size, data); update_cache_last(cache, cache_id, bo); @@ -283,7 +283,7 @@ brw_upload_cache(struct brw_cache *cache, enum brw_cache_id cache_id, const void *key, GLuint key_size, - dri_bo **reloc_bufs, + drm_intel_bo **reloc_bufs, GLuint nr_reloc_bufs, const void *data, GLuint data_size) @@ -306,15 +306,15 @@ brw_upload_cache(struct brw_cache *cache, * If aux data is involved, use search/upload instead. */ -dri_bo * +drm_intel_bo * brw_cache_data(struct brw_cache *cache, enum brw_cache_id cache_id, const void *data, GLuint data_size, - dri_bo **reloc_bufs, + drm_intel_bo **reloc_bufs, GLuint nr_reloc_bufs) { - dri_bo *bo; + drm_intel_bo *bo; struct brw_cache_item *item, lookup; GLuint hash; @@ -329,7 +329,7 @@ brw_cache_data(struct brw_cache *cache, item = search_cache(cache, hash, &lookup); if (item) { update_cache_last(cache, cache_id, item->bo); - dri_bo_reference(item->bo); + drm_intel_bo_reference(item->bo); return item->bo; } @@ -437,8 +437,8 @@ brw_clear_cache(struct brw_context *brw, struct brw_cache *cache) next = c->next; for (j = 0; j < c->nr_reloc_bufs; j++) - dri_bo_unreference(c->reloc_bufs[j]); - dri_bo_unreference(c->bo); + drm_intel_bo_unreference(c->reloc_bufs[j]); + drm_intel_bo_unreference(c->bo); free((void *)c->key); free(c); } @@ -463,7 +463,7 @@ brw_clear_cache(struct brw_context *brw, struct brw_cache *cache) * at the cost of walking the entire hash table. */ void -brw_state_cache_bo_delete(struct brw_cache *cache, dri_bo *bo) +brw_state_cache_bo_delete(struct brw_cache *cache, drm_intel_bo *bo) { struct brw_cache_item **prev; GLuint i; @@ -481,8 +481,8 @@ brw_state_cache_bo_delete(struct brw_cache *cache, dri_bo *bo) *prev = c->next; for (j = 0; j < c->nr_reloc_bufs; j++) - dri_bo_unreference(c->reloc_bufs[j]); - dri_bo_unreference(c->bo); + drm_intel_bo_unreference(c->reloc_bufs[j]); + drm_intel_bo_unreference(c->bo); free((void *)c->key); free(c); cache->n_items--; @@ -520,7 +520,7 @@ brw_destroy_cache(struct brw_context *brw, struct brw_cache *cache) brw_clear_cache(brw, cache); for (i = 0; i < BRW_MAX_CACHE; i++) { - dri_bo_unreference(cache->last_bo[i]); + drm_intel_bo_unreference(cache->last_bo[i]); free(cache->name[i]); } free(cache->items); |