From 4f6223534fb970caf8ba98f2b1170ef239da1f88 Mon Sep 17 00:00:00 2001
From: teoxoy <28601907+teoxoy@users.noreply.github.com>
Date: Tue, 2 Jul 2024 19:20:38 +0200
Subject: [PATCH] take guard to render bundles at the top of
 `resolve_render_command_ids`

---
 wgpu-core/src/command/render_command.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/wgpu-core/src/command/render_command.rs b/wgpu-core/src/command/render_command.rs
index 9050039cb2..287aa888f1 100644
--- a/wgpu-core/src/command/render_command.rs
+++ b/wgpu-core/src/command/render_command.rs
@@ -138,6 +138,7 @@ impl RenderCommand {
         let bind_group_guard = hub.bind_groups.read();
         let query_set_guard = hub.query_sets.read();
         let pipelines_guard = hub.render_pipelines.read();
+        let render_bundles_guard = hub.render_bundles.read();
 
         let resolved_commands: Vec<ArcRenderCommand<A>> = commands
             .iter()
@@ -363,12 +364,12 @@ impl RenderCommand {
                     RenderCommand::EndOcclusionQuery => ArcRenderCommand::EndOcclusionQuery,
 
                     RenderCommand::ExecuteBundle(bundle) => ArcRenderCommand::ExecuteBundle(
-                        hub.render_bundles.read().get_owned(bundle).map_err(|_| {
-                            RenderPassError {
+                        render_bundles_guard
+                            .get_owned(bundle)
+                            .map_err(|_| RenderPassError {
                                 scope: PassErrorScope::ExecuteBundle,
                                 inner: RenderCommandError::InvalidRenderBundle(bundle).into(),
-                            }
-                        })?,
+                            })?,
                     ),
                 })
             })