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

Use HLSL 2018 #4629

Merged
merged 1 commit into from
Nov 4, 2023
Merged

Use HLSL 2018 #4629

merged 1 commit into from
Nov 4, 2023

Conversation

daxpedda
Copy link
Contributor

@daxpedda daxpedda commented Nov 4, 2023

I found that Naga doesn't support HLSL 2021, which produces some shader errors.
This tells the DXC compiler to use HLSL 2018.

See #4498.

@daxpedda daxpedda requested a review from a team as a code owner November 4, 2023 16:24
cwfitzgerald
cwfitzgerald approved these changes Nov 4, 2023
View reviewed changes
Copy link
Member

@cwfitzgerald cwfitzgerald left a comment

Choose a reason for hiding this comment

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

Thanks!

cwfitzgerald
cwfitzgerald approved these changes Nov 4, 2023
View reviewed changes
Copy link
Member

@cwfitzgerald cwfitzgerald left a comment

Choose a reason for hiding this comment

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

Good after nits causing ci failure

wgpu-hal/src/dx12/shader_compilation.rs Outdated Show resolved Hide resolved
@cwfitzgerald cwfitzgerald enabled auto-merge (squash) November 4, 2023 19:45
@cwfitzgerald cwfitzgerald merged commit 9501ccc into gfx-rs:trunk Nov 4, 2023
27 checks passed
@daxpedda daxpedda mentioned this pull request Nov 9, 2023
Merged
Wumpf pushed a commit that referenced this pull request Nov 11, 2023
@daxpedda
Use HLSL 2018 (#4661)
4d85a8b 
Backport of #4629
cwfitzgerald pushed a commit that referenced this pull request Nov 15, 2023
@daxpedda @cwfitzgerald
Use HLSL 2018 (#4661)
1b93ff9 
Backport of #4629
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cwfitzgerald cwfitzgerald Awaiting requested review from cwfitzgerald

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

Successfully merging this pull request may close these issues.
2 participants
@daxpedda @cwfitzgerald