summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary/util
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2012-11-30 10:10:25 -0700
committerBrian Paul <brianp@vmware.com>2012-11-30 12:08:07 -0700
commit51223784d6a8ee93cf004c9ba87a7e4dcb7b3161 (patch)
treefcea139431d2f36e22917cb1fc24065ce756a330 /src/gallium/auxiliary/util
parentc73245882c7ff1277b190b97f093f7b423a22f10 (diff)
downloadexternal_mesa3d-51223784d6a8ee93cf004c9ba87a7e4dcb7b3161.zip
external_mesa3d-51223784d6a8ee93cf004c9ba87a7e4dcb7b3161.tar.gz
external_mesa3d-51223784d6a8ee93cf004c9ba87a7e4dcb7b3161.tar.bz2
util: added pipe_surface_release() function
To fix a pipe_context::surface_destroy() use-after-free problem. We previously added pipe_sampler_view_release() for similar reasons. Note: this is a candidate for the stable branches. Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'src/gallium/auxiliary/util')
-rw-r--r--src/gallium/auxiliary/util/u_inlines.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/util/u_inlines.h b/src/gallium/auxiliary/util/u_inlines.h
index 6ef5fec..cb06ee2 100644
--- a/src/gallium/auxiliary/util/u_inlines.h
+++ b/src/gallium/auxiliary/util/u_inlines.h
@@ -114,6 +114,22 @@ pipe_surface_reference(struct pipe_surface **ptr, struct pipe_surface *surf)
*ptr = surf;
}
+/**
+ * Similar to pipe_surface_reference() but always set the pointer to NULL
+ * and pass in an explicit context. The explicit context avoids the problem
+ * of using a deleted context's surface_destroy() method when freeing a surface
+ * that's shared by multiple contexts.
+ */
+static INLINE void
+pipe_surface_release(struct pipe_context *pipe, struct pipe_surface **ptr)
+{
+ if (pipe_reference_described(&(*ptr)->reference, NULL,
+ (debug_reference_descriptor)debug_describe_surface))
+ pipe->surface_destroy(pipe, *ptr);
+ *ptr = NULL;
+}
+
+
static INLINE void
pipe_resource_reference(struct pipe_resource **ptr, struct pipe_resource *tex)
{