Skip to content

Check if source is empty when constructing hal::DebugSource (0.18 backport)#4693

Merged
cwfitzgerald merged 1 commit intogfx-rs:v0.18from
danielhjacobs:check-if-source-is-empty-v0.18
Nov 15, 2023
Merged

Check if source is empty when constructing hal::DebugSource (0.18 backport)#4693
cwfitzgerald merged 1 commit intogfx-rs:v0.18from
danielhjacobs:check-if-source-is-empty-v0.18

Conversation

@danielhjacobs
Copy link
Copy Markdown

Is this correct? I mostly based it on what @mcclure did in #4649, though I did git cherry-pick rather than hg graft.

Checklist

  • Run cargo clippy.
  • Run cargo clippy --target wasm32-unknown-unknown if applicable.
  • Add change to CHANGELOG.md. See simple instructions inside file.

Connections
This is the commit from #4642 cherry-picked onto a branch forked from the v0.18 branch, targeting that branch in gfx-rs/wgpu.

Testing
Tested the code example from #4569 with danielhjacobs@dfdb2f1 vs with https://github.com/gfx-rs/wgpu/tree/v0.18 (changing let module = naga::front::wgsl to let module = wgpu::naga::front::wgsl in the code example to fix the issue "note: naga::Module and wgpu::naga::Module have similar names, but are actually distinct types") and saw the panic was gone with this commit.

@danielhjacobs danielhjacobs requested a review from a team as a code owner November 15, 2023 16:19
@mcclure
Copy link
Copy Markdown

mcclure commented Nov 15, 2023

From where I'm sitting this seems to have worked better, next time I'll use git cherry-pick like a normal person lol

@cwfitzgerald cwfitzgerald merged commit 9aaa612 into gfx-rs:v0.18 Nov 15, 2023
cwfitzgerald pushed a commit that referenced this pull request Nov 15, 2023
… backport) (#4693)

Co-authored-by: Teodor Tanasoaia <28601907+teoxoy@users.noreply.github.com>
@danielhjacobs danielhjacobs deleted the check-if-source-is-empty-v0.18 branch November 15, 2023 19:59
@torokati44 torokati44 mentioned this pull request Dec 16, 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.

4 participants