Skip to content

Commit 845bc88

Browse files
committed
clang format
1 parent 80f2606 commit 845bc88

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

clang/lib/Parse/ParseHLSLRootSignature.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -400,10 +400,10 @@ std::optional<StaticSampler> RootSignatureParser::parseStaticSampler() {
400400
Sampler.MaxAnisotropy = Params->MaxAnisotropy.value();
401401

402402
if (Params->ComparisonFunc.has_value())
403-
Sampler.ComparisonFunc= Params->ComparisonFunc.value();
403+
Sampler.ComparisonFunc = Params->ComparisonFunc.value();
404404

405405
if (Params->BorderColor.has_value())
406-
Sampler.BorderColor= Params->BorderColor.value();
406+
Sampler.BorderColor = Params->BorderColor.value();
407407

408408
if (Params->MinLOD.has_value())
409409
Sampler.MinLOD = Params->MinLOD.value();
@@ -799,7 +799,6 @@ RootSignatureParser::parseStaticSamplerParams() {
799799
Params.MaxAnisotropy = MaxAnisotropy;
800800
}
801801

802-
803802
// `comparisonFunc` `=` COMPARISON_FUNC
804803
if (tryConsumeExpectedToken(TokenKind::kw_comparisonFunc)) {
805804
if (Params.ComparisonFunc.has_value()) {
@@ -817,7 +816,6 @@ RootSignatureParser::parseStaticSamplerParams() {
817816
Params.ComparisonFunc = ComparisonFunc;
818817
}
819818

820-
821819
// `borderColor` `=` STATIC_BORDER_COLOR
822820
if (tryConsumeExpectedToken(TokenKind::kw_borderColor)) {
823821
if (Params.BorderColor.has_value()) {
@@ -1036,9 +1034,9 @@ RootSignatureParser::parseComparisonFunc() {
10361034
return std::nullopt;
10371035

10381036
switch (CurToken.TokKind) {
1039-
#define COMPARISON_FUNC_ENUM(NAME, LIT) \
1037+
#define COMPARISON_FUNC_ENUM(NAME, LIT) \
10401038
case TokenKind::en_##NAME: \
1041-
return ComparisonFunc::NAME; \
1039+
return ComparisonFunc::NAME; \
10421040
break;
10431041
#include "clang/Lex/HLSLRootSignatureTokenKinds.def"
10441042
default:
@@ -1062,9 +1060,9 @@ RootSignatureParser::parseStaticBorderColor() {
10621060
return std::nullopt;
10631061

10641062
switch (CurToken.TokKind) {
1065-
#define STATIC_BORDER_COLOR_ENUM(NAME, LIT) \
1063+
#define STATIC_BORDER_COLOR_ENUM(NAME, LIT) \
10661064
case TokenKind::en_##NAME: \
1067-
return StaticBorderColor::NAME; \
1065+
return StaticBorderColor::NAME; \
10681066
break;
10691067
#include "clang/Lex/HLSLRootSignatureTokenKinds.def"
10701068
default:

clang/unittests/Parse/ParseHLSLRootSignatureTest.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,10 @@ TEST_F(ParseHLSLRootSignatureTest, ValidParseStaticSamplerTest) {
263263
ASSERT_EQ(std::get<StaticSampler>(Elem).AddressW, TextureAddressMode::Wrap);
264264
ASSERT_EQ(std::get<StaticSampler>(Elem).MipLODBias, 0.f);
265265
ASSERT_EQ(std::get<StaticSampler>(Elem).MaxAnisotropy, 16u);
266-
ASSERT_EQ(std::get<StaticSampler>(Elem).ComparisonFunc, ComparisonFunc::LessEqual);
267-
ASSERT_EQ(std::get<StaticSampler>(Elem).BorderColor, StaticBorderColor::OpaqueWhite);
266+
ASSERT_EQ(std::get<StaticSampler>(Elem).ComparisonFunc,
267+
ComparisonFunc::LessEqual);
268+
ASSERT_EQ(std::get<StaticSampler>(Elem).BorderColor,
269+
StaticBorderColor::OpaqueWhite);
268270
ASSERT_EQ(std::get<StaticSampler>(Elem).MinLOD, 0.f);
269271
ASSERT_EQ(std::get<StaticSampler>(Elem).MaxLOD, 3.402823466e+38f);
270272

@@ -282,7 +284,8 @@ TEST_F(ParseHLSLRootSignatureTest, ValidParseStaticSamplerTest) {
282284
ASSERT_EQ(std::get<StaticSampler>(Elem).MaxAnisotropy, 3u);
283285
ASSERT_EQ(std::get<StaticSampler>(Elem).ComparisonFunc,
284286
ComparisonFunc::NotEqual);
285-
ASSERT_EQ(std::get<StaticSampler>(Elem).BorderColor, StaticBorderColor::OpaqueBlackUint);
287+
ASSERT_EQ(std::get<StaticSampler>(Elem).BorderColor,
288+
StaticBorderColor::OpaqueBlackUint);
286289
ASSERT_EQ(std::get<StaticSampler>(Elem).MinLOD, 4.2f);
287290
ASSERT_EQ(std::get<StaticSampler>(Elem).MaxLOD, 9000.f);
288291

0 commit comments

Comments
 (0)