Skip to content

Commit 34c30da

Browse files
GlassBeaverGlassBeaver
committed
more formatting
1 parent c57e18c commit 34c30da

1 file changed

Lines changed: 92 additions & 94 deletions

File tree

‎tools/clang/unittests/HLSL/DxilContainerTest.cpp‎

Lines changed: 92 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -898,54 +898,54 @@ TEST_F(DxilContainerTest, CompileWhenOKThenIncludesSignatures) {
898898
std::string s = DisassembleProgram(program, L"VSMain", L"vs_6_0");
899899
// NOTE: this will change when proper packing is done, and when
900900
// 'always-reads' is accurately implemented.
901-
const char
902-
expected_1_4[] = ";\n"
903-
"; Input signature:\n"
904-
";\n"
905-
"; Name Index Mask Register "
906-
"SysValue Format Used\n"
907-
"; -------------------- ----- ------ -------- "
908-
"-------- ------- ------\n"
909-
"; POSITION 0 xyzw 0 "
910-
"NONE float \n" // should read 'xyzw' in Used
911-
"; COLOR 0 xyzw 1 "
912-
"NONE float \n" // should read '1' in register
913-
";\n"
914-
";\n"
915-
"; Output signature:\n"
916-
";\n"
917-
"; Name Index Mask Register "
918-
"SysValue Format Used\n"
919-
"; -------------------- ----- ------ -------- "
920-
"-------- ------- ------\n"
921-
"; SV_Position 0 xyzw 0 "
922-
"POS float xyzw\n" // could read SV_POSITION
923-
"; COLOR 0 xyzw 1 "
924-
"NONE float xyzw\n"; // should read '1' in register
925-
const char
926-
expected[] = ";\n"
927-
"; Input signature:\n"
928-
";\n"
929-
"; Name Index Mask Register SysValue "
930-
"Format Used\n"
931-
"; -------------------- ----- ------ -------- -------- "
932-
"------- ------\n"
933-
"; POSITION 0 xyzw 0 NONE "
934-
"float xyzw\n" // should read 'xyzw' in Used
935-
"; COLOR 0 xyzw 1 NONE "
936-
"float xyzw\n" // should read '1' in register
937-
";\n"
938-
";\n"
939-
"; Output signature:\n"
940-
";\n"
941-
"; Name Index Mask Register SysValue "
942-
"Format Used\n"
943-
"; -------------------- ----- ------ -------- -------- "
944-
"------- ------\n"
945-
"; SV_Position 0 xyzw 0 POS "
946-
"float xyzw\n" // could read SV_POSITION
947-
"; COLOR 0 xyzw 1 NONE "
948-
"float xyzw\n"; // should read '1' in register
901+
const char expected_1_4[] =
902+
";\n"
903+
"; Input signature:\n"
904+
";\n"
905+
"; Name Index Mask Register "
906+
"SysValue Format Used\n"
907+
"; -------------------- ----- ------ -------- "
908+
"-------- ------- ------\n"
909+
"; POSITION 0 xyzw 0 "
910+
"NONE float \n" // should read 'xyzw' in Used
911+
"; COLOR 0 xyzw 1 "
912+
"NONE float \n" // should read '1' in register
913+
";\n"
914+
";\n"
915+
"; Output signature:\n"
916+
";\n"
917+
"; Name Index Mask Register "
918+
"SysValue Format Used\n"
919+
"; -------------------- ----- ------ -------- "
920+
"-------- ------- ------\n"
921+
"; SV_Position 0 xyzw 0 "
922+
"POS float xyzw\n" // could read SV_POSITION
923+
"; COLOR 0 xyzw 1 "
924+
"NONE float xyzw\n"; // should read '1' in register
925+
const char expected[] =
926+
";\n"
927+
"; Input signature:\n"
928+
";\n"
929+
"; Name Index Mask Register SysValue "
930+
"Format Used\n"
931+
"; -------------------- ----- ------ -------- -------- "
932+
"------- ------\n"
933+
"; POSITION 0 xyzw 0 NONE "
934+
"float xyzw\n" // should read 'xyzw' in Used
935+
"; COLOR 0 xyzw 1 NONE "
936+
"float xyzw\n" // should read '1' in register
937+
";\n"
938+
";\n"
939+
"; Output signature:\n"
940+
";\n"
941+
"; Name Index Mask Register SysValue "
942+
"Format Used\n"
943+
"; -------------------- ----- ------ -------- -------- "
944+
"------- ------\n"
945+
"; SV_Position 0 xyzw 0 POS "
946+
"float xyzw\n" // could read SV_POSITION
947+
"; COLOR 0 xyzw 1 NONE "
948+
"float xyzw\n"; // should read '1' in register
949949
if (hlsl::DXIL::CompareVersions(m_ver.m_ValMajor, m_ver.m_ValMinor, 1, 5) <
950950
0) {
951951
std::string start(s.c_str(), strlen(expected_1_4));
@@ -960,52 +960,50 @@ TEST_F(DxilContainerTest, CompileWhenOKThenIncludesSignatures) {
960960
std::string s = DisassembleProgram(program, L"PSMain", L"ps_6_0");
961961
// NOTE: this will change when proper packing is done, and when
962962
// 'always-reads' is accurately implemented.
963-
const char
964-
expected_1_4[] =
965-
";\n"
966-
"; Input signature:\n"
967-
";\n"
968-
"; Name Index Mask Register SysValue Format "
969-
"Used\n"
970-
"; -------------------- ----- ------ -------- -------- ------- "
971-
"------\n"
972-
"; SV_Position 0 xyzw 0 POS float "
973-
" \n" // could read SV_POSITION
974-
"; COLOR 0 xyzw 1 NONE float "
975-
" \n" // should read '1' in register, xyzw in Used
976-
";\n"
977-
";\n"
978-
"; Output signature:\n"
979-
";\n"
980-
"; Name Index Mask Register SysValue Format "
981-
"Used\n"
982-
"; -------------------- ----- ------ -------- -------- ------- "
983-
"------\n"
984-
"; SV_Target 0 xyzw 0 TARGET float "
985-
"xyzw\n"; // could read SV_TARGET
986-
const char
987-
expected[] =
988-
";\n"
989-
"; Input signature:\n"
990-
";\n"
991-
"; Name Index Mask Register SysValue Format "
992-
"Used\n"
993-
"; -------------------- ----- ------ -------- -------- ------- "
994-
"------\n"
995-
"; SV_Position 0 xyzw 0 POS float "
996-
" \n" // could read SV_POSITION
997-
"; COLOR 0 xyzw 1 NONE float "
998-
"xyzw\n" // should read '1' in register, xyzw in Used
999-
";\n"
1000-
";\n"
1001-
"; Output signature:\n"
1002-
";\n"
1003-
"; Name Index Mask Register SysValue Format "
1004-
"Used\n"
1005-
"; -------------------- ----- ------ -------- -------- ------- "
1006-
"------\n"
1007-
"; SV_Target 0 xyzw 0 TARGET float "
1008-
"xyzw\n"; // could read SV_TARGET
963+
const char expected_1_4[] =
964+
";\n"
965+
"; Input signature:\n"
966+
";\n"
967+
"; Name Index Mask Register SysValue Format "
968+
"Used\n"
969+
"; -------------------- ----- ------ -------- -------- ------- "
970+
"------\n"
971+
"; SV_Position 0 xyzw 0 POS float "
972+
" \n" // could read SV_POSITION
973+
"; COLOR 0 xyzw 1 NONE float "
974+
" \n" // should read '1' in register, xyzw in Used
975+
";\n"
976+
";\n"
977+
"; Output signature:\n"
978+
";\n"
979+
"; Name Index Mask Register SysValue Format "
980+
"Used\n"
981+
"; -------------------- ----- ------ -------- -------- ------- "
982+
"------\n"
983+
"; SV_Target 0 xyzw 0 TARGET float "
984+
"xyzw\n"; // could read SV_TARGET
985+
const char expected[] =
986+
";\n"
987+
"; Input signature:\n"
988+
";\n"
989+
"; Name Index Mask Register SysValue Format "
990+
"Used\n"
991+
"; -------------------- ----- ------ -------- -------- ------- "
992+
"------\n"
993+
"; SV_Position 0 xyzw 0 POS float "
994+
" \n" // could read SV_POSITION
995+
"; COLOR 0 xyzw 1 NONE float "
996+
"xyzw\n" // should read '1' in register, xyzw in Used
997+
";\n"
998+
";\n"
999+
"; Output signature:\n"
1000+
";\n"
1001+
"; Name Index Mask Register SysValue Format "
1002+
"Used\n"
1003+
"; -------------------- ----- ------ -------- -------- ------- "
1004+
"------\n"
1005+
"; SV_Target 0 xyzw 0 TARGET float "
1006+
"xyzw\n"; // could read SV_TARGET
10091007
if (hlsl::DXIL::CompareVersions(m_ver.m_ValMajor, m_ver.m_ValMinor, 1, 5) <
10101008
0) {
10111009
std::string start(s.c_str(), strlen(expected_1_4));

0 commit comments

Comments
 (0)