From f428a058ea48535a323c32d206ebc7e551c3c3e9 Mon Sep 17 00:00:00 2001 From: Simon Kallweit <64953474+skallweitNV@users.noreply.github.com> Date: Fri, 30 Aug 2024 18:50:19 +0200 Subject: 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 --- source/core/slang-render-api-util.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'source/core/slang-render-api-util.cpp') 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 -- cgit v1.2.3