glsl-out: Call proper memory barrier functions #1680
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
Jan 21, 2022
src/back/glsl/mod.rs
Outdated
| writeln!(self.out, "{}groupMemoryBarrier();", level)?; | ||
| if flags.contains(crate::Barrier::STORAGE) { | ||
| writeln!(self.out, "{}memoryBarrierBuffer();", level)?; | ||
| writeln!(self.out, "{}memoryBarrierImage();", level)?; |
There was a problem hiding this comment.
I think the current semantics of crate::Barrier::STORAGE doesn't include images. Trying to clarify that with the group. So we should probably remove it for now.
There was a problem hiding this comment.
I decided to add the Image barrier after taking a look at the naga HLSL-out writer, which produces a DeviceMemoryBarrier() function call. Then I looked for more information and found this: https://github.com/microsoft/DirectXShaderCompiler/blob/master/docs/SPIR-V.rst#synchronization-intrinsics
Anyway, I will remove this for now.
kvark
approved these changes
Jan 21, 2022
kvark
pushed a commit
to kvark/naga
that referenced
this pull request
Jan 24, 2022
* glsl-out: Call proper memory barrier functions * glsl-out: Change test for control flow * Removed two unnecessary calls
Merged
kvark
pushed a commit
that referenced
this pull request
Jan 24, 2022
* glsl-out: Call proper memory barrier functions * glsl-out: Change test for control flow * Removed two unnecessary calls
|
published in 0.8.4 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This should fix #1677
OpenGL memory barriers and visibility are really confusing to me, but I spent some time researching to the best of my ability to make this correct: I started from https://www.khronos.org/opengl/wiki/Memory_Model#Ensuring_visibility and then read some extra questions/answers/blog posts around the net to confirm that I understood the khronos wiki correctly.
After the code change I did run
cargo test --all-features --workspaceand it reported no error, then I ranmake validate-glsland finally committed the new (modified) test output.Edit: P.S: the
barrier()GLSL function can only be called in a compute shader, but I am pretty sure this is fine because WGSL synchronization built-in functions can only be called in compute shaders anyway.