summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2018-04-25 09:47:40 -0700
committerDylan Baker <dylan@pnwbakers.com>2018-04-27 10:11:58 -0700
commitf2b72b6fdc13be985c6c797346f62b169ab3a96b (patch)
treeee88528247e75b5cd2d55fa3577c219f7bddcdb9
parentd76507298fc3a3c14897d9d6e50311ba0cd0ca65 (diff)
gallium/util: Fix incorrect refcounting of separate stencil.
The driver may have a reference on the separate stencil buffer for some reason (like an unflushed job using it), so we can't directly free the resource and should instead just decrement the refcount that we own. Fixes double-free in KHR-GLES3.packed_depth_stencil.blit.depth32f_stencil8 on vc5. Fixes: e94eb5e6000e ("gallium/util: add u_transfer_helper") Reviewed-by: Rob Clark <robdclark@gmail.com> (cherry picked from commit 069c409f434ab215940aad2092d5d236b410a7b9)
-rw-r--r--src/gallium/auxiliary/util/u_transfer_helper.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/util/u_transfer_helper.c b/src/gallium/auxiliary/util/u_transfer_helper.c
index dd31049920f..3b085fd99f0 100644
--- a/src/gallium/auxiliary/util/u_transfer_helper.c
+++ b/src/gallium/auxiliary/util/u_transfer_helper.c
@@ -138,8 +138,7 @@ u_transfer_helper_resource_destroy(struct pipe_screen *pscreen,
if (helper->vtbl->get_stencil) {
struct pipe_resource *stencil = helper->vtbl->get_stencil(prsc);
- if (stencil)
- helper->vtbl->resource_destroy(pscreen, stencil);
+ pipe_resource_reference(&stencil, NULL);
}
helper->vtbl->resource_destroy(pscreen, prsc);