summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2020-08-19 15:51:43 -0400
committerGitHub <noreply@github.com>2020-08-19 12:51:43 -0700
commitb5a4161a801a573179b1f552e5c53748d2667b03 (patch)
tree4b63bc7274ac060054ab239da4f75aa7233bbddf /tools
parent2fffbc5ff0727482c6ab7d66f6d852701adb277b (diff)
Remove IncludeHandler. (#1505)
nvAPI -> NVAPI nvAPIPath -> nvapiPath DxcIncludeHandler don't reference count. nv-api-path -> nvapi-path Co-authored-by: Tim Foley <tfoleyNV@users.noreply.github.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/slang-test/options.cpp4
-rw-r--r--tools/slang-test/options.h3
-rw-r--r--tools/slang-test/slang-test-main.cpp4
3 files changed, 6 insertions, 5 deletions
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());