From: Brian Paul <brianp@vmware.com>
Date: Fri, 18 May 2012 21:32:10 +0000 (-0600)
Subject: st/mesa: use pipe_sampler_view_release() in st_destroy_context_priv()
X-Git-Tag: android-x86-4.4-r1~5695
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=239792fb221556fbc0da6c046541ea078b6944db;p=android-x86%2Fexternal-mesa.git

st/mesa: use pipe_sampler_view_release() in st_destroy_context_priv()

Fixes another case of sampler views being created by one context,
shared by another, then deleted by the first, leaving a dangling
pipe context pointer.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
---

diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index b4497652539..132dcc02f96 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -247,7 +247,7 @@ static void st_destroy_context_priv( struct st_context *st )
    st_destroy_drawtex(st);
 
    for (i = 0; i < Elements(st->state.sampler_views); i++) {
-      pipe_sampler_view_reference(&st->state.sampler_views[i], NULL);
+      pipe_sampler_view_release(st->pipe, &st->state.sampler_views[i]);
    }
 
    if (st->default_texture) {