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 /source | |
| 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 'source')
| -rw-r--r-- | source/core/slang-render-api-util.cpp | 3 | ||||
| -rw-r--r-- | source/core/slang-render-api-util.h | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/source/core/slang-render-api-util.cpp b/source/core/slang-render-api-util.cpp index 4fd345840..0a303b665 100644 --- a/source/core/slang-render-api-util.cpp +++ b/source/core/slang-render-api-util.cpp @@ -13,7 +13,6 @@ namespace Slang { // NOTE! Must keep in same order as RenderApiType and have same amount of entries /* static */const RenderApiUtil::Info RenderApiUtil::s_infos[] = { - { RenderApiType::OpenGl, "gl,ogl,opengl", "glsl,glsl-rewrite,glsl-cross"}, { RenderApiType::Vulkan, "vk,vulkan", ""}, { RenderApiType::D3D12, "dx12,d3d12", ""}, { RenderApiType::D3D11, "dx11,d3d11", "hlsl,hlsl-rewrite,slang"}, @@ -265,13 +264,11 @@ static bool _canLoadSharedLibrary(const char* libName) switch (type) { #if SLANG_WINDOWS_FAMILY - case RenderApiType::OpenGl: return _canLoadSharedLibrary("opengl32"); case RenderApiType::Vulkan: return _canLoadSharedLibrary("vulkan-1") || _canLoadSharedLibrary("vk_swiftshader"); #elif SLANG_APPLE_FAMILY case RenderApiType::Vulkan: return true; case RenderApiType::Metal: return true; #elif SLANG_UNIX_FAMILY - case RenderApiType::OpenGl: return true; case RenderApiType::Vulkan: return true; #endif diff --git a/source/core/slang-render-api-util.h b/source/core/slang-render-api-util.h index 41728e5f2..224fe6996 100644 --- a/source/core/slang-render-api-util.h +++ b/source/core/slang-render-api-util.h @@ -11,8 +11,7 @@ namespace Slang enum class RenderApiType { Unknown = -1, - OpenGl = 0, - Vulkan, + Vulkan = 0, D3D12, D3D11, Metal, @@ -26,7 +25,6 @@ struct RenderApiFlag { enum Enum { - OpenGl = 1 << int(RenderApiType::OpenGl), Vulkan = 1 << int(RenderApiType::Vulkan), D3D12 = 1 << int(RenderApiType::D3D12), D3D11 = 1 << int(RenderApiType::D3D11), |