From b5a4161a801a573179b1f552e5c53748d2667b03 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Wed, 19 Aug 2020 15:51:43 -0400 Subject: Remove IncludeHandler. (#1505) nvAPI -> NVAPI nvAPIPath -> nvapiPath DxcIncludeHandler don't reference count. nv-api-path -> nvapi-path Co-authored-by: Tim Foley --- tools/slang-test/options.cpp | 4 ++-- tools/slang-test/options.h | 3 ++- tools/slang-test/slang-test-main.cpp | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'tools') diff --git a/tools/slang-test/options.cpp b/tools/slang-test/options.cpp index 875f9ef0b..eee099965 100644 --- a/tools/slang-test/options.cpp +++ b/tools/slang-test/options.cpp @@ -266,7 +266,7 @@ static bool _isSubCommand(const char* arg) return res; } } - else if (strcmp(arg, "-nv-api-path") == 0) + else if (strcmp(arg, "-nvapi-path") == 0) { if (argCursor == argEnd) { @@ -274,7 +274,7 @@ static bool _isSubCommand(const char* arg) return SLANG_FAIL; } - optionsOut->nvAPIPath = *argCursor++; + optionsOut->nvapiPath = *argCursor++; } else { diff --git a/tools/slang-test/options.h b/tools/slang-test/options.h index ddd905e64..220293ba0 100644 --- a/tools/slang-test/options.h +++ b/tools/slang-test/options.h @@ -98,7 +98,8 @@ struct Options // The adapter to use. If empty will match first found adapter. Slang::String adapter; - Slang::String nvAPIPath; + // The path to NVAPI if available. + Slang::String nvapiPath; /// Parse the args, report any errors into stdError, and write the results into optionsOut static SlangResult parse(int argc, char** argv, TestCategorySet* categorySet, Slang::WriterHelper stdError, Options* optionsOut); diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp index c6562ed86..25aa13986 100644 --- a/tools/slang-test/slang-test-main.cpp +++ b/tools/slang-test/slang-test-main.cpp @@ -3275,9 +3275,9 @@ SlangResult innerMain(int argc, char** argv) TestToolUtil::PreludeInfo info; info.exePath = argv[0]; - if (options.nvAPIPath.getLength()) + if (options.nvapiPath.getLength()) { - info.nvAPIPath = options.nvAPIPath.getBuffer(); + info.nvapiPath = options.nvapiPath.getBuffer(); } TestToolUtil::setSessionDefaultPrelude(info, context.getSession()); -- cgit v1.2.3