From: Brian Paul <brianp@vmware.com>
Date: Fri, 8 Mar 2019 21:08:13 +0000 (-0700)
Subject: llvmpipe: stop using pipe_sampler_view_release()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2ff2a5877454a5bcfb53cf3b0c07cda239f13f74;p=mesa.git

llvmpipe: stop using pipe_sampler_view_release()

This was used to avoid freeing a sampler view which was created by a
context that was already deleted.  But the state tracker does not
allow that.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Neha Bhende <bhenden@vmware.com>
Reviewed-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
Reviewed-By: Jose Fonseca <jfonseca@vmware.com>
---

diff --git a/src/gallium/drivers/llvmpipe/lp_state_sampler.c b/src/gallium/drivers/llvmpipe/lp_state_sampler.c
index c9aba1a8594..72823e4c84a 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_sampler.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_sampler.c
@@ -123,12 +123,6 @@ llvmpipe_set_sampler_views(struct pipe_context *pipe,
 
    /* set the new sampler views */
    for (i = 0; i < num; i++) {
-      /* Note: we're using pipe_sampler_view_release() here to work around
-       * a possible crash when the old view belongs to another context that
-       * was already destroyed.
-       */
-      pipe_sampler_view_release(pipe,
-                                &llvmpipe->sampler_views[shader][start + i]);
       /*
        * Warn if someone tries to set a view created in a different context
        * (which is why we need the hack above in the first place).