Skip to content

Commit 96f1962

Browse files
mkeshavaNVexpipiplus1csyonghe
authored
Remove adapter option from slang-test (#6475)
Fixes #6390 This commit removes the deprecated -adapter command-line option from slang-test. This change aligns with commit 015bde8, which previously removed the adapter option from render-test and implemented the more AdapterLUID mechanism. Co-authored-by: Ellie Hermaszewska <ellieh@nvidia.com> Co-authored-by: Yong He <yonghe@outlook.com>
1 parent 38734ec commit 96f1962

File tree

3 files changed

+1
-18
lines changed

3 files changed

+1
-18
lines changed

tools/slang-test/options.cpp

-9
Original file line numberDiff line numberDiff line change
@@ -190,15 +190,6 @@ static bool _isSubCommand(const char* arg)
190190
argCursor++;
191191
// Assumed to be handle by .bat file that called us
192192
}
193-
else if (strcmp(arg, "-adapter") == 0)
194-
{
195-
if (argCursor == argEnd)
196-
{
197-
stdError.print("error: expected operand for '%s'\n", arg);
198-
return SLANG_FAIL;
199-
}
200-
optionsOut->adapter = *argCursor++;
201-
}
202193
else if (strcmp(arg, "-server-count") == 0)
203194
{
204195
if (argCursor == argEnd)

tools/slang-test/options.h

-3
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@ struct Options
112112
Slang::RenderApiFlags synthesizedTestApis =
113113
Slang::RenderApiFlag::AllOf & ~(Slang::RenderApiFlag::Vulkan | Slang::RenderApiFlag::CPU);
114114

115-
// The adapter to use. If empty will match first found adapter.
116-
Slang::String adapter;
117-
118115
// If true, print detailed adapter information
119116
bool showAdapterInfo = false;
120117

tools/slang-test/slang-test-main.cpp

+1-6
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ typedef TestResult (*TestCallback)(TestContext* context, TestInput& input);
159159
// Globals
160160

161161
// Pre declare
162-
static void _addRenderTestOptions(const Options& options, CommandLine& cmdLine);
162+
static void _addRenderTestOptions(const Options& options, CommandLine& ioCmdLine);
163163

164164
/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!! Functions !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
165165

@@ -3305,11 +3305,6 @@ TestResult runGLSLComparisonTest(TestContext* context, TestInput& input)
33053305

33063306
static void _addRenderTestOptions(const Options& options, CommandLine& ioCmdLine)
33073307
{
3308-
if (options.adapter.getLength())
3309-
{
3310-
ioCmdLine.addArg("-adapter");
3311-
ioCmdLine.addArg(options.adapter);
3312-
}
33133308
if (!options.emitSPIRVDirectly)
33143309
{
33153310
ioCmdLine.addArg("-emit-spirv-via-glsl");

0 commit comments

Comments
 (0)