diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2019-03-07 16:31:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-07 16:31:56 -0500 |
| commit | f33aee2be9017934140da9fdfb0dcde15568b3a8 (patch) | |
| tree | 15e0a6bdf137c103806269cdd2c490467560642c /tools/slang-test/options.h | |
| parent | 3f6609a61465a09ad83ecbab5f59ec9475e5cc81 (diff) | |
Fix problems with synthesized tests and inconsitent render-test command lines (#885)
* * Check for inconsistent command line options for renderer
* Moved RenderApiUtil into core so can be used in slang-test
* Make it use the ShaderdLibrary for API testsing
* Added some simplifying functions to StringUtil for spliting/comparisons
* Refactored the synthesis of rendering tests so that inconsistent combinations are not produced
* Add missing slang-render-api-util.cpp & .h
* Stop warning on linux about _canLoadSharedLibrary not being used.
Diffstat (limited to 'tools/slang-test/options.h')
| -rw-r--r-- | tools/slang-test/options.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/slang-test/options.h b/tools/slang-test/options.h index 77460e190..58b8e0fb2 100644 --- a/tools/slang-test/options.h +++ b/tools/slang-test/options.h @@ -6,7 +6,7 @@ #include "../../source/core/dictionary.h" #include "test-reporter.h" -#include "render-api-util.h" +#include "../../source/core/slang-render-api-util.h" #include "../../source/core/smart-pointer.h" // A category that a test can be tagged with @@ -73,7 +73,7 @@ struct Options Slang::Dictionary<TestCategory*, TestCategory*> excludeCategories; // By default we can test against all apis - RenderApiFlags enabledApis = RenderApiFlag::AllOf; + Slang::RenderApiFlags enabledApis = Slang::RenderApiFlag::AllOf; // The subCommand to execute. Will be empty if there is no subCommand Slang::String subCommand; @@ -82,8 +82,9 @@ struct Options Slang::List<Slang::String> subCommandArgs; // By default we potentially synthesize test for all - // TODO: Vulkan is disabled by default for now as the majority as vulkan synthesized tests fail - RenderApiFlags synthesizedTestApis = RenderApiFlag::AllOf & ~RenderApiFlag::Vulkan; + // TODO: Vulkan is disabled by default for now as the majority as vulkan synthesized tests + // OpenGL is disabled for now + Slang::RenderApiFlags synthesizedTestApis = Slang::RenderApiFlag::AllOf & ~(Slang::RenderApiFlag::Vulkan | Slang::RenderApiFlag::OpenGl); /// 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); |
