Skip to content

Commit 3a4cf10

Browse files
committed
remove select-validator option
1 parent 9536291 commit 3a4cf10

4 files changed

Lines changed: 5 additions & 21 deletions

File tree

lib/DxcSupport/HLSLOptions.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,20 +1033,6 @@ int ReadDxcOpts(const OptTable *optionTable, unsigned flagsToInclude,
10331033
opts.ValVerMinor = (unsigned long)minor64;
10341034
}
10351035

1036-
llvm::StringRef valSelectStr = Args.getLastArgValue(OPT_select_validator);
1037-
if (!valSelectStr.empty()) {
1038-
opts.SelectValidator = llvm::StringSwitch<ValidatorSelection>(valSelectStr)
1039-
.Case("auto", ValidatorSelection::Auto)
1040-
.Case("internal", ValidatorSelection::Internal)
1041-
.Case("external", ValidatorSelection::External)
1042-
.Default(ValidatorSelection::Invalid);
1043-
if (opts.SelectValidator == ValidatorSelection::Invalid) {
1044-
errors << "Unsupported value '" << valSelectStr
1045-
<< "for -select-validator option.";
1046-
return 1;
1047-
}
1048-
}
1049-
10501036
if (opts.IsLibraryProfile() && Minor == 0xF) {
10511037
if (opts.ValVerMajor != UINT_MAX && opts.ValVerMajor != 0) {
10521038
errors << "Offline library profile cannot be used with non-zero "

tools/clang/test/HLSLFileCheck/hlsl/types/struct/struct-annotations.hlsl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %dxc -T ps_6_8 -E main -Qkeep_reflect_in_dxil -select-validator internal %s | FileCheck -check-prefix=CHECK68 %s
2-
// RUN: %dxc -T ps_6_7 -E main -Qkeep_reflect_in_dxil -select-validator internal %s | FileCheck -check-prefix=CHECK67 %s
1+
// RUN: %dxc -T ps_6_8 -E main -Qkeep_reflect_in_dxil %s | FileCheck -check-prefix=CHECK68 %s
2+
// RUN: %dxc -T ps_6_7 -E main -Qkeep_reflect_in_dxil %s | FileCheck -check-prefix=CHECK67 %s
33

44
// Make sure the vector is annotated with vector size (DXIL 1.8 and higher),
55
// matrix is annotated with matrix size and orientation, and scalar does not
@@ -47,4 +47,4 @@ StructuredBuffer<MyStruct> g_myStruct;
4747
float main() : SV_Target
4848
{
4949
return g_myStruct[0].vec.x + g_myStruct[0].vec.y;
50-
}
50+
}

tools/clang/test/HLSLFileCheck/infra/auto-dxilver.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
// Catch any other unexpected error cases.
2222
// CHECK-NOT: error
2323

24-
// RUN: %dxc -T vs_6_8 -select-validator internal %s | FileCheck %s
24+
// RUN: %dxc -T vs_6_8 %s | FileCheck %s
2525
// This should always be run, and always succeed.
2626
// CHECK: define void @main()
2727

tools/clang/test/SemaHLSL/hlsl/semantics/ExtendedCommandInformation/WrongShaderModel.hlsl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// TODO: use -verify instead of FileCheck after fix https://github.com/microsoft/DirectXShaderCompiler/issues/5768
2-
// -select-validator internal used to avoid downlevel validator testing
3-
// incompatibility with shader model 6.7.
4-
// RUN: not %dxc -E main -T vs_6_7 -select-validator internal %s 2>&1 | FileCheck %s --check-prefix=SM67
2+
// RUN: not %dxc -E main -T vs_6_7 %s 2>&1 | FileCheck %s --check-prefix=SM67
53

64
// SM67:invalid semantic 'SV_StartVertexLocation' for vs 6.7
75
// SM67:invalid semantic 'SV_StartInstanceLocation' for vs 6.7

0 commit comments

Comments
 (0)