diff options
| author | Simon Kallweit <64953474+skallweitNV@users.noreply.github.com> | 2024-09-19 17:16:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-19 23:16:48 +0800 |
| commit | 3861be7ce5bd3ffc1bc60f2c3f7f41647145d575 (patch) | |
| tree | b473120fa3745c6b33f2d5f7e3df17b45a6412be /tools/render-test/options.cpp | |
| parent | fe71eafcb6e11a420ab537f257e6b8971d31d9de (diff) | |
refactor render test to use latest slang-rhi (#5119)
* refactor render test to use latest slang-rhi
* update slang-rhi
* update slang-rhi
* update slang-rhi
* update slang-rhi
Diffstat (limited to 'tools/render-test/options.cpp')
| -rw-r--r-- | tools/render-test/options.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/render-test/options.cpp b/tools/render-test/options.cpp index 2879acfac..dc1850d37 100644 --- a/tools/render-test/options.cpp +++ b/tools/render-test/options.cpp @@ -34,7 +34,7 @@ static rhi::DeviceType _toRenderType(Slang::RenderApiType apiType) case RenderApiType::CPU: return rhi::DeviceType::CPU; case RenderApiType::CUDA: return rhi::DeviceType::CUDA; default: - return rhi::DeviceType::Unknown; + return rhi::DeviceType::Default; } } @@ -244,7 +244,7 @@ static rhi::DeviceType _toRenderType(Slang::RenderApiType apiType) UnownedStringSlice argName = argSlice.tail(1); DeviceType deviceType = _toRenderType(RenderApiUtil::findApiTypeByName(argName)); - if (deviceType != DeviceType::Unknown) + if (deviceType != DeviceType::Default) { outOptions.deviceType = deviceType; continue; @@ -253,7 +253,7 @@ static rhi::DeviceType _toRenderType(Slang::RenderApiType apiType) // Lookup the target language type DeviceType targetLanguageDeviceType = _toRenderType(RenderApiUtil::findImplicitLanguageRenderApiType(argName)); - if (targetLanguageDeviceType != DeviceType::Unknown || argName == "glsl") + if (targetLanguageDeviceType != DeviceType::Default || argName == "glsl") { outOptions.targetLanguageDeviceType = targetLanguageDeviceType; outOptions.inputLanguageID = (argName == "hlsl" || argName == "glsl" || argName == "cpp" || argName == "cxx" || argName == "c") ? InputLanguageID::Native : InputLanguageID::Slang; @@ -266,7 +266,7 @@ static rhi::DeviceType _toRenderType(Slang::RenderApiType apiType) } // If a render option isn't set use defaultRenderType - outOptions.deviceType = (outOptions.deviceType == DeviceType::Unknown) + outOptions.deviceType = (outOptions.deviceType == DeviceType::Default) ? outOptions.targetLanguageDeviceType : outOptions.deviceType; |