From 89083c4b50af8e48e70b25b63cc62aca21ab706c Mon Sep 17 00:00:00 2001 From: Yong He Date: Wed, 10 Aug 2022 01:58:41 -0700 Subject: Language server pointer type support + add `DLLImport` test (#2350) * Language server pointer type support. + Natvis for AST. * Add completion suggestion for GUID. * Make executable test able to use slang-rt. * Fix gcc argument for rpath. * Fix DLLImport on linux. * Fix windows. * Fix. Co-authored-by: Yong He --- source/slang-rt/slang-rt.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/slang-rt') diff --git a/source/slang-rt/slang-rt.cpp b/source/slang-rt/slang-rt.cpp index 163a1b99c..94699dfa0 100644 --- a/source/slang-rt/slang-rt.cpp +++ b/source/slang-rt/slang-rt.cpp @@ -25,7 +25,7 @@ extern "C" ComPtr lib; if (!slangRT_loadedLibraries.TryGetValue(modulePath, lib)) { - if (DefaultSharedLibraryLoader::getSingleton()->loadSharedLibrary( + if (DefaultSharedLibraryLoader::getSingleton()->loadPlatformSharedLibrary( modulePath.getBuffer(), lib.writeRef()) != SLANG_OK) { _slang_rt_abort("Failed to load DLL \"" + modulePath + "\""); @@ -38,6 +38,10 @@ extern "C" SLANG_RT_API void* SLANG_MCALL _slang_rt_load_dll_func(void* moduleHandle, Slang::String funcName) { + if (moduleHandle == nullptr) + { + moduleHandle = _slang_rt_load_dll(""); + } auto lib = static_cast(moduleHandle); auto funcPtr = lib->findFuncByName(funcName.getBuffer()); if (!funcPtr) -- cgit v1.2.3