Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[glsl-out] Add stage postfix to generated global name #1616

Merged
merged 1 commit into from
Dec 24, 2021
Merged

[glsl-out] Add stage postfix to generated global name #1616

merged 1 commit into from
Dec 24, 2021

Conversation

Gordon-F
Copy link
Collaborator

Fix #1615

@mockersf mockersf mentioned this pull request Dec 20, 2021
Closed
kvark
kvark requested changes Dec 20, 2021
View reviewed changes
Copy link
Member

@kvark kvark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for this fix!
A few small things.

src/back/glsl/mod.rs Outdated Show resolved Hide resolved
src/front/wgsl/lexer.rs Outdated Show resolved Hide resolved
src/front/wgsl/lexer.rs Outdated Show resolved Hide resolved
@mockersf mockersf mentioned this pull request Dec 21, 2021
Closed
@Gordon-F Gordon-F requested a review from kvark December 23, 2021 17:42
@mockersf mockersf mentioned this pull request Dec 23, 2021
Merged
kvark
kvark approved these changes Dec 24, 2021
View reviewed changes
Copy link
Member

@kvark kvark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

src/back/glsl/mod.rs
impl ShaderStage {
fn to_str(self) -> &'static str {
match self {
ShaderStage::Compute => "cs",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: you can use Self:: here

@kvark kvark added the can backport PR that can be back-ported to a release branch label Dec 24, 2021
@kvark kvark merged commit 8df5421 into gfx-rs:master Dec 24, 2021
@kvark kvark mentioned this pull request Dec 25, 2021
Merged
@mockersf mockersf mentioned this pull request Dec 29, 2021
Closed
kvark pushed a commit to kvark/naga that referenced this pull request Dec 29, 2021
@Gordon-F @kvark
[glsl-out] Add stage postfix to generated global name (gfx-rs#1616)
5f8e54b
@kvark kvark mentioned this pull request Dec 29, 2021
Merged
@kvark
Copy link
Member

kvark commented Dec 29, 2021

published in 0.8.1

@kvark kvark removed the can backport PR that can be back-ported to a release branch label Dec 29, 2021
kvark pushed a commit that referenced this pull request Dec 29, 2021
@Gordon-F @kvark
[glsl-out] Add stage postfix to generated global name (#1616)
b580111
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kvark kvark kvark approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Shader translation error for wgpu shadow/water examples with GLES backend
2 participants
@Gordon-F @kvark