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.

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

Unconditionally Generate Bindless Samplers in DX12 #6766

Merged
merged 4 commits into from
Jan 21, 2025

Conversation

cwfitzgerald
Copy link
Member

@cwfitzgerald cwfitzgerald commented Dec 17, 2024

Connections

Closes #3350
Depends on #6847

This PR should be reviewed commit by commit.

Description

We go bindless on our samplers yo

  • Fix codegen of binding arrays of samplers.
  • wgpu-hal changes
  • Tests

@cwfitzgerald cwfitzgerald changed the title DX12 Unconditionally Generate Bindless Samplers Unconditionally Generate Bindless Samplers in DX12 Dec 17, 2024
@cwfitzgerald cwfitzgerald force-pushed the cw/dx12-sampler-bindless branch 3 times, most recently from 1564ef7 to 80bcb42 Compare December 19, 2024 02:13
@cwfitzgerald cwfitzgerald force-pushed the cw/dx12-sampler-bindless branch 2 times, most recently from 1ec761b to 6b4b92c Compare January 2, 2025 19:52
@cwfitzgerald cwfitzgerald marked this pull request as ready for review January 2, 2025 20:11
@cwfitzgerald cwfitzgerald requested a review from a team January 2, 2025 20:11
@cwfitzgerald cwfitzgerald requested a review from a team as a code owner January 2, 2025 20:11
@cwfitzgerald cwfitzgerald mentioned this pull request Jan 2, 2025
7 tasks
@cwfitzgerald cwfitzgerald force-pushed the cw/dx12-sampler-bindless branch 3 times, most recently from d740d53 to f0646c9 Compare January 2, 2025 20:39
@cwfitzgerald cwfitzgerald assigned teoxoy and unassigned jimblandy Jan 15, 2025
@teoxoy
Copy link
Member

teoxoy commented Jan 16, 2025

@cwfitzgerald it looks like there are some conflicts, could you rebase the PR?

@cwfitzgerald
Copy link
Member Author

Yeah I was just waiting for a review first, but if you want a rebase I can

@teoxoy
Copy link
Member

teoxoy commented Jan 16, 2025

It looks like it includes #6847 but with some differences so it makes it hard to look at the diff.

@cwfitzgerald
Copy link
Member Author

Oh yes - let me refactor that away

@cwfitzgerald cwfitzgerald force-pushed the cw/dx12-sampler-bindless branch from f0646c9 to f14ad9e Compare January 16, 2025 23:48
@cwfitzgerald
Copy link
Member Author

Sorry took a minute, good to go now.

Copy link
Member

@teoxoy teoxoy left a comment

Choose a reason for hiding this comment

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

This looks great overall!

tests/tests/samplers.rs Show resolved Hide resolved
tests/tests/samplers.rs Show resolved Hide resolved
naga/src/back/hlsl/writer.rs Show resolved Hide resolved
naga/src/back/hlsl/writer.rs Show resolved Hide resolved
wgpu-hal/src/dx12/sampler.rs Outdated Show resolved Hide resolved
wgpu-hal/src/dx12/device.rs Show resolved Hide resolved
wgpu-hal/src/dx12/device.rs Outdated Show resolved Hide resolved
wgpu-hal/src/dx12/device.rs Outdated Show resolved Hide resolved
wgpu-hal/src/dx12/device.rs Outdated Show resolved Hide resolved
wgpu-hal/src/dx12/device.rs Show resolved Hide resolved
@teoxoy

This comment was marked as resolved.

@cwfitzgerald cwfitzgerald requested a review from teoxoy January 21, 2025 18:49
Copy link
Member

@teoxoy teoxoy left a comment

Choose a reason for hiding this comment

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

Good stuff!

@cwfitzgerald cwfitzgerald merged commit 436f716 into gfx-rs:trunk Jan 21, 2025
31 checks passed
@cwfitzgerald cwfitzgerald deleted the cw/dx12-sampler-bindless branch January 21, 2025 19:24
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.

DX12 Sampler Heap Requirements Overly Strict
3 participants