diff options
Diffstat (limited to 'tools/slang-test')
| -rw-r--r-- | tools/slang-test/options.h | 2 | ||||
| -rw-r--r-- | tools/slang-test/slang-test-main.cpp | 16 |
2 files changed, 16 insertions, 2 deletions
diff --git a/tools/slang-test/options.h b/tools/slang-test/options.h index c78952625..a210a7558 100644 --- a/tools/slang-test/options.h +++ b/tools/slang-test/options.h @@ -84,7 +84,7 @@ struct Options // By default we potentially synthesize test for all // 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); + Slang::RenderApiFlags synthesizedTestApis = Slang::RenderApiFlag::AllOf & ~(Slang::RenderApiFlag::Vulkan | Slang::RenderApiFlag::OpenGl | Slang::RenderApiFlag::CPU); // The adapter to use. If empty will match first found adapter. Slang::String adapter; diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp index 4a830fd92..63e2456d9 100644 --- a/tools/slang-test/slang-test-main.cpp +++ b/tools/slang-test/slang-test-main.cpp @@ -690,6 +690,11 @@ static SlangResult _extractRenderTestRequirements(const CommandLine& cmdLine, Te nativeLanguage = SLANG_SOURCE_LANGUAGE_GLSL; passThru = SLANG_PASS_THROUGH_GLSLANG; break; + case RenderApiType::CPU: + target = SLANG_HOST_CALLABLE; + nativeLanguage = SLANG_SOURCE_LANGUAGE_CPP; + passThru = SLANG_PASS_THROUGH_GENERIC_C_CPP; + break; } SlangSourceLanguage sourceLanguage = nativeLanguage; @@ -780,6 +785,15 @@ static RenderApiFlags _getAvailableRenderApiFlags(TestContext* context) { const RenderApiType apiType = RenderApiType(i); + if (apiType == RenderApiType::CPU) + { + // TODO(JS): Only enable CPU on Windows for now +#if SLANG_WINDOWS_FAMILY + availableRenderApiFlags |= RenderApiFlags(1) << int(apiType); +#endif + continue; + } + // See if it's possible the api is available if (RenderApiUtil::calcHasApi(apiType)) { @@ -2656,7 +2670,7 @@ void runTestsOnFile( const RenderApiFlags availableRenderApiFlags = apiUsedFlags ? _getAvailableRenderApiFlags(context) : 0; // If synthesized tests are wanted look into adding them - if (context->options.synthesizedTestApis && availableRenderApiFlags) + if (context->options.synthesizedTestApis && availableRenderApiFlags) { List<TestDetails> synthesizedTests; |