Skip to content

[NFC][HLSL][DXIL] Move D3D12.h enums and flags to DXILABI #143041

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

Closed
wants to merge 7 commits into from
Closed

[NFC][HLSL][DXIL] Move D3D12.h enums and flags to DXILABI #143041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e9d782a
move defs to DXILABI
inbelic Jun 5, 2025
f736b20
update comments
inbelic Jun 5, 2025
ab9911c
resolve namespacing
inbelic Jun 5, 2025
d4248fb
clang-format
inbelic Jun 5, 2025
ea6a083
review: remove ValidFlag enum entries
inbelic Jun 6, 2025
01d5a94
self-review: fix typos
inbelic Jun 6, 2025
dacc890
Merge branch 'main' into inbelic/rs-move-d3d-headers
inbelic Jun 9, 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
42 changes: 19 additions & 23 deletions clang/include/clang/Parse/ParseHLSLRootSignature.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class RootSignatureParser {
// expected, or, there is a lexing error

/// Root Element parse methods:
std::optional<llvm::hlsl::rootsig::RootFlags> parseRootFlags();
std::optional<llvm::dxil::RootFlags> parseRootFlags();
std::optional<llvm::hlsl::rootsig::RootConstants> parseRootConstants();
std::optional<llvm::hlsl::rootsig::RootDescriptor> parseRootDescriptor();
std::optional<llvm::hlsl::rootsig::DescriptorTable> parseDescriptorTable();
Expand All @@ -86,15 +86,15 @@ class RootSignatureParser {
std::optional<llvm::hlsl::rootsig::Register> Reg;
std::optional<uint32_t> Num32BitConstants;
std::optional<uint32_t> Space;
std::optional<llvm::hlsl::rootsig::ShaderVisibility> Visibility;
std::optional<llvm::dxil::ShaderVisibility> Visibility;
};
std::optional<ParsedConstantParams> parseRootConstantParams();

struct ParsedRootDescriptorParams {
std::optional<llvm::hlsl::rootsig::Register> Reg;
std::optional<uint32_t> Space;
std::optional<llvm::hlsl::rootsig::ShaderVisibility> Visibility;
std::optional<llvm::hlsl::rootsig::RootDescriptorFlags> Flags;
std::optional<llvm::dxil::ShaderVisibility> Visibility;
std::optional<llvm::dxil::RootDescriptorFlags> Flags;
};
std::optional<ParsedRootDescriptorParams>
parseRootDescriptorParams(RootSignatureToken::Kind RegType);
Expand All @@ -104,25 +104,25 @@ class RootSignatureParser {
std::optional<uint32_t> NumDescriptors;
std::optional<uint32_t> Space;
std::optional<uint32_t> Offset;
std::optional<llvm::hlsl::rootsig::DescriptorRangeFlags> Flags;
std::optional<llvm::dxil::DescriptorRangeFlags> Flags;
};
std::optional<ParsedClauseParams>
parseDescriptorTableClauseParams(RootSignatureToken::Kind RegType);

struct ParsedStaticSamplerParams {
std::optional<llvm::hlsl::rootsig::Register> Reg;
std::optional<llvm::hlsl::rootsig::SamplerFilter> Filter;
std::optional<llvm::hlsl::rootsig::TextureAddressMode> AddressU;
std::optional<llvm::hlsl::rootsig::TextureAddressMode> AddressV;
std::optional<llvm::hlsl::rootsig::TextureAddressMode> AddressW;
std::optional<llvm::dxil::SamplerFilter> Filter;
std::optional<llvm::dxil::TextureAddressMode> AddressU;
std::optional<llvm::dxil::TextureAddressMode> AddressV;
std::optional<llvm::dxil::TextureAddressMode> AddressW;
std::optional<float> MipLODBias;
std::optional<uint32_t> MaxAnisotropy;
std::optional<llvm::hlsl::rootsig::ComparisonFunc> CompFunc;
std::optional<llvm::hlsl::rootsig::StaticBorderColor> BorderColor;
std::optional<llvm::dxil::ComparisonFunc> CompFunc;
std::optional<llvm::dxil::StaticBorderColor> BorderColor;
std::optional<float> MinLOD;
std::optional<float> MaxLOD;
std::optional<uint32_t> Space;
std::optional<llvm::hlsl::rootsig::ShaderVisibility> Visibility;
std::optional<llvm::dxil::ShaderVisibility> Visibility;
};
std::optional<ParsedStaticSamplerParams> parseStaticSamplerParams();

Expand All @@ -132,17 +132,13 @@ class RootSignatureParser {
std::optional<float> parseFloatParam();

/// Parsing methods of various enums
std::optional<llvm::hlsl::rootsig::ShaderVisibility> parseShaderVisibility();
std::optional<llvm::hlsl::rootsig::SamplerFilter> parseSamplerFilter();
std::optional<llvm::hlsl::rootsig::TextureAddressMode>
parseTextureAddressMode();
std::optional<llvm::hlsl::rootsig::ComparisonFunc> parseComparisonFunc();
std::optional<llvm::hlsl::rootsig::StaticBorderColor>
parseStaticBorderColor();
std::optional<llvm::hlsl::rootsig::RootDescriptorFlags>
parseRootDescriptorFlags();
std::optional<llvm::hlsl::rootsig::DescriptorRangeFlags>
parseDescriptorRangeFlags();
std::optional<llvm::dxil::ShaderVisibility> parseShaderVisibility();
std::optional<llvm::dxil::SamplerFilter> parseSamplerFilter();
std::optional<llvm::dxil::TextureAddressMode> parseTextureAddressMode();
std::optional<llvm::dxil::ComparisonFunc> parseComparisonFunc();
std::optional<llvm::dxil::StaticBorderColor> parseStaticBorderColor();
std::optional<llvm::dxil::RootDescriptorFlags> parseRootDescriptorFlags();
std::optional<llvm::dxil::DescriptorRangeFlags> parseDescriptorRangeFlags();

/// Use NumericLiteralParser to convert CurToken.NumSpelling into a unsigned
/// 32-bit integer
Expand Down
19 changes: 8 additions & 11 deletions clang/lib/Parse/ParseHLSLRootSignature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "clang/Lex/LiteralSupport.h"

using namespace llvm::hlsl::rootsig;
using namespace llvm::dxil;

namespace clang {
namespace hlsl {
Expand Down Expand Up @@ -983,8 +984,7 @@ std::optional<float> RootSignatureParser::parseFloatParam() {
return std::nullopt;
}

std::optional<llvm::hlsl::rootsig::ShaderVisibility>
RootSignatureParser::parseShaderVisibility() {
std::optional<ShaderVisibility> RootSignatureParser::parseShaderVisibility() {
assert(CurToken.TokKind == TokenKind::pu_equal &&
"Expects to only be invoked starting at given keyword");

Expand All @@ -1009,8 +1009,7 @@ RootSignatureParser::parseShaderVisibility() {
return std::nullopt;
}

std::optional<llvm::hlsl::rootsig::SamplerFilter>
RootSignatureParser::parseSamplerFilter() {
std::optional<SamplerFilter> RootSignatureParser::parseSamplerFilter() {
assert(CurToken.TokKind == TokenKind::pu_equal &&
"Expects to only be invoked starting at given keyword");

Expand All @@ -1035,7 +1034,7 @@ RootSignatureParser::parseSamplerFilter() {
return std::nullopt;
}

std::optional<llvm::hlsl::rootsig::TextureAddressMode>
std::optional<TextureAddressMode>
RootSignatureParser::parseTextureAddressMode() {
assert(CurToken.TokKind == TokenKind::pu_equal &&
"Expects to only be invoked starting at given keyword");
Expand All @@ -1061,8 +1060,7 @@ RootSignatureParser::parseTextureAddressMode() {
return std::nullopt;
}

std::optional<llvm::hlsl::rootsig::ComparisonFunc>
RootSignatureParser::parseComparisonFunc() {
std::optional<ComparisonFunc> RootSignatureParser::parseComparisonFunc() {
assert(CurToken.TokKind == TokenKind::pu_equal &&
"Expects to only be invoked starting at given keyword");

Expand All @@ -1087,8 +1085,7 @@ RootSignatureParser::parseComparisonFunc() {
return std::nullopt;
}

std::optional<llvm::hlsl::rootsig::StaticBorderColor>
RootSignatureParser::parseStaticBorderColor() {
std::optional<StaticBorderColor> RootSignatureParser::parseStaticBorderColor() {
assert(CurToken.TokKind == TokenKind::pu_equal &&
"Expects to only be invoked starting at given keyword");

Expand All @@ -1113,7 +1110,7 @@ RootSignatureParser::parseStaticBorderColor() {
return std::nullopt;
}

std::optional<llvm::hlsl::rootsig::RootDescriptorFlags>
std::optional<RootDescriptorFlags>
RootSignatureParser::parseRootDescriptorFlags() {
assert(CurToken.TokKind == TokenKind::pu_equal &&
"Expects to only be invoked starting at given keyword");
Expand Down Expand Up @@ -1152,7 +1149,7 @@ RootSignatureParser::parseRootDescriptorFlags() {
return Flags;
}

std::optional<llvm::hlsl::rootsig::DescriptorRangeFlags>
std::optional<DescriptorRangeFlags>
RootSignatureParser::parseDescriptorRangeFlags() {
assert(CurToken.TokKind == TokenKind::pu_equal &&
"Expects to only be invoked starting at given keyword");
Expand Down
9 changes: 5 additions & 4 deletions clang/unittests/Parse/ParseHLSLRootSignatureTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "gtest/gtest.h"

using namespace clang;
using namespace llvm::dxil;
using namespace llvm::hlsl::rootsig;

namespace {
Expand Down Expand Up @@ -206,7 +207,7 @@ TEST_F(ParseHLSLRootSignatureTest, ValidParseDTClausesTest) {
ASSERT_EQ(std::get<DescriptorTableClause>(Elem).Offset,
DescriptorTableOffsetAppend);
ASSERT_EQ(std::get<DescriptorTableClause>(Elem).Flags,
DescriptorRangeFlags::ValidFlags);
DescriptorRangeFlags(0x1000f)); // All valid flags

Elem = Elements[4];
ASSERT_TRUE(std::holds_alternative<DescriptorTable>(Elem));
Expand Down Expand Up @@ -404,7 +405,7 @@ TEST_F(ParseHLSLRootSignatureTest, ValidSamplerFlagsTest) {
ASSERT_TRUE(std::holds_alternative<DescriptorTableClause>(Elem));
ASSERT_EQ(std::get<DescriptorTableClause>(Elem).Type, ClauseType::Sampler);
ASSERT_EQ(std::get<DescriptorTableClause>(Elem).Flags,
DescriptorRangeFlags::ValidSamplerFlags);
DescriptorRangeFlags::DescriptorsVolatile); // Valid sampler flags

ASSERT_TRUE(Consumer->isSatisfied());
}
Expand Down Expand Up @@ -496,7 +497,7 @@ TEST_F(ParseHLSLRootSignatureTest, ValidParseRootFlagsTest) {

Elem = Elements[2];
ASSERT_TRUE(std::holds_alternative<RootFlags>(Elem));
ASSERT_EQ(std::get<RootFlags>(Elem), RootFlags::ValidFlags);
ASSERT_EQ(std::get<RootFlags>(Elem), RootFlags(0xfff)); // Valid flags

ASSERT_TRUE(Consumer->isSatisfied());
}
Expand Down Expand Up @@ -545,7 +546,7 @@ TEST_F(ParseHLSLRootSignatureTest, ValidParseRootDescriptorsTest) {
ASSERT_EQ(std::get<RootDescriptor>(Elem).Visibility,
ShaderVisibility::Geometry);
ASSERT_EQ(std::get<RootDescriptor>(Elem).Flags,
RootDescriptorFlags::ValidFlags);
RootDescriptorFlags(0xe)); // All valid flags

Elem = Elements[2];
ASSERT_TRUE(std::holds_alternative<RootDescriptor>(Elem));
Expand Down
Loading
Loading