From c353e6ed2c658c66b981fdd25f4ed5d70c541572 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Wed, 6 Aug 2025 17:10:58 +0200 Subject: [PATCH] rusticl: use pipe_sampler_view_release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: a245ed462ac ("rusticl/mesa: use pipe_sampler_view_reference") Suggested-by: Seán de Búrca Part-of: (cherry picked from commit cfd8b9d3b33c0c93bb5a82b8d5b138577dd4204a) --- .pick_status.json | 2 +- src/gallium/frontends/rusticl/mesa/pipe/context.rs | 2 +- src/gallium/frontends/rusticl/mesa/pipe/resource.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index cbfdb211340..0eaabd60e04 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3144,7 +3144,7 @@ "description": "rusticl: use pipe_sampler_view_release", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "a245ed462ac9729b2c3d568ed0c9e0cd3eb70273", "notes": null diff --git a/src/gallium/frontends/rusticl/mesa/pipe/context.rs b/src/gallium/frontends/rusticl/mesa/pipe/context.rs index d99803ad539..ef4feb1a8e1 100644 --- a/src/gallium/frontends/rusticl/mesa/pipe/context.rs +++ b/src/gallium/frontends/rusticl/mesa/pipe/context.rs @@ -660,7 +660,7 @@ fn has_required_cbs(context: &pipe_context) -> bool { & has_required_feature!(context, launch_grid) & has_required_feature!(context, memory_barrier) & has_required_feature!(context, resource_copy_region) - // implicitly used through pipe_sampler_view_reference + // implicitly used through pipe_sampler_view_release & has_required_feature!(context, sampler_view_destroy) & has_required_feature!(context, set_constant_buffer) & has_required_feature!(context, set_global_binding) diff --git a/src/gallium/frontends/rusticl/mesa/pipe/resource.rs b/src/gallium/frontends/rusticl/mesa/pipe/resource.rs index cdd2ffe9ab3..173d57fb84b 100644 --- a/src/gallium/frontends/rusticl/mesa/pipe/resource.rs +++ b/src/gallium/frontends/rusticl/mesa/pipe/resource.rs @@ -326,7 +326,7 @@ impl<'c, 'r> PipeSamplerView<'c, 'r> { impl Drop for PipeSamplerView<'_, '_> { fn drop(&mut self) { unsafe { - pipe_sampler_view_reference(&mut self.view.as_ptr(), ptr::null_mut()); + pipe_sampler_view_release(self.view.as_ptr()); } } }