OSDN Git Service

gallium/util: Fix incorrect refcounting of separate stencil.
authorEric Anholt <eric@anholt.net>
Wed, 25 Apr 2018 16:47:40 +0000 (09:47 -0700)
committerEric Anholt <eric@anholt.net>
Wed, 25 Apr 2018 19:14:33 +0000 (12:14 -0700)
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>
src/gallium/auxiliary/util/u_transfer_helper.c

index dd31049..3b085fd 100644 (file)
@@ -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);