From 96f19629d4cfbe282af010cee704409a6fb2f59c Mon Sep 17 00:00:00 2001 From: Mukund Keshava Date: Fri, 28 Feb 2025 07:26:42 +0530 Subject: 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 Co-authored-by: Yong He --- tools/slang-test/options.cpp | 9 --------- tools/slang-test/options.h | 3 --- tools/slang-test/slang-test-main.cpp | 7 +------ 3 files changed, 1 insertion(+), 18 deletions(-) (limited to 'tools') 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"); -- cgit v1.2.3