From: Marek Olšák <marek.olsak@amd.com>
Date: Mon, 22 Sep 2014 20:12:43 +0000 (+0200)
Subject: gallium/rbug: correctly unreference a sampler view
X-Git-Tag: upstream/17.1.0~23314
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f7714e0717250c6737accc6c8259c6d9107fd6e;p=platform%2Fupstream%2Fmesa.git

gallium/rbug: correctly unreference a sampler view

This fixes heap corruption. The sampler view can be bound in the context,
so we cannot call destroy directly.

Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/gallium/drivers/rbug/rbug_objects.c b/src/gallium/drivers/rbug/rbug_objects.c
index db18f2e..320f34d 100644
--- a/src/gallium/drivers/rbug/rbug_objects.c
+++ b/src/gallium/drivers/rbug/rbug_objects.c
@@ -153,8 +153,7 @@ rbug_sampler_view_destroy(struct rbug_context *rb_context,
                           struct rbug_sampler_view *rb_view)
 {
    pipe_resource_reference(&rb_view->base.texture, NULL);
-   rb_context->pipe->sampler_view_destroy(rb_context->pipe,
-                                          rb_view->sampler_view);
+   pipe_sampler_view_reference(&rb_view->sampler_view, NULL);
    FREE(rb_view);
 }