summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMukund Keshava <mkeshava@nvidia.com>2025-02-28 07:26:42 +0530
committerGitHub <noreply@github.com>2025-02-27 17:56:42 -0800
commit96f19629d4cfbe282af010cee704409a6fb2f59c (patch)
tree0146f729e0b2297c7a18e31f0de68562ac5f76cb /tools
parent38734ec1f6644f1565aeb91106f371b14d3ba07a (diff)
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 015bde8d5a46f32979c00dbb1feb4b3d80729c44, 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>
Diffstat (limited to 'tools')
-rw-r--r--tools/slang-test/options.cpp9
-rw-r--r--tools/slang-test/options.h3
-rw-r--r--tools/slang-test/slang-test-main.cpp7
3 files changed, 1 insertions, 18 deletions
diff --git a/tools/slang-test/options.cpp b/tools/slang-test/options.cpp
index b3f4bdc10..45533fe49 100644
--- a/tools/slang-test/options.cpp
+++ b/tools/slang-test/options.cpp
@@ -190,15 +190,6 @@ static bool _isSubCommand(const char* arg)
argCursor++;
// Assumed to be handle by .bat file that called us
}
- else if (strcmp(arg, "-adapter") == 0)
- {
- if (argCursor == argEnd)
- {
- stdError.print("error: expected operand for '%s'\n", arg);
- return SLANG_FAIL;
- }
- optionsOut->adapter = *argCursor++;
- }
else if (strcmp(arg, "-server-count") == 0)
{
if (argCursor == argEnd)
diff --git a/tools/slang-test/options.h b/tools/slang-test/options.h
index a127d1050..3939590f0 100644
--- a/tools/slang-test/options.h
+++ b/tools/slang-test/options.h
@@ -112,9 +112,6 @@ struct Options
Slang::RenderApiFlags synthesizedTestApis =
Slang::RenderApiFlag::AllOf & ~(Slang::RenderApiFlag::Vulkan | Slang::RenderApiFlag::CPU);
- // The adapter to use. If empty will match first found adapter.
- Slang::String adapter;
-
// If true, print detailed adapter information
bool showAdapterInfo = false;
diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp
index b8fb45c47..51dcf79ce 100644
--- a/tools/slang-test/slang-test-main.cpp
+++ b/tools/slang-test/slang-test-main.cpp
@@ -159,7 +159,7 @@ typedef TestResult (*TestCallback)(TestContext* context, TestInput& input);
// Globals
// Pre declare
-static void _addRenderTestOptions(const Options& options, CommandLine& cmdLine);
+static void _addRenderTestOptions(const Options& options, CommandLine& ioCmdLine);
/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!! Functions !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
@@ -3305,11 +3305,6 @@ TestResult runGLSLComparisonTest(TestContext* context, TestInput& input)
static void _addRenderTestOptions(const Options& options, CommandLine& ioCmdLine)
{
- if (options.adapter.getLength())
- {
- ioCmdLine.addArg("-adapter");
- ioCmdLine.addArg(options.adapter);
- }
if (!options.emitSPIRVDirectly)
{
ioCmdLine.addArg("-emit-spirv-via-glsl");