Skip to content

Commit d4248fb

Browse files
committed
clang-format
1 parent ab9911c commit d4248fb

File tree

5 files changed

+12
-18
lines changed

5 files changed

+12
-18
lines changed

clang/include/clang/Parse/ParseHLSLRootSignature.h

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,11 @@ class RootSignatureParser {
134134
/// Parsing methods of various enums
135135
std::optional<llvm::dxil::ShaderVisibility> parseShaderVisibility();
136136
std::optional<llvm::dxil::SamplerFilter> parseSamplerFilter();
137-
std::optional<llvm::dxil::TextureAddressMode>
138-
parseTextureAddressMode();
137+
std::optional<llvm::dxil::TextureAddressMode> parseTextureAddressMode();
139138
std::optional<llvm::dxil::ComparisonFunc> parseComparisonFunc();
140-
std::optional<llvm::dxil::StaticBorderColor>
141-
parseStaticBorderColor();
142-
std::optional<llvm::dxil::RootDescriptorFlags>
143-
parseRootDescriptorFlags();
144-
std::optional<llvm::dxil::DescriptorRangeFlags>
145-
parseDescriptorRangeFlags();
139+
std::optional<llvm::dxil::StaticBorderColor> parseStaticBorderColor();
140+
std::optional<llvm::dxil::RootDescriptorFlags> parseRootDescriptorFlags();
141+
std::optional<llvm::dxil::DescriptorRangeFlags> parseDescriptorRangeFlags();
146142

147143
/// Use NumericLiteralParser to convert CurToken.NumSpelling into a unsigned
148144
/// 32-bit integer

clang/lib/Parse/ParseHLSLRootSignature.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -984,8 +984,7 @@ std::optional<float> RootSignatureParser::parseFloatParam() {
984984
return std::nullopt;
985985
}
986986

987-
std::optional<::ShaderVisibility>
988-
RootSignatureParser::parseShaderVisibility() {
987+
std::optional<::ShaderVisibility> RootSignatureParser::parseShaderVisibility() {
989988
assert(CurToken.TokKind == TokenKind::pu_equal &&
990989
"Expects to only be invoked starting at given keyword");
991990

@@ -1010,8 +1009,7 @@ RootSignatureParser::parseShaderVisibility() {
10101009
return std::nullopt;
10111010
}
10121011

1013-
std::optional<::SamplerFilter>
1014-
RootSignatureParser::parseSamplerFilter() {
1012+
std::optional<::SamplerFilter> RootSignatureParser::parseSamplerFilter() {
10151013
assert(CurToken.TokKind == TokenKind::pu_equal &&
10161014
"Expects to only be invoked starting at given keyword");
10171015

@@ -1062,8 +1060,7 @@ RootSignatureParser::parseTextureAddressMode() {
10621060
return std::nullopt;
10631061
}
10641062

1065-
std::optional<::ComparisonFunc>
1066-
RootSignatureParser::parseComparisonFunc() {
1063+
std::optional<::ComparisonFunc> RootSignatureParser::parseComparisonFunc() {
10671064
assert(CurToken.TokKind == TokenKind::pu_equal &&
10681065
"Expects to only be invoked starting at given keyword");
10691066

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ struct StaticSampler {
130130
/// RootElements in the array, and it holds a data member for the Visibility
131131
/// parameter.
132132
using RootElement =
133-
std::variant<dxil::RootFlags, RootConstants, RootDescriptor, DescriptorTable,
134-
DescriptorTableClause, StaticSampler>;
133+
std::variant<dxil::RootFlags, RootConstants, RootDescriptor,
134+
DescriptorTable, DescriptorTableClause, StaticSampler>;
135135

136136
} // namespace rootsig
137137
} // namespace hlsl

llvm/lib/Frontend/HLSL/HLSLRootSignatureUtils.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ static raw_ostream &operator<<(raw_ostream &OS,
113113
case dxil::DescriptorRangeFlags::DataStatic:
114114
OS << "DataStatic";
115115
break;
116-
case dxil::DescriptorRangeFlags::DescriptorsStaticKeepingBufferBoundsChecks:
116+
case dxil::DescriptorRangeFlags::
117+
DescriptorsStaticKeepingBufferBoundsChecks:
117118
OS << "DescriptorsStaticKeepingBufferBoundsChecks";
118119
break;
119120
default:

llvm/lib/Transforms/Utils/ModuleUtils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
#include "llvm/Transforms/Utils/ModuleUtils.h"
14-
#include "llvm/Analysis/VectorUtils.h"
1514
#include "llvm/ADT/SmallString.h"
15+
#include "llvm/Analysis/VectorUtils.h"
1616
#include "llvm/IR/DerivedTypes.h"
1717
#include "llvm/IR/Function.h"
1818
#include "llvm/IR/IRBuilder.h"

0 commit comments

Comments
 (0)