Skip to content

[DXContainer] Update DXContainer to match D3D12 spec #143201

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

Merged
merged 3 commits into from
Jun 17, 2025
Merged

[DXContainer] Update DXContainer to match D3D12 spec #143201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f069c7
fix
Jun 6, 2025
35a2e0b
fix other values
Jun 11, 2025
199c0cb
removing shifts from values in dxcontainer related to root signature
Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions llvm/include/llvm/BinaryFormat/DXContainer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,17 +154,17 @@ enum class FeatureFlags : uint64_t {
static_assert((uint64_t)FeatureFlags::NextUnusedBit <= 1ull << 63,
"Shader flag bits exceed enum size.");

#define ROOT_ELEMENT_FLAG(Num, Val) Val = 1ull << Num,
#define ROOT_ELEMENT_FLAG(Num, Val) Val = Num,
enum class RootElementFlag : uint32_t {
#include "DXContainerConstants.def"
};

#define ROOT_DESCRIPTOR_FLAG(Num, Val) Val = 1ull << Num,
#define ROOT_DESCRIPTOR_FLAG(Num, Val) Val = Num,
enum class RootDescriptorFlag : uint32_t {
#include "DXContainerConstants.def"
};

#define DESCRIPTOR_RANGE_FLAG(Num, Val) Val = 1ull << Num,
#define DESCRIPTOR_RANGE_FLAG(Num, Val) Val = Num,
enum class DescriptorRangeFlag : uint32_t {
#include "DXContainerConstants.def"
};
Expand Down
41 changes: 21 additions & 20 deletions llvm/include/llvm/BinaryFormat/DXContainerConstants.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,19 @@ SHADER_FEATURE_FLAG(33, 39, NextUnusedBit, "Next reserved shader flag bit (not a
// ROOT_ELEMENT_FLAG(bit offset for the flag, name).
#ifdef ROOT_ELEMENT_FLAG

ROOT_ELEMENT_FLAG(0, AllowInputAssemblerInputLayout)
ROOT_ELEMENT_FLAG(1, DenyVertexShaderRootAccess)
ROOT_ELEMENT_FLAG(2, DenyHullShaderRootAccess)
ROOT_ELEMENT_FLAG(3, DenyDomainShaderRootAccess)
ROOT_ELEMENT_FLAG(4, DenyGeometryShaderRootAccess)
ROOT_ELEMENT_FLAG(5, DenyPixelShaderRootAccess)
ROOT_ELEMENT_FLAG(6, AllowStreamOutput)
ROOT_ELEMENT_FLAG(7, LocalRootSignature)
ROOT_ELEMENT_FLAG(8, DenyAmplificationShaderRootAccess)
ROOT_ELEMENT_FLAG(9, DenyMeshShaderRootAccess)
ROOT_ELEMENT_FLAG(10, CBVSRVUAVHeapDirectlyIndexed)
ROOT_ELEMENT_FLAG(11, SamplerHeapDirectlyIndexed)
ROOT_ELEMENT_FLAG(0, NONE)
ROOT_ELEMENT_FLAG(0x1, AllowInputAssemblerInputLayout)
ROOT_ELEMENT_FLAG(0x2, DenyVertexShaderRootAccess)
ROOT_ELEMENT_FLAG(0x4, DenyHullShaderRootAccess)
ROOT_ELEMENT_FLAG(0x8, DenyDomainShaderRootAccess)
ROOT_ELEMENT_FLAG(0x10, DenyGeometryShaderRootAccess)
ROOT_ELEMENT_FLAG(0x20, DenyPixelShaderRootAccess)
ROOT_ELEMENT_FLAG(0x40, AllowStreamOutput)
ROOT_ELEMENT_FLAG(0x80, LocalRootSignature)
ROOT_ELEMENT_FLAG(0x100, DenyAmplificationShaderRootAccess)
ROOT_ELEMENT_FLAG(0x200, DenyMeshShaderRootAccess)
ROOT_ELEMENT_FLAG(0x400, CBVSRVUAVHeapDirectlyIndexed)
ROOT_ELEMENT_FLAG(0x800, SamplerHeapDirectlyIndexed)
#undef ROOT_ELEMENT_FLAG
#endif // ROOT_ELEMENT_FLAG

Expand All @@ -79,9 +80,9 @@ ROOT_ELEMENT_FLAG(11, SamplerHeapDirectlyIndexed)
#ifdef ROOT_DESCRIPTOR_FLAG

ROOT_DESCRIPTOR_FLAG(0, NONE)
ROOT_DESCRIPTOR_FLAG(1, DATA_VOLATILE)
ROOT_DESCRIPTOR_FLAG(2, DATA_STATIC_WHILE_SET_AT_EXECUTE)
ROOT_DESCRIPTOR_FLAG(3, DATA_STATIC)
ROOT_DESCRIPTOR_FLAG(0x2, DATA_VOLATILE)
ROOT_DESCRIPTOR_FLAG(0x4, DATA_STATIC_WHILE_SET_AT_EXECUTE)
ROOT_DESCRIPTOR_FLAG(0x8, DATA_STATIC)
#undef ROOT_DESCRIPTOR_FLAG
#endif // ROOT_DESCRIPTOR_FLAG

Expand All @@ -90,11 +91,11 @@ ROOT_DESCRIPTOR_FLAG(3, DATA_STATIC)
#ifdef DESCRIPTOR_RANGE_FLAG

DESCRIPTOR_RANGE_FLAG(0, NONE)
DESCRIPTOR_RANGE_FLAG(1, DESCRIPTORS_VOLATILE)
DESCRIPTOR_RANGE_FLAG(2, DATA_VOLATILE)
DESCRIPTOR_RANGE_FLAG(3, DATA_STATIC_WHILE_SET_AT_EXECUTE)
DESCRIPTOR_RANGE_FLAG(4, DATA_STATIC)
DESCRIPTOR_RANGE_FLAG(16, DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS)
DESCRIPTOR_RANGE_FLAG(0x1, DESCRIPTORS_VOLATILE)
DESCRIPTOR_RANGE_FLAG(0x2, DATA_VOLATILE)
DESCRIPTOR_RANGE_FLAG(0x4, DATA_STATIC_WHILE_SET_AT_EXECUTE)
DESCRIPTOR_RANGE_FLAG(0x8, DATA_STATIC)
DESCRIPTOR_RANGE_FLAG(0x10000, DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS)
#undef DESCRIPTOR_RANGE_FLAG
#endif // DESCRIPTOR_RANGE_FLAG

Expand Down