Skip to content

Check if source is empty when constructing hal::DebugSource#4642

Merged
teoxoy merged 1 commit intotrunkfrom
check-if-source-is-empty
Nov 6, 2023
Merged

Check if source is empty when constructing hal::DebugSource#4642
teoxoy merged 1 commit intotrunkfrom
check-if-source-is-empty

Conversation

@teoxoy
Copy link
Copy Markdown
Member

@teoxoy teoxoy commented Nov 6, 2023

Fixes #4569

@teoxoy teoxoy added the PR: needs back-porting PR with a fix that needs to land on crates label Nov 6, 2023
@teoxoy teoxoy requested a review from a team as a code owner November 6, 2023 12:39
@robtfm
Copy link
Copy Markdown
Collaborator

robtfm commented Nov 6, 2023

this still crashes for me at the same place.

you can try with cargo test on this branch if it helps, i changed the cargo.toml like so:

diff --git a/Cargo.toml b/Cargo.toml
index c7b8c62..51671ae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ prune = []
 allow_deprecated = []
 
 [dependencies]
-naga = { version = "0.14", features = ["wgsl-in", "wgsl-out", "clone", "span"] }
+naga = { git = "https://github.com/gfx-rs/wgpu", branch = "check-if-source-is-empty", features = ["wgsl-in", "wgsl-out", "clone", "span"] }
 tracing = "0.1"
 regex = "1.8"
 regex-syntax = "0.7"
@@ -34,3 +34,6 @@ indexmap = "2"
 wgpu = { version = "0.18", features = ["naga"] }
 futures-lite = "1"
 tracing-subscriber = { version = "0.3", features = ["std", "fmt"] }
+
+[patch.crates-io]
+naga = { git = "https://github.com/gfx-rs/wgpu", branch = "check-if-source-is-empty" }

i don't see any base naga in my tree so i think that worked.

@teoxoy
Copy link
Copy Markdown
Member Author

teoxoy commented Nov 6, 2023

The fix is in wgpu, not naga.

@robtfm
Copy link
Copy Markdown
Collaborator

robtfm commented Nov 6, 2023

apologies, works perfectly.

@teoxoy teoxoy merged commit 261cb7c into trunk Nov 6, 2023
@teoxoy teoxoy deleted the check-if-source-is-empty branch November 6, 2023 13:32
@cwfitzgerald cwfitzgerald removed the PR: needs back-porting PR with a fix that needs to land on crates label Nov 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

crash from naga::spv::back with wgsl compute shader

4 participants