summaryrefslogtreecommitdiffstats
path: root/tools/render-test/options.h
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2020-08-21 16:04:42 -0400
committerGitHub <noreply@github.com>2020-08-21 13:04:42 -0700
commitfcac02e405661de311b5ceebbd6d3e2c78bf8aea (patch)
tree6e79865b39f0739d2ac9c3f91cc4129c244b6977 /tools/render-test/options.h
parent49067fd2e97b40649df3fa2ce096f78c2e45da5a (diff)
Vulkan update/NVAPI support (#1511)
* First pass at incorporating nvapi into test harness. * D3d12 Atomic Float Add via NVAPI working * Dx12 atomic float appears to work. * Atomic float add on Dx12. * Added atomic64 feature addition to vk. Fix correct output for atomic-float-byte-address.slang * Disable atomic float failing tests. * Upgraded VK headers. * Detect atomic float availability on VK. * Try to get test working for in64 atomic. * Made HLSL prelude controlled via the render-test requirements. * Added -enable-nvapi to premake. * Fix D3D12Renderer when NVAPI is not available. * Small improvements to VKRenderer. * Improve atomic documentation in target-compatibility.md.
Diffstat (limited to 'tools/render-test/options.h')
-rw-r--r--tools/render-test/options.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/render-test/options.h b/tools/render-test/options.h
index f2f0a8ab6..d311568d4 100644
--- a/tools/render-test/options.h
+++ b/tools/render-test/options.h
@@ -74,10 +74,10 @@ struct Options
Slang::String adapter; ///< The adapter to use either name or index
uint32_t computeDispatchSize[3] = { 1, 1, 1 };
-};
-extern Options gOptions;
+ Slang::String nvapiRegister; ///< The nvapiRegister to use.
-SlangResult parseOptions(int argc, const char*const* argv, Slang::WriterHelper stdError);
+ static SlangResult parse(int argc, const char*const* argv, Slang::WriterHelper stdError, Options& outOptions);
+};
} // renderer_test