mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-05 04:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

shm: get_buffer: purge mismatching buffers in first buffer iteration

Browse source 
There's no longer any need to defer purging of mismatching buffer
(i.e. buffers whose width/height doesn't match the requested ones) to
after the cache lookup loop.
This commit is contained in:
Daniel Eklöf 2021-07-16 16:49:27 +02:00
parent 53851e13ec
commit 0751172b92
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 6 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

32
shm.c
View file

@ -519,10 +519,12 @@ shm_get_buffer(struct buffer_chain *chain, int width, int height)
tll_foreach(chain->bufs, it) {
struct buffer_private *buf = it->item;
if (buf->public.width != width)
continue;
if (buf->public.height != height)
if (buf->public.width != width || buf->public.height != height) {
LOG_DBG("purging mismatching buffer %p", (void *)buf);
if (buffer_unref_no_remove_from_chain(buf))
tll_remove(chain->bufs, it);
continue;
}
if (buf->busy)
buf->public.age++;
@ -559,18 +561,6 @@ shm_get_buffer(struct buffer_chain *chain, int width, int height)
if (cached != NULL)
return &cached->public;
/* Mark old buffers associated with this cookie for purging */
tll_foreach(chain->bufs, it) {
struct buffer_private *buf = it->item;
if (buf->public.width == width && buf->public.height == height)
continue;
LOG_DBG("marking buffer %p for purging", (void *)buf);
if (buffer_unref_no_remove_from_chain(buf))
tll_remove(chain->bufs, it);
}
struct buffer *ret;
get_new_buffers(chain, 1, &width, &height, &ret, false);
return ret;
@ -909,16 +899,6 @@ shm_unref(struct buffer *_buf)
}
}
void
shm_chain_purge(struct buffer_chain *chain)
{
tll_foreach(chain->bufs, it) {
struct buffer_private *buf = it->item;
if (buffer_unref_no_remove_from_chain(buf))
tll_remove(chain->bufs, it);
}
}
struct buffer_chain *
shm_chain_new(struct wl_shm *shm, bool scrollable, size_t pix_instances)
{
@ -938,6 +918,6 @@ shm_chain_free(struct buffer_chain *chain)
if (chain == NULL)
return;
shm_chain_purge(chain);
shm_purge(chain);
free(chain);
}