From af70651a4843b16dd24e14b5cedffe399ebeb862 Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Sat, 20 Aug 2022 01:03:06 -0700
Subject: Call `gfx` in slang program. (#2370)

---
 source/slang-rt/slang-rt.cpp | 11 +++++++++--
 source/slang-rt/slang-rt.h   |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'source/slang-rt')

diff --git a/source/slang-rt/slang-rt.cpp b/source/slang-rt/slang-rt.cpp
index 94699dfa0..49d4f2c9a 100644
--- a/source/slang-rt/slang-rt.cpp
+++ b/source/slang-rt/slang-rt.cpp
@@ -25,7 +25,7 @@ extern "C"
         ComPtr<ISlangSharedLibrary> lib;
         if (!slangRT_loadedLibraries.TryGetValue(modulePath, lib))
         {
-            if (DefaultSharedLibraryLoader::getSingleton()->loadPlatformSharedLibrary(
+            if (DefaultSharedLibraryLoader::getSingleton()->loadSharedLibrary(
                     modulePath.getBuffer(), lib.writeRef()) != SLANG_OK)
             {
                 _slang_rt_abort("Failed to load DLL \"" + modulePath + "\"");
@@ -36,7 +36,7 @@ extern "C"
     }
 
     SLANG_RT_API void* SLANG_MCALL
-        _slang_rt_load_dll_func(void* moduleHandle, Slang::String funcName)
+        _slang_rt_load_dll_func(void* moduleHandle, Slang::String funcName, uint32_t argSize)
     {
         if (moduleHandle == nullptr)
         {
@@ -45,6 +45,13 @@ extern "C"
         auto lib = static_cast<ISlangSharedLibrary*>(moduleHandle);
         auto funcPtr = lib->findFuncByName(funcName.getBuffer());
         if (!funcPtr)
+        {
+            // If failed, try stdcall mangled name.
+            StringBuilder sb;
+            sb << "_" << funcName << "@" << argSize;
+            funcPtr = lib->findFuncByName(sb.ToString().getBuffer());
+        }
+        if (!funcPtr)
         {
             _slang_rt_abort("Cannot find function \"" + funcName + "\" in loaded library.");
         }
diff --git a/source/slang-rt/slang-rt.h b/source/slang-rt/slang-rt.h
index 3941b3acc..69d8a875b 100644
--- a/source/slang-rt/slang-rt.h
+++ b/source/slang-rt/slang-rt.h
@@ -26,7 +26,7 @@ extern "C"
     SLANG_RT_API void SLANG_MCALL _slang_rt_abort(Slang::String errorMessage);
     SLANG_RT_API void* SLANG_MCALL _slang_rt_load_dll(Slang::String modulePath);
     SLANG_RT_API void* SLANG_MCALL
-        _slang_rt_load_dll_func(void* moduleHandle, Slang::String modulePath);
+        _slang_rt_load_dll_func(void* moduleHandle, Slang::String modulePath, uint32_t argSize);
 }
 
 #endif
-- 
cgit v1.2.3