summaryrefslogtreecommitdiffstats
path: root/source/core/slang-shared-library.cpp
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2022-08-10 10:04:06 -0400
committerGitHub <noreply@github.com>2022-08-10 10:04:06 -0400
commit1378fffd9da094beb41b2db89b96f556c23ab6cb (patch)
treee0558c031bd4b1a013dc56b75c4caa3ff5442021 /source/core/slang-shared-library.cpp
parent89083c4b50af8e48e70b25b63cc62aca21ab706c (diff)
Artifact and ICastable (#2351)
* #include an absolute path didn't work - because paths were taken to always be relative. * WIP with hierarchical enums. * Some small fixes and improvements around artifact desc related types. * Improvements around hierarchical enum. * Fixes to get Artifact types refactor to be able to execute tests. * Attempt to better categorize PTX. * Work around for potentially unused function warning. * Typo fix. * Simplify Artifact header. * Small improvements around Artifact kind/payload/style. * Added IDestroyable/ICastable * Add IArtifactList. * First impl of IArtifactUtil. * Use the ICastable interface for IArtifactRepresentation. * Added IArtifactRepresentation & IArtifactAssociated. * Add SLANG_OVERRIDE to avoid gcc/clang warning. * Fix calling convention issue on win32. * Fix missing SLANG_OVERRIDE. * First attempt at file abstraction around Artifact. * Added creation of lock file. * Move functionality for determining file paths to the IArtifactUtil. Add casting to ICastable. * Added some casting/finding mechanisms. * Simplify IArtifact interface, and use Items for file reps. * Fix problem with libraries on DXIL. * Split out ArtifactRepresentation. * Move ArtifactDesc functionality to ArtifactDescUtil. ArtifactInfoUtil becomes ArtifactDescUtil. * Split implementations from the interfaces for Artifact. * Use TypeTextUtil for target name outputting. * Add artifact impls. * Add ICastableList * Added UnknownCastableAdapter * Make ISlangSharedLibrary derive from ICastable, and remain backwards compatible with slang-llvm. * Refactor Representation on Artifact. * Make our ISlangBlobs also derive from ICastable. Make ISlangBlob atomic ref counted. * Fix typo.
Diffstat (limited to 'source/core/slang-shared-library.cpp')
-rw-r--r--source/core/slang-shared-library.cpp46
1 files changed, 29 insertions, 17 deletions
diff --git a/source/core/slang-shared-library.cpp b/source/core/slang-shared-library.cpp
index 6ce10ad9e..0e4f0ee73 100644
--- a/source/core/slang-shared-library.cpp
+++ b/source/core/slang-shared-library.cpp
@@ -62,7 +62,7 @@ SlangResult DefaultSharedLibraryLoader::loadPlatformSharedLibrary(const char* pa
}
}
-/* !!!!!!!!!!!!!!!!!!!!!!!!!! DefaultSharedLibrary !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
+/* !!!!!!!!!!!!!!!!!!!!!!!!!! TemporarySharedLibrary !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
TemporarySharedLibrary::~TemporarySharedLibrary()
{
@@ -76,38 +76,50 @@ TemporarySharedLibrary::~TemporarySharedLibrary()
/* !!!!!!!!!!!!!!!!!!!!!!!!!! DefaultSharedLibrary !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-SLANG_NO_THROW SlangResult SLANG_MCALL DefaultSharedLibrary::queryInterface(SlangUUID const& uuid, void** outObject)
+DefaultSharedLibrary::~DefaultSharedLibrary()
{
- // Mechanism to cast to underlying type.
- // NOTE! Purposefully does not ref count
- if (uuid == DefaultSharedLibrary::getTypeGuid())
+ if (m_sharedLibraryHandle)
{
- *outObject = this;
- return SLANG_OK;
+ SharedLibrary::unload(m_sharedLibraryHandle);
}
+}
+
+void* DefaultSharedLibrary::findSymbolAddressByName(char const* name)
+{
+ return SharedLibrary::findSymbolAddressByName(m_sharedLibraryHandle, name);
+}
- if (uuid == ISlangUnknown::getTypeGuid() || uuid == ISlangSharedLibrary::getTypeGuid())
+void* DefaultSharedLibrary::castAs(const SlangUUID& guid)
+{
+ if (auto intf = getInterface(guid))
{
- ++m_refCount;
- *outObject = static_cast<ISlangSharedLibrary*>(this);
- return SLANG_OK;
+ return intf;
}
- return SLANG_E_NO_INTERFACE;
+ return getObject(guid);
}
-DefaultSharedLibrary::~DefaultSharedLibrary()
+void* DefaultSharedLibrary::getInterface(const Guid& guid)
{
- if (m_sharedLibraryHandle)
+ if (guid == ISlangUnknown::getTypeGuid() ||
+ guid == ICastable::getTypeGuid() ||
+ guid == ISlangSharedLibrary::getTypeGuid())
{
- SharedLibrary::unload(m_sharedLibraryHandle);
+ return static_cast<ISlangSharedLibrary*>(this);
}
+ return nullptr;
}
-void* DefaultSharedLibrary::findSymbolAddressByName(char const* name)
+void* DefaultSharedLibrary::getObject(const Guid& guid)
{
- return SharedLibrary::findSymbolAddressByName(m_sharedLibraryHandle, name);
+ if (guid == DefaultSharedLibrary::getTypeGuid())
+ {
+ return this;
+ }
+ return nullptr;
}
+/* !!!!!!!!!!!!!!!!!!!!!!!!!! SharedLibraryUtils !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
+
String SharedLibraryUtils::getSharedLibraryFileName(void* symbolInLib)
{
#if defined(_WIN32)