Skip to content

Commit 6a30a6b

Browse files
committed
clang format
1 parent 79bb0f6 commit 6a30a6b

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
@@ -393,10 +393,10 @@ std::optional<StaticSampler> RootSignatureParser::parseStaticSampler() {
393393
Sampler.MaxAnisotropy = Params->MaxAnisotropy.value();
394394

395395
if (Params->ComparisonFunc.has_value())
396-
Sampler.ComparisonFunc= Params->ComparisonFunc.value();
396+
Sampler.ComparisonFunc = Params->ComparisonFunc.value();
397397

398398
if (Params->BorderColor.has_value())
399-
Sampler.BorderColor= Params->BorderColor.value();
399+
Sampler.BorderColor = Params->BorderColor.value();
400400

401401
if (Params->MinLOD.has_value())
402402
Sampler.MinLOD = Params->MinLOD.value();
@@ -775,7 +775,6 @@ RootSignatureParser::parseStaticSamplerParams() {
775775
Params.MaxAnisotropy = MaxAnisotropy;
776776
}
777777

778-
779778
// `comparisonFunc` `=` COMPARISON_FUNC
780779
if (tryConsumeExpectedToken(TokenKind::kw_comparisonFunc)) {
781780
if (Params.ComparisonFunc.has_value()) {
@@ -793,7 +792,6 @@ RootSignatureParser::parseStaticSamplerParams() {
793792
Params.ComparisonFunc = ComparisonFunc;
794793
}
795794

796-
797795
// `borderColor` `=` STATIC_BORDER_COLOR
798796
if (tryConsumeExpectedToken(TokenKind::kw_borderColor)) {
799797
if (Params.BorderColor.has_value()) {
@@ -991,9 +989,9 @@ RootSignatureParser::parseComparisonFunc() {
991989
return std::nullopt;
992990

993991
switch (CurToken.TokKind) {
994-
#define COMPARISON_FUNC_ENUM(NAME, LIT) \
992+
#define COMPARISON_FUNC_ENUM(NAME, LIT) \
995993
case TokenKind::en_##NAME: \
996-
return ComparisonFunc::NAME; \
994+
return ComparisonFunc::NAME; \
997995
break;
998996
#include "clang/Lex/HLSLRootSignatureTokenKinds.def"
999997
default:
@@ -1017,9 +1015,9 @@ RootSignatureParser::parseStaticBorderColor() {
10171015
return std::nullopt;
10181016

10191017
switch (CurToken.TokKind) {
1020-
#define STATIC_BORDER_COLOR_ENUM(NAME, LIT) \
1018+
#define STATIC_BORDER_COLOR_ENUM(NAME, LIT) \
10211019
case TokenKind::en_##NAME: \
1022-
return StaticBorderColor::NAME; \
1020+
return StaticBorderColor::NAME; \
10231021
break;
10241022
#include "clang/Lex/HLSLRootSignatureTokenKinds.def"
10251023
default:

clang/unittests/Parse/ParseHLSLRootSignatureTest.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,10 @@ TEST_F(ParseHLSLRootSignatureTest, ValidParseStaticSamplerTest) {
261261
ASSERT_EQ(std::get<StaticSampler>(Elem).AddressW, TextureAddressMode::Wrap);
262262
ASSERT_FLOAT_EQ(std::get<StaticSampler>(Elem).MipLODBias, 0.f);
263263
ASSERT_EQ(std::get<StaticSampler>(Elem).MaxAnisotropy, 16u);
264-
ASSERT_EQ(std::get<StaticSampler>(Elem).ComparisonFunc, ComparisonFunc::LessEqual);
265-
ASSERT_EQ(std::get<StaticSampler>(Elem).BorderColor, StaticBorderColor::OpaqueWhite);
264+
ASSERT_EQ(std::get<StaticSampler>(Elem).ComparisonFunc,
265+
ComparisonFunc::LessEqual);
266+
ASSERT_EQ(std::get<StaticSampler>(Elem).BorderColor,
267+
StaticBorderColor::OpaqueWhite);
266268
ASSERT_FLOAT_EQ(std::get<StaticSampler>(Elem).MinLOD, 0.f);
267269
ASSERT_FLOAT_EQ(std::get<StaticSampler>(Elem).MaxLOD, 3.402823466e+38f);
268270

@@ -278,7 +280,8 @@ TEST_F(ParseHLSLRootSignatureTest, ValidParseStaticSamplerTest) {
278280
ASSERT_EQ(std::get<StaticSampler>(Elem).MaxAnisotropy, 3u);
279281
ASSERT_EQ(std::get<StaticSampler>(Elem).ComparisonFunc,
280282
ComparisonFunc::NotEqual);
281-
ASSERT_EQ(std::get<StaticSampler>(Elem).BorderColor, StaticBorderColor::OpaqueBlackUint);
283+
ASSERT_EQ(std::get<StaticSampler>(Elem).BorderColor,
284+
StaticBorderColor::OpaqueBlackUint);
282285
ASSERT_FLOAT_EQ(std::get<StaticSampler>(Elem).MinLOD, 4.2f);
283286
ASSERT_FLOAT_EQ(std::get<StaticSampler>(Elem).MaxLOD, 9000.f);
284287

0 commit comments

Comments
 (0)