}
-/**
- * Compute the bucket for this key.
+/**
+ * Compute the bucket for this key.
*/
-static INLINE unsigned
+static inline unsigned
svga_screen_cache_bucket(const struct svga_host_surface_cache_key *key)
{
- return util_hash_crc32( key, sizeof *key ) % SVGA_HOST_SURFACE_CACHE_BUCKETS;
+ return util_hash_crc32(key, sizeof *key) % SVGA_HOST_SURFACE_CACHE_BUCKETS;
}
* found, remove it from the cache and return the surface pointer.
* Return NULL otherwise.
*/
-static INLINE struct svga_winsys_surface *
+static struct svga_winsys_surface *
svga_screen_cache_lookup(struct svga_screen *svgascreen,
const struct svga_host_surface_cache_key *key)
{
curr = cache->bucket[bucket].next;
next = curr->next;
- while(curr != &cache->bucket[bucket]) {
+ while (curr != &cache->bucket[bucket]) {
++tries;
-
+
entry = LIST_ENTRY(struct svga_host_surface_cache_entry, curr, bucket_head);
assert(entry->handle);
-
- if(memcmp(&entry->key, key, sizeof *key) == 0 &&
- sws->fence_signalled( sws, entry->fence, 0 ) == 0) {
+
+ if (memcmp(&entry->key, key, sizeof *key) == 0 &&
+ sws->fence_signalled(sws, entry->fence, 0) == 0) {
unsigned surf_size;
assert(sws->surface_is_flushed(sws, entry->handle));
-
+
handle = entry->handle; /* Reference is transfered here. */
entry->handle = NULL;
-
+
LIST_DEL(&entry->bucket_head);
LIST_DEL(&entry->head);
-
+
LIST_ADD(&entry->head, &cache->empty);
/* update the cache size */
break;
}
- curr = next;
+ curr = next;
next = curr->next;
}
pipe_mutex_unlock(cache->mutex);
-
+
if (SVGA_DEBUG & DEBUG_DMA)
- debug_printf("%s: cache %s after %u tries (bucket %d)\n", __FUNCTION__,
+ debug_printf("%s: cache %s after %u tries (bucket %d)\n", __FUNCTION__,
handle ? "hit" : "miss", tries, bucket);
-
+
return handle;
}
{
struct svga_host_surface_cache *cache = &svgascreen->cache;
struct svga_winsys_screen *sws = svgascreen->sws;
- struct svga_host_surface_cache_entry *entry, *next_entry;
+ struct svga_host_surface_cache_entry *entry = NULL, *next_entry;
/* Walk over the list of unused buffers in reverse order: from oldest
* to newest.
}
-/*
+/**
* Transfers a handle reference.
*/
-
-static INLINE void
+static void
svga_screen_cache_add(struct svga_screen *svgascreen,
- const struct svga_host_surface_cache_key *key,
+ const struct svga_host_surface_cache_key *key,
struct svga_winsys_surface **p_handle)
{
struct svga_host_surface_cache *cache = &svgascreen->cache;
assert(key->cachable);
- assert(handle);
- if(!handle)
+ if (!handle)
return;
surf_size = surface_size(key);
}
}
- if(!LIST_IS_EMPTY(&cache->empty)) {
+ if (!LIST_IS_EMPTY(&cache->empty)) {
/* use the first empty entry */
- entry = LIST_ENTRY(struct svga_host_surface_cache_entry, cache->empty.next, head);
-
+ entry = LIST_ENTRY(struct svga_host_surface_cache_entry,
+ cache->empty.next, head);
+
LIST_DEL(&entry->head);
}
- else if(!LIST_IS_EMPTY(&cache->unused)) {
+ else if (!LIST_IS_EMPTY(&cache->unused)) {
/* free the last used buffer and reuse its entry */
- entry = LIST_ENTRY(struct svga_host_surface_cache_entry, cache->unused.prev, head);
+ entry = LIST_ENTRY(struct svga_host_surface_cache_entry,
+ cache->unused.prev, head);
SVGA_DBG(DEBUG_CACHE|DEBUG_DMA,
"unref sid %p (make space)\n", entry->handle);
LIST_DEL(&entry->head);
}
- if(entry) {
+ if (entry) {
entry->handle = handle;
memcpy(&entry->key, key, sizeof entry->key);
-
+
SVGA_DBG(DEBUG_CACHE|DEBUG_DMA,
"cache sid %p\n", entry->handle);
LIST_ADD(&entry->head, &cache->validated);
"unref sid %p (couldn't find space)\n", handle);
sws->surface_reference(sws, &handle, NULL);
}
-
+
pipe_mutex_unlock(cache->mutex);
}
curr = cache->validated.next;
next = curr->next;
- while(curr != &cache->validated) {
+ while (curr != &cache->validated) {
entry = LIST_ENTRY(struct svga_host_surface_cache_entry, curr, head);
assert(entry->handle);
- if(sws->surface_is_flushed(sws, entry->handle)) {
+ if (sws->surface_is_flushed(sws, entry->handle)) {
LIST_DEL(&entry->head);
-
+
svgascreen->sws->fence_reference(svgascreen->sws, &entry->fence, fence);
LIST_ADD(&entry->head, &cache->unused);
LIST_ADD(&entry->bucket_head, &cache->bucket[bucket]);
}
- curr = next;
+ curr = next;
next = curr->next;
}
}
+/**
+ * Free all the surfaces in the cache.
+ * Called when destroying the svga screen object.
+ */
void
svga_screen_cache_cleanup(struct svga_screen *svgascreen)
{
struct svga_host_surface_cache *cache = &svgascreen->cache;
struct svga_winsys_screen *sws = svgascreen->sws;
unsigned i;
-
- for(i = 0; i < SVGA_HOST_SURFACE_CACHE_SIZE; ++i) {
- if(cache->entries[i].handle) {
+
+ for (i = 0; i < SVGA_HOST_SURFACE_CACHE_SIZE; ++i) {
+ if (cache->entries[i].handle) {
SVGA_DBG(DEBUG_CACHE|DEBUG_DMA,
"unref sid %p (shutdown)\n", cache->entries[i].handle);
sws->surface_reference(sws, &cache->entries[i].handle, NULL);
cache->total_size -= surface_size(&cache->entries[i].key);
}
- if(cache->entries[i].fence)
- svgascreen->sws->fence_reference(svgascreen->sws, &cache->entries[i].fence, NULL);
+ if (cache->entries[i].fence)
+ svgascreen->sws->fence_reference(svgascreen->sws,
+ &cache->entries[i].fence, NULL);
}
-
+
pipe_mutex_destroy(cache->mutex);
}
assert(cache->total_size == 0);
pipe_mutex_init(cache->mutex);
-
- for(i = 0; i < SVGA_HOST_SURFACE_CACHE_BUCKETS; ++i)
+
+ for (i = 0; i < SVGA_HOST_SURFACE_CACHE_BUCKETS; ++i)
LIST_INITHEAD(&cache->bucket[i]);
LIST_INITHEAD(&cache->unused);
-
+
LIST_INITHEAD(&cache->validated);
-
+
LIST_INITHEAD(&cache->empty);
- for(i = 0; i < SVGA_HOST_SURFACE_CACHE_SIZE; ++i)
+ for (i = 0; i < SVGA_HOST_SURFACE_CACHE_SIZE; ++i)
LIST_ADDTAIL(&cache->entries[i].head, &cache->empty);
return PIPE_OK;
}
-
+
+/**
+ * Allocate a new host-side surface. If the surface is marked as cachable,
+ * first try re-using a surface in the cache of freed surfaces. Otherwise,
+ * allocate a new surface.
+ */
struct svga_winsys_surface *
svga_screen_surface_create(struct svga_screen *svgascreen,
struct svga_host_surface_cache_key *key)
boolean cachable = SVGA_SURFACE_CACHE_ENABLED && key->cachable;
SVGA_DBG(DEBUG_CACHE|DEBUG_DMA,
- "%s sz %dx%dx%d mips %d faces %d cachable %d\n",
+ "%s sz %dx%dx%d mips %d faces %d cachable %d\n",
__FUNCTION__,
key->size.width,
key->size.height,
* texture surface dimensions unchanged.
*/
uint32_t size = 1;
- while(size < key->size.width)
+ while (size < key->size.width)
size <<= 1;
key->size.width = size;
/* Since we're reusing buffers we're effectively transforming all
if (handle) {
if (key->format == SVGA3D_BUFFER)
SVGA_DBG(DEBUG_CACHE|DEBUG_DMA,
- "reuse sid %p sz %d (buffer)\n", handle,
+ "reuse sid %p sz %d (buffer)\n", handle,
key->size.width);
else
SVGA_DBG(DEBUG_CACHE|DEBUG_DMA,
- "reuse sid %p sz %dx%dx%d mips %d faces %d\n", handle,
+ "reuse sid %p sz %dx%dx%d mips %d faces %d\n", handle,
key->size.width,
key->size.height,
key->size.depth,
handle = sws->surface_create(sws,
key->flags,
key->format,
- key->size,
- key->numFaces,
+ key->cachable ?
+ 0 : SVGA_SURFACE_USAGE_SHARED,
+ key->size,
+ key->numFaces,
key->numMipLevels);
if (handle)
SVGA_DBG(DEBUG_CACHE|DEBUG_DMA,
- " CREATE sid %p sz %dx%dx%d\n",
- handle,
+ " CREATE sid %p sz %dx%dx%d\n",
+ handle,
key->size.width,
key->size.height,
key->size.depth);
}
+/**
+ * Release a surface. We don't actually free the surface- we put
+ * it into the cache of freed surfaces (if it's cachable).
+ */
void
svga_screen_surface_destroy(struct svga_screen *svgascreen,
const struct svga_host_surface_cache_key *key,
struct svga_winsys_surface **p_handle)
{
struct svga_winsys_screen *sws = svgascreen->sws;
-
+
/* We only set the cachable flag for surfaces of which we are the
* exclusive owner. So just hold onto our existing reference in
* that case.
*/
- if(SVGA_SURFACE_CACHE_ENABLED && key->cachable) {
+ if (SVGA_SURFACE_CACHE_ENABLED && key->cachable) {
svga_screen_cache_add(svgascreen, key, p_handle);
}
else {
sws->surface_reference(sws, p_handle, NULL);
}
}
+
+
+/**
+ * Print/dump the contents of the screen cache. For debugging.
+ */
+void
+svga_screen_cache_dump(const struct svga_screen *svgascreen)
+{
+ const struct svga_host_surface_cache *cache = &svgascreen->cache;
+ unsigned bucket;
+ unsigned count = 0;
+
+ debug_printf("svga3d surface cache:\n");
+ for (bucket = 0; bucket < SVGA_HOST_SURFACE_CACHE_BUCKETS; bucket++) {
+ struct list_head *curr;
+ curr = cache->bucket[bucket].next;
+ while (curr && curr != &cache->bucket[bucket]) {
+ struct svga_host_surface_cache_entry *entry =
+ LIST_ENTRY(struct svga_host_surface_cache_entry,
+ curr, bucket_head);
+ if (entry->key.format != 37) {
+ debug_printf(" %u x %u x %u format %u\n",
+ entry->key.size.width,
+ entry->key.size.height,
+ entry->key.size.depth,
+ entry->key.format);
+ }
+ curr = curr->next;
+ count++;
+ }
+ }
+
+ debug_printf("%u surfaces, %u bytes\n", count, cache->total_size);
+}
projects / mesa.git / blobdiff