Mesa (staging/22.0): Revert "lavapipe: fix sampler + sampler view leaks."

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 6c73c6c4c4c5b6ac6121e3f29d2a78eb7cf05377
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6c73c6c4c4c5b6ac6121e3f29d2a78eb7cf05377

Author: Dylan Baker <dylan.c.baker at intel.com>
Date:   Wed Feb 23 13:25:51 2022 -0800

Revert "lavapipe: fix sampler + sampler view leaks."

This reverts commit 6836565db9a7109f5011d7803c8acded43264e1e.

---

 .pick_status.json                            |  2 +-
 src/gallium/frontends/lavapipe/lvp_execute.c | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 21d5fde0f65..464065ad802 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4486,7 +4486,7 @@
         "description": "lavapipe: fix sampler + sampler view leaks.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 1,
+        "resolution": 0,
         "main_sha": null,
         "because_sha": "e94fd4cc65899bccceb4642363bc4376c6831580"
     },
diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c
index 228aeb72662..d47f3ad4ba4 100644
--- a/src/gallium/frontends/lavapipe/lvp_execute.c
+++ b/src/gallium/frontends/lavapipe/lvp_execute.c
@@ -4116,18 +4116,6 @@ VkResult lvp_execute_cmds(struct lvp_device *device,
       }
    }
 
-   for (enum pipe_shader_type s = PIPE_SHADER_VERTEX; s < PIPE_SHADER_TYPES; s++) {
-      for (unsigned i = 0; i < PIPE_MAX_SAMPLERS; i++) {
-         if (state.sv[s][i])
-            pipe_sampler_view_reference(&state.sv[s][i], NULL);
-      }
-   }
-
-   for (unsigned i = 0; i < PIPE_MAX_SAMPLERS; i++) {
-      if (state.cso_ss_ptr[PIPE_SHADER_COMPUTE][i])
-         state.pctx->delete_sampler_state(state.pctx, state.ss_cso[PIPE_SHADER_COMPUTE][i]);
-   }
-
    free(state.imageless_views);
    free(state.pending_clear_aspects);
    free(state.cleared_views);