Skip to content

Commit ab9911c

Browse files
inbelicinbelic
committed
resolve namespacing
1 parent f736b20 commit ab9911c

File tree

7 files changed

+66
-63
lines changed

7 files changed

+66
-63
lines changed

‎clang/include/clang/Parse/ParseHLSLRootSignature.h‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class RootSignatureParser {
7171
// expected, or, there is a lexing error
7272

7373
/// Root Element parse methods:
74-
std::optional<llvm::hlsl::rootsig::RootFlags> parseRootFlags();
74+
std::optional<llvm::dxil::RootFlags> parseRootFlags();
7575
std::optional<llvm::hlsl::rootsig::RootConstants> parseRootConstants();
7676
std::optional<llvm::hlsl::rootsig::RootDescriptor> parseRootDescriptor();
7777
std::optional<llvm::hlsl::rootsig::DescriptorTable> parseDescriptorTable();
@@ -86,15 +86,15 @@ class RootSignatureParser {
8686
std::optional<llvm::hlsl::rootsig::Register> Reg;
8787
std::optional<uint32_t> Num32BitConstants;
8888
std::optional<uint32_t> Space;
89-
std::optional<llvm::hlsl::rootsig::ShaderVisibility> Visibility;
89+
std::optional<llvm::dxil::ShaderVisibility> Visibility;
9090
};
9191
std::optional<ParsedConstantParams> parseRootConstantParams();
9292

9393
struct ParsedRootDescriptorParams {
9494
std::optional<llvm::hlsl::rootsig::Register> Reg;
9595
std::optional<uint32_t> Space;
96-
std::optional<llvm::hlsl::rootsig::ShaderVisibility> Visibility;
97-
std::optional<llvm::hlsl::rootsig::RootDescriptorFlags> Flags;
96+
std::optional<llvm::dxil::ShaderVisibility> Visibility;
97+
std::optional<llvm::dxil::RootDescriptorFlags> Flags;
9898
};
9999
std::optional<ParsedRootDescriptorParams>
100100
parseRootDescriptorParams(RootSignatureToken::Kind RegType);
@@ -104,25 +104,25 @@ class RootSignatureParser {
104104
std::optional<uint32_t> NumDescriptors;
105105
std::optional<uint32_t> Space;
106106
std::optional<uint32_t> Offset;
107-
std::optional<llvm::hlsl::rootsig::DescriptorRangeFlags> Flags;
107+
std::optional<llvm::dxil::DescriptorRangeFlags> Flags;
108108
};
109109
std::optional<ParsedClauseParams>
110110
parseDescriptorTableClauseParams(RootSignatureToken::Kind RegType);
111111

112112
struct ParsedStaticSamplerParams {
113113
std::optional<llvm::hlsl::rootsig::Register> Reg;
114-
std::optional<llvm::hlsl::rootsig::SamplerFilter> Filter;
115-
std::optional<llvm::hlsl::rootsig::TextureAddressMode> AddressU;
116-
std::optional<llvm::hlsl::rootsig::TextureAddressMode> AddressV;
117-
std::optional<llvm::hlsl::rootsig::TextureAddressMode> AddressW;
114+
std::optional<llvm::dxil::SamplerFilter> Filter;
115+
std::optional<llvm::dxil::TextureAddressMode> AddressU;
116+
std::optional<llvm::dxil::TextureAddressMode> AddressV;
117+
std::optional<llvm::dxil::TextureAddressMode> AddressW;
118118
std::optional<float> MipLODBias;
119119
std::optional<uint32_t> MaxAnisotropy;
120-
std::optional<llvm::hlsl::rootsig::ComparisonFunc> CompFunc;
121-
std::optional<llvm::hlsl::rootsig::StaticBorderColor> BorderColor;
120+
std::optional<llvm::dxil::ComparisonFunc> CompFunc;
121+
std::optional<llvm::dxil::StaticBorderColor> BorderColor;
122122
std::optional<float> MinLOD;
123123
std::optional<float> MaxLOD;
124124
std::optional<uint32_t> Space;
125-
std::optional<llvm::hlsl::rootsig::ShaderVisibility> Visibility;
125+
std::optional<llvm::dxil::ShaderVisibility> Visibility;
126126
};
127127
std::optional<ParsedStaticSamplerParams> parseStaticSamplerParams();
128128

@@ -132,16 +132,16 @@ class RootSignatureParser {
132132
std::optional<float> parseFloatParam();
133133

134134
/// Parsing methods of various enums
135-
std::optional<llvm::hlsl::rootsig::ShaderVisibility> parseShaderVisibility();
136-
std::optional<llvm::hlsl::rootsig::SamplerFilter> parseSamplerFilter();
137-
std::optional<llvm::hlsl::rootsig::TextureAddressMode>
135+
std::optional<llvm::dxil::ShaderVisibility> parseShaderVisibility();
136+
std::optional<llvm::dxil::SamplerFilter> parseSamplerFilter();
137+
std::optional<llvm::dxil::TextureAddressMode>
138138
parseTextureAddressMode();
139-
std::optional<llvm::hlsl::rootsig::ComparisonFunc> parseComparisonFunc();
140-
std::optional<llvm::hlsl::rootsig::StaticBorderColor>
139+
std::optional<llvm::dxil::ComparisonFunc> parseComparisonFunc();
140+
std::optional<llvm::dxil::StaticBorderColor>
141141
parseStaticBorderColor();
142-
std::optional<llvm::hlsl::rootsig::RootDescriptorFlags>
142+
std::optional<llvm::dxil::RootDescriptorFlags>
143143
parseRootDescriptorFlags();
144-
std::optional<llvm::hlsl::rootsig::DescriptorRangeFlags>
144+
std::optional<llvm::dxil::DescriptorRangeFlags>
145145
parseDescriptorRangeFlags();
146146

147147
/// Use NumericLiteralParser to convert CurToken.NumSpelling into a unsigned

‎clang/lib/Parse/ParseHLSLRootSignature.cpp‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "clang/Lex/LiteralSupport.h"
1212

1313
using namespace llvm::hlsl::rootsig;
14+
using namespace llvm::dxil;
1415

1516
namespace clang {
1617
namespace hlsl {
@@ -983,7 +984,7 @@ std::optional<float> RootSignatureParser::parseFloatParam() {
983984
return std::nullopt;
984985
}
985986

986-
std::optional<llvm::hlsl::rootsig::ShaderVisibility>
987+
std::optional<::ShaderVisibility>
987988
RootSignatureParser::parseShaderVisibility() {
988989
assert(CurToken.TokKind == TokenKind::pu_equal &&
989990
"Expects to only be invoked starting at given keyword");
@@ -1009,7 +1010,7 @@ RootSignatureParser::parseShaderVisibility() {
10091010
return std::nullopt;
10101011
}
10111012

1012-
std::optional<llvm::hlsl::rootsig::SamplerFilter>
1013+
std::optional<::SamplerFilter>
10131014
RootSignatureParser::parseSamplerFilter() {
10141015
assert(CurToken.TokKind == TokenKind::pu_equal &&
10151016
"Expects to only be invoked starting at given keyword");
@@ -1035,7 +1036,7 @@ RootSignatureParser::parseSamplerFilter() {
10351036
return std::nullopt;
10361037
}
10371038

1038-
std::optional<llvm::hlsl::rootsig::TextureAddressMode>
1039+
std::optional<::TextureAddressMode>
10391040
RootSignatureParser::parseTextureAddressMode() {
10401041
assert(CurToken.TokKind == TokenKind::pu_equal &&
10411042
"Expects to only be invoked starting at given keyword");
@@ -1061,7 +1062,7 @@ RootSignatureParser::parseTextureAddressMode() {
10611062
return std::nullopt;
10621063
}
10631064

1064-
std::optional<llvm::hlsl::rootsig::ComparisonFunc>
1065+
std::optional<::ComparisonFunc>
10651066
RootSignatureParser::parseComparisonFunc() {
10661067
assert(CurToken.TokKind == TokenKind::pu_equal &&
10671068
"Expects to only be invoked starting at given keyword");
@@ -1087,7 +1088,7 @@ RootSignatureParser::parseComparisonFunc() {
10871088
return std::nullopt;
10881089
}
10891090

1090-
std::optional<llvm::hlsl::rootsig::StaticBorderColor>
1091+
std::optional<::StaticBorderColor>
10911092
RootSignatureParser::parseStaticBorderColor() {
10921093
assert(CurToken.TokKind == TokenKind::pu_equal &&
10931094
"Expects to only be invoked starting at given keyword");
@@ -1113,7 +1114,7 @@ RootSignatureParser::parseStaticBorderColor() {
11131114
return std::nullopt;
11141115
}
11151116

1116-
std::optional<llvm::hlsl::rootsig::RootDescriptorFlags>
1117+
std::optional<::RootDescriptorFlags>
11171118
RootSignatureParser::parseRootDescriptorFlags() {
11181119
assert(CurToken.TokKind == TokenKind::pu_equal &&
11191120
"Expects to only be invoked starting at given keyword");
@@ -1152,7 +1153,7 @@ RootSignatureParser::parseRootDescriptorFlags() {
11521153
return Flags;
11531154
}
11541155

1155-
std::optional<llvm::hlsl::rootsig::DescriptorRangeFlags>
1156+
std::optional<::DescriptorRangeFlags>
11561157
RootSignatureParser::parseDescriptorRangeFlags() {
11571158
assert(CurToken.TokKind == TokenKind::pu_equal &&
11581159
"Expects to only be invoked starting at given keyword");

‎clang/unittests/Parse/ParseHLSLRootSignatureTest.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "gtest/gtest.h"
2626

2727
using namespace clang;
28+
using namespace llvm::dxil;
2829
using namespace llvm::hlsl::rootsig;
2930

3031
namespace {

‎llvm/include/llvm/Frontend/HLSL/HLSLRootSignature.h‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ struct RootConstants {
3636
uint32_t Num32BitConstants;
3737
Register Reg;
3838
uint32_t Space = 0;
39-
ShaderVisibility Visibility = ShaderVisibility::All;
39+
dxil::ShaderVisibility Visibility = dxil::ShaderVisibility::All;
4040
};
4141

4242
enum class DescriptorType : uint8_t { SRV = 0, UAV, CBuffer };
@@ -45,25 +45,25 @@ struct RootDescriptor {
4545
DescriptorType Type;
4646
Register Reg;
4747
uint32_t Space = 0;
48-
ShaderVisibility Visibility = ShaderVisibility::All;
49-
RootDescriptorFlags Flags;
48+
dxil::ShaderVisibility Visibility = dxil::ShaderVisibility::All;
49+
dxil::RootDescriptorFlags Flags;
5050

5151
void setDefaultFlags() {
5252
switch (Type) {
5353
case DescriptorType::CBuffer:
5454
case DescriptorType::SRV:
55-
Flags = RootDescriptorFlags::DataStaticWhileSetAtExecute;
55+
Flags = dxil::RootDescriptorFlags::DataStaticWhileSetAtExecute;
5656
break;
5757
case DescriptorType::UAV:
58-
Flags = RootDescriptorFlags::DataVolatile;
58+
Flags = dxil::RootDescriptorFlags::DataVolatile;
5959
break;
6060
}
6161
}
6262
};
6363

6464
// Models the end of a descriptor table and stores its visibility
6565
struct DescriptorTable {
66-
ShaderVisibility Visibility = ShaderVisibility::All;
66+
dxil::ShaderVisibility Visibility = dxil::ShaderVisibility::All;
6767
// Denotes that the previous NumClauses in the RootElement array
6868
// are the clauses in the table.
6969
uint32_t NumClauses = 0;
@@ -79,38 +79,38 @@ struct DescriptorTableClause {
7979
uint32_t NumDescriptors = 1;
8080
uint32_t Space = 0;
8181
uint32_t Offset = DescriptorTableOffsetAppend;
82-
DescriptorRangeFlags Flags;
82+
dxil::DescriptorRangeFlags Flags;
8383

8484
void setDefaultFlags() {
8585
switch (Type) {
8686
case ClauseType::CBuffer:
8787
case ClauseType::SRV:
88-
Flags = DescriptorRangeFlags::DataStaticWhileSetAtExecute;
88+
Flags = dxil::DescriptorRangeFlags::DataStaticWhileSetAtExecute;
8989
break;
9090
case ClauseType::UAV:
91-
Flags = DescriptorRangeFlags::DataVolatile;
91+
Flags = dxil::DescriptorRangeFlags::DataVolatile;
9292
break;
9393
case ClauseType::Sampler:
94-
Flags = DescriptorRangeFlags::None;
94+
Flags = dxil::DescriptorRangeFlags::None;
9595
break;
9696
}
9797
}
9898
};
9999

100100
struct StaticSampler {
101101
Register Reg;
102-
SamplerFilter Filter = SamplerFilter::Anisotropic;
103-
TextureAddressMode AddressU = TextureAddressMode::Wrap;
104-
TextureAddressMode AddressV = TextureAddressMode::Wrap;
105-
TextureAddressMode AddressW = TextureAddressMode::Wrap;
102+
dxil::SamplerFilter Filter = dxil::SamplerFilter::Anisotropic;
103+
dxil::TextureAddressMode AddressU = dxil::TextureAddressMode::Wrap;
104+
dxil::TextureAddressMode AddressV = dxil::TextureAddressMode::Wrap;
105+
dxil::TextureAddressMode AddressW = dxil::TextureAddressMode::Wrap;
106106
float MipLODBias = 0.f;
107107
uint32_t MaxAnisotropy = 16;
108-
ComparisonFunc CompFunc = ComparisonFunc::LessEqual;
109-
StaticBorderColor BorderColor = StaticBorderColor::OpaqueWhite;
108+
dxil::ComparisonFunc CompFunc = dxil::ComparisonFunc::LessEqual;
109+
dxil::StaticBorderColor BorderColor = dxil::StaticBorderColor::OpaqueWhite;
110110
float MinLOD = 0.f;
111111
float MaxLOD = std::numeric_limits<float>::max();
112112
uint32_t Space = 0;
113-
ShaderVisibility Visibility = ShaderVisibility::All;
113+
dxil::ShaderVisibility Visibility = dxil::ShaderVisibility::All;
114114
};
115115

116116
/// Models RootElement : RootFlags | RootConstants | RootParam
@@ -130,7 +130,7 @@ struct StaticSampler {
130130
/// RootElements in the array, and it holds a data member for the Visibility
131131
/// parameter.
132132
using RootElement =
133-
std::variant<RootFlags, RootConstants, RootDescriptor, DescriptorTable,
133+
std::variant<dxil::RootFlags, RootConstants, RootDescriptor, DescriptorTable,
134134
DescriptorTableClause, StaticSampler>;
135135

136136
} // namespace rootsig

‎llvm/include/llvm/Frontend/HLSL/HLSLRootSignatureUtils.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class MetadataBuilder {
4747

4848
private:
4949
/// Define the various builders for the different metadata types
50-
MDNode *BuildRootFlags(const RootFlags &Flags);
50+
MDNode *BuildRootFlags(const dxil::RootFlags &Flags);
5151
MDNode *BuildRootConstants(const RootConstants &Constants);
5252
MDNode *BuildRootDescriptor(const RootDescriptor &Descriptor);
5353
MDNode *BuildDescriptorTable(const DescriptorTable &Table);

‎llvm/lib/Frontend/HLSL/HLSLRootSignatureUtils.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,30 +40,30 @@ static raw_ostream &operator<<(raw_ostream &OS, const Register &Reg) {
4040
}
4141

4242
static raw_ostream &operator<<(raw_ostream &OS,
43-
const ShaderVisibility &Visibility) {
43+
const dxil::ShaderVisibility &Visibility) {
4444
switch (Visibility) {
45-
case ShaderVisibility::All:
45+
case dxil::ShaderVisibility::All:
4646
OS << "All";
4747
break;
48-
case ShaderVisibility::Vertex:
48+
case dxil::ShaderVisibility::Vertex:
4949
OS << "Vertex";
5050
break;
51-
case ShaderVisibility::Hull:
51+
case dxil::ShaderVisibility::Hull:
5252
OS << "Hull";
5353
break;
54-
case ShaderVisibility::Domain:
54+
case dxil::ShaderVisibility::Domain:
5555
OS << "Domain";
5656
break;
57-
case ShaderVisibility::Geometry:
57+
case dxil::ShaderVisibility::Geometry:
5858
OS << "Geometry";
5959
break;
60-
case ShaderVisibility::Pixel:
60+
case dxil::ShaderVisibility::Pixel:
6161
OS << "Pixel";
6262
break;
63-
case ShaderVisibility::Amplification:
63+
case dxil::ShaderVisibility::Amplification:
6464
OS << "Amplification";
6565
break;
66-
case ShaderVisibility::Mesh:
66+
case dxil::ShaderVisibility::Mesh:
6767
OS << "Mesh";
6868
break;
6969
}
@@ -91,7 +91,7 @@ static raw_ostream &operator<<(raw_ostream &OS, const ClauseType &Type) {
9191
}
9292

9393
static raw_ostream &operator<<(raw_ostream &OS,
94-
const DescriptorRangeFlags &Flags) {
94+
const dxil::DescriptorRangeFlags &Flags) {
9595
bool FlagSet = false;
9696
unsigned Remaining = llvm::to_underlying(Flags);
9797
while (Remaining) {
@@ -100,20 +100,20 @@ static raw_ostream &operator<<(raw_ostream &OS,
100100
if (FlagSet)
101101
OS << " | ";
102102

103-
switch (static_cast<DescriptorRangeFlags>(Bit)) {
104-
case DescriptorRangeFlags::DescriptorsVolatile:
103+
switch (static_cast<dxil::DescriptorRangeFlags>(Bit)) {
104+
case dxil::DescriptorRangeFlags::DescriptorsVolatile:
105105
OS << "DescriptorsVolatile";
106106
break;
107-
case DescriptorRangeFlags::DataVolatile:
107+
case dxil::DescriptorRangeFlags::DataVolatile:
108108
OS << "DataVolatile";
109109
break;
110-
case DescriptorRangeFlags::DataStaticWhileSetAtExecute:
110+
case dxil::DescriptorRangeFlags::DataStaticWhileSetAtExecute:
111111
OS << "DataStaticWhileSetAtExecute";
112112
break;
113-
case DescriptorRangeFlags::DataStatic:
113+
case dxil::DescriptorRangeFlags::DataStatic:
114114
OS << "DataStatic";
115115
break;
116-
case DescriptorRangeFlags::DescriptorsStaticKeepingBufferBoundsChecks:
116+
case dxil::DescriptorRangeFlags::DescriptorsStaticKeepingBufferBoundsChecks:
117117
OS << "DescriptorsStaticKeepingBufferBoundsChecks";
118118
break;
119119
default:
@@ -182,7 +182,7 @@ template <class... Ts> OverloadedBuild(Ts...) -> OverloadedBuild<Ts...>;
182182

183183
MDNode *MetadataBuilder::BuildRootSignature() {
184184
const auto Visitor = OverloadedBuild{
185-
[this](const RootFlags &Flags) -> MDNode * {
185+
[this](const dxil::RootFlags &Flags) -> MDNode * {
186186
return BuildRootFlags(Flags);
187187
},
188188
[this](const RootConstants &Constants) -> MDNode * {
@@ -212,7 +212,7 @@ MDNode *MetadataBuilder::BuildRootSignature() {
212212
return MDNode::get(Ctx, GeneratedMetadata);
213213
}
214214

215-
MDNode *MetadataBuilder::BuildRootFlags(const RootFlags &Flags) {
215+
MDNode *MetadataBuilder::BuildRootFlags(const dxil::RootFlags &Flags) {
216216
IRBuilder<> Builder(Ctx);
217217
Metadata *Operands[] = {
218218
MDString::get(Ctx, "RootFlags"),

‎llvm/unittests/Frontend/HLSLRootSignatureDumpTest.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "llvm/Frontend/HLSL/HLSLRootSignatureUtils.h"
1010
#include "gtest/gtest.h"
1111

12+
using namespace llvm::dxil;
1213
using namespace llvm::hlsl::rootsig;
1314

1415
namespace {

0 commit comments

Comments
 (0)