diff options
| author | Michel Dänzer <[email protected]> | 2017-10-16 16:35:18 +0200 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2017-10-18 18:28:00 +0200 |
| commit | 7561da367baeb49c848dc49b65e252deb6428422 (patch) | |
| tree | b8cb6f3be16db6fe2bef58958fafde9d7663d39b /src/mesa | |
| parent | 47273d7312cb5b5b6b0b9faa814d574bbbce1c01 (diff) | |
st/mesa: Initialize textures array in st_framebuffer_validate
And just reference pipe_resources to it in the validate callbacks.
Avoids pipe_resource leaks when st_framebuffer_validate ends up calling
the validate callback multiple times, e.g. when a window is resized.
v2:
* Use generic stable tag instead of Fixes: tag, since the problem could
already happen before the commit referenced in v1 (Thomas Hellstrom)
* Use memset to initialize the array on the stack instead of allocating
the array with os_calloc.
Cc: [email protected]
Reviewed-by: Thomas Hellstrom <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/state_tracker/st_manager.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c index aef87ea8b75..eebde621837 100644 --- a/src/mesa/state_tracker/st_manager.c +++ b/src/mesa/state_tracker/st_manager.c @@ -190,6 +190,8 @@ st_framebuffer_validate(struct st_framebuffer *stfb, if (stfb->iface_stamp == new_stamp) return; + memset(textures, 0, stfb->num_statts * sizeof(textures[0])); + /* validate the fb */ do { if (!stfb->iface->validate(&st->iface, stfb->iface, stfb->statts, |