[DX12] Add support for Samplers in DX12.#1331
Open
manon-traverse wants to merge 10 commits into
Open
Conversation
manon-traverse
force-pushed
the
dx12-sampler-support
branch
from
d082a3c to
0609be6
Compare
manon-traverse
force-pushed
the
dx12-sampler-support
branch
from
0609be6 to
273e4a5
Compare
This was referenced Jun 24, 2026
manon-traverse
force-pushed
the
dx12-sampler-support
branch
from
273e4a5 to
909509e
Compare
manon-traverse
force-pushed
the
dx12-sampler-support
branch
from
14ea640 to
99062f2
Compare
EmilioLaiso
approved these changes
Jun 26, 2026
Comment on lines
+324
to
+341
| enum class RootParameterType : uint32_t { | ||
| DescriptorTable = 0, | ||
| SamplerTable, | ||
| Constant, | ||
| CBV, | ||
| SRV, | ||
| UAV, | ||
| }; | ||
|
|
||
| struct RoogtSignatureLayout { | ||
| RootParameterType ParameterType : 3; | ||
| uint32_t Count : 29; | ||
|
|
||
| RoogtSignatureLayout(RootParameterType ParameterType, uint32_t Count) | ||
| : ParameterType(ParameterType), Count(Count) {} | ||
| RoogtSignatureLayout() = delete; | ||
| }; | ||
|
|
Collaborator
There was a problem hiding this comment.
Could've probably been two PRs, but at least this way it doesn't only introduces new API but it also shows how it's used
manon-traverse
force-pushed
the
dx12-sampler-support
branch
from
8095bff to
3c20e02
Compare
MarijnS95
reviewed
Jun 29, 2026
Comment on lines
-108
to
-113
| // Depth formats require DepthStencil usage; non-depth formats forbid it. | ||
| if (IsDepth && !IsDS) | ||
| return llvm::createStringError( | ||
| std::errc::invalid_argument, | ||
| "Depth format '%s' requires DepthStencil usage.", | ||
| getFormatName(Desc.Fmt).data()); |
Collaborator
There was a problem hiding this comment.
Out of scope / unrelated?
Contributor
Author
There was a problem hiding this comment.
Some of the sampler tests failed on textures with a depth format, but without a depth stencil format being created. While this is unusual, it's not incorrect.
MarijnS95
reviewed
Jun 29, 2026
MarijnS95
reviewed
Jun 29, 2026
MarijnS95
left a comment
MarijnS95
left a comment
Collaborator
There was a problem hiding this comment.
A few more, on top of the inline notes:
Texture.h— dropping the "depth format requires DepthStencil usage" check is unrelated to samplers, and the depth-as-SRV path it enables still isn't correct (typedD32_FLOATcan't back an SRV withoutTYPELESS; those tests stayXFAIL). Maybe split out.- Implicit fallback now hard-errors on shader-embedded inline descriptors / root constants when no explicit
RootParametersare given (previously bound each set as a table). No test hits it, but it's a behavior change. assert(... "Manon expected this to be 1.")silently caps sampler arrays at 1 — prefer a realcreateStringErrorstating the invariant.RoogtSignatureLayout(and the error stringRootParamters) is misspelled.
Cleared on inspection: SamplerCreateDesc brace-init order matches the struct, the filter/comparison/address enum mappings are correct, and the 256-cap SamplerAllocator matches the existing allocator pattern.
bob80905
reviewed
Jun 29, 2026
| break; | ||
| case DescriptorKind::SAMPLER: | ||
| llvm_unreachable("Not implemented yet."); // Requires a separate heap | ||
| llvm_unreachable("Sampler should have been filtered out."); |
Contributor
There was a problem hiding this comment.
I would think this is dead code because of the continue on line 1425
Contributor
Author
There was a problem hiding this comment.
Yes, which is why I put the unreachable statement there. I want all cases to be handled instead of relying on the default case label.
manon-traverse
force-pushed
the
dx12-sampler-support
branch
from
3c20e02 to
e4f4978
Compare
MarijnS95
approved these changes
Jun 30, 2026
Contributor
|
Tagging @alsepkow for awareness. |
bogner
approved these changes
Jul 6, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Adds support for samplers in DX12.
This change is a lot larger than you would expect from adding samplers.
This is because samplers need to live in a separate DescriptorHeap which cascaded into a couple of issues:
Adding this feature does allow more tests to succeed on DX12.