diff options
author | Marek Olšák <[email protected]> | 2014-10-16 23:19:59 +0200 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2014-10-16 23:31:20 +0200 |
commit | 833d698ad5d7dc7598b798653e1413f4379ec476 (patch) | |
tree | 7873ec2270c92ba66605dd951b0a201d5b75c5e9 /src/mesa/state_tracker/st_vdpau.c | |
parent | 63c6509ad2e2707cca0ff3ba6fbc5582c3e2eea5 (diff) |
st/mesa: use pipe_sampler_view_release for releasing sampler views
This fixes a crash when exiting Firefox. I have really no idea how Firefox
does it. It seems to involve multiple contexts and multithreading.
v2: added an XXX comment
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81680
Acked by Christian König.
Cc: 10.2 10.3 <[email protected]>
Tested-by: Benjamin Bellec <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker/st_vdpau.c')
-rw-r--r-- | src/mesa/state_tracker/st_vdpau.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_vdpau.c b/src/mesa/state_tracker/st_vdpau.c index 8c10cdaf38b..6ccaf3e3f18 100644 --- a/src/mesa/state_tracker/st_vdpau.c +++ b/src/mesa/state_tracker/st_vdpau.c @@ -139,7 +139,7 @@ st_vdpau_map_surface(struct gl_context *ctx, GLenum target, GLenum access, texFormat); pipe_resource_reference(&stObj->pt, res); - st_texture_release_all_sampler_views(stObj); + st_texture_release_all_sampler_views(st, stObj); pipe_resource_reference(&stImage->pt, res); u_sampler_view_default_template(&templ, res, res->format); @@ -172,7 +172,7 @@ st_vdpau_unmap_surface(struct gl_context *ctx, GLenum target, GLenum access, struct st_texture_image *stImage = st_texture_image(texImage); pipe_resource_reference(&stObj->pt, NULL); - st_texture_release_all_sampler_views(stObj); + st_texture_release_all_sampler_views(st, stObj); pipe_resource_reference(&stImage->pt, NULL); _mesa_dirty_texobj(ctx, texObj); |