diff options
| author | Simon Kallweit <64953474+skallweitNV@users.noreply.github.com> | 2024-08-30 18:50:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-30 09:50:19 -0700 |
| commit | f428a058ea48535a323c32d206ebc7e551c3c3e9 (patch) | |
| tree | 2b004d07b630196f902b88679b4a08d8faaa97bc /tools/slang-test | |
| parent | 12137e9b00436eee3bf27f7a2fc5106513af8981 (diff) | |
Draft: integrate slang-rhi (#4970)
* add slang-rhi submodule
* refactor render-test to use slang-rhi and remove OpenGL support
* remove -vk -glsl tests
* remove gl test
* disable failing test
* allow recursive submodules in github actions
* update slang-rhi
* update slang-rhi
---------
Co-authored-by: Yong He <yonghe@outlook.com>
Diffstat (limited to 'tools/slang-test')
| -rw-r--r-- | tools/slang-test/options.h | 3 | ||||
| -rw-r--r-- | tools/slang-test/slang-test-main.cpp | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/tools/slang-test/options.h b/tools/slang-test/options.h index 2b9ed946b..2485ee2e1 100644 --- a/tools/slang-test/options.h +++ b/tools/slang-test/options.h @@ -104,10 +104,9 @@ 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 // CPU is disabled by default // CUDA is disabled by default - Slang::RenderApiFlags synthesizedTestApis = Slang::RenderApiFlag::AllOf & ~(Slang::RenderApiFlag::Vulkan | Slang::RenderApiFlag::OpenGl | Slang::RenderApiFlag::CPU); + Slang::RenderApiFlags synthesizedTestApis = Slang::RenderApiFlag::AllOf & ~(Slang::RenderApiFlag::Vulkan | 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 7616ab614..b49d7be73 100644 --- a/tools/slang-test/slang-test-main.cpp +++ b/tools/slang-test/slang-test-main.cpp @@ -1096,12 +1096,6 @@ static SlangResult _extractRenderTestRequirements(const CommandLine& cmdLine, Te passThru = SLANG_PASS_THROUGH_DXC; } break; - - case RenderApiType::OpenGl: - target = SLANG_GLSL; - nativeLanguage = SLANG_SOURCE_LANGUAGE_GLSL; - passThru = SLANG_PASS_THROUGH_GLSLANG; - break; case RenderApiType::Vulkan: target = SLANG_SPIRV; nativeLanguage = SLANG_SOURCE_LANGUAGE_GLSL; |