This repository has been archived by the owner on Jan 29, 2025. It is now read-only.
[hlsl-out] Implement switch statement #1265
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kvark
reviewed
Aug 20, 2021
src/back/hlsl/writer.rs
Outdated
| if case.fall_through { | ||
| writeln!(self.out, "{}/* fallthrough */", &indent_str_2)?; | ||
| writeln!(self.out, "{}{{", &indent_str_2)?; | ||
| writeln!(self.out, "{}break;", INDENT.repeat(indent + 3))?; |
There was a problem hiding this comment.
I don't understand. This goes into break and the other branch goes into break too?
There was a problem hiding this comment.
Sorry, misunderstood tint logic in fallthrough case. We should generate it in new block.
|
We'll need to release a patch after this is merged, for iced |
Gordon-F
commented
Aug 21, 2021
| @@ -425,7 +425,9 @@ fn convert_wgsl() { | |||
| ), | |||
| ( | |||
| "control-flow", | |||
| Targets::SPIRV | Targets::METAL | Targets::GLSL | Targets::HLSL | Targets::WGSL, | |||
| // TODO: SPIRV https://github.com/gfx-rs/naga/issues/1017 | |||
| //Targets::SPIRV | | |||
There was a problem hiding this comment.
Unfortunately, spv-out panic with the updated test. So, I decided to remove it for a while.
There was a problem hiding this comment.
I added test case here - #1017
thread 'main' panicked at 'called `Option::unwrap()` on a `None` value', src/back/spv/block.rs:1552:83
stack backtrace:
0: rust_begin_unwind
at /rustc/a178d0322ce20e33eac124758e837cbd80a6f633/library/std/src/panicking.rs:515:5
Gordon-F
commented
Aug 21, 2021
|
|
||
| // Write `break;` if the block isn't fallthrough | ||
| if !case.fall_through { | ||
| writeln!(self.out, "{}break;", INDENT.repeat(indent + 2))?; |
There was a problem hiding this comment.
That's not required, since return is present in IR for all cases.
kvark
reviewed
Aug 21, 2021
| @@ -425,7 +425,9 @@ fn convert_wgsl() { | |||
| ), | |||
| ( | |||
| "control-flow", | |||
| Targets::SPIRV | Targets::METAL | Targets::GLSL | Targets::HLSL | Targets::WGSL, | |||
| // TODO: SPIRV https://github.com/gfx-rs/naga/issues/1017 | |||
| //Targets::SPIRV | | |||
kvark
approved these changes
Aug 23, 2021
kvark
pushed a commit
to kvark/naga
that referenced
this pull request
Aug 24, 2021
* [hlsl-out] Implement switch statement * [hlsl-out] Implement switch statement * Add switch tests to control-flow snapshot
Merged
|
Included in v0.6.1 |
kvark
pushed a commit
that referenced
this pull request
Aug 24, 2021
* [hlsl-out] Implement switch statement * [hlsl-out] Implement switch statement * Add switch tests to control-flow snapshot
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #1261