diff options
| author | Ellie Hermaszewska <ellieh@nvidia.com> | 2023-04-29 08:28:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-29 08:28:40 +0800 |
| commit | 5df7ada451a993efff2b80bb1af2d8c7579ba00b (patch) | |
| tree | d28dc6704e4f12ec68a1e9a32f6a1ee439888387 /tools/render-test/render-test-main.cpp | |
| parent | 2492ec59fb52c15d1658ab32f473521b40664168 (diff) | |
Minor tidyings around d3d usage (#2854)
* Remove unused COM annotation
* Move SLANG_ENABLE_DXBC_SUPPORT to slang.h
* Add DX11 simple compute test
* Remove unnecessary COM parameter annotation
* Run compute smoke test for DX12
* Ignore d3d11 tests when we do not have fxc
* Do not try to find NVAPI on Linux
* Add some logs to .gitignore
* Minor cleanups in d3d12 headers
* Fix tautological comparison (due to integer overflow)
* Limit OutputDebugStringA to Windows
Diffstat (limited to 'tools/render-test/render-test-main.cpp')
| -rw-r--r-- | tools/render-test/render-test-main.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/render-test/render-test-main.cpp b/tools/render-test/render-test-main.cpp index f21a5ff07..89f7db3aa 100644 --- a/tools/render-test/render-test-main.cpp +++ b/tools/render-test/render-test-main.cpp @@ -1082,6 +1082,10 @@ static SlangResult _setSessionPrelude(const Options& options, const char* exePat // Let's see if we need to set up special prelude for HLSL if (options.nvapiExtnSlot.getLength()) { +#if !SLANG_WINDOWS_FAMILY + // NVAPI is currently only available on Windows + return SLANG_E_NOT_AVAILABLE; +#else // We want to set the path to NVAPI String rootPath; SLANG_RETURN_ON_FAIL(TestToolUtil::getRootPath(exePath, rootPath)); @@ -1098,6 +1102,7 @@ static SlangResult _setSessionPrelude(const Options& options, const char* exePat buf << "\n\n"; session->setLanguagePrelude(SLANG_SOURCE_LANGUAGE_HLSL, buf.getBuffer()); +#endif } else { |