From 1378fffd9da094beb41b2db89b96f556c23ab6cb Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Wed, 10 Aug 2022 10:04:06 -0400 Subject: 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. --- source/core/slang-blob.cpp | 65 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 61 insertions(+), 4 deletions(-) (limited to 'source/core/slang-blob.cpp') diff --git a/source/core/slang-blob.cpp b/source/core/slang-blob.cpp index 569991508..0da8f6292 100644 --- a/source/core/slang-blob.cpp +++ b/source/core/slang-blob.cpp @@ -2,19 +2,76 @@ namespace Slang { +/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! BlobBase !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ + ISlangUnknown* BlobBase::getInterface(const Guid& guid) { - return (guid == ISlangUnknown::getTypeGuid() || guid == ISlangBlob::getTypeGuid()) ? static_cast(this) : nullptr; + if (guid == ISlangUnknown::getTypeGuid() || + guid == ISlangBlob::getTypeGuid()) + { + return static_cast(this); + } + if (guid == ICastable::getTypeGuid()) + { + return static_cast(this); + } + return nullptr; +} + +void* BlobBase::getObject(const Guid& guid) +{ + SLANG_UNUSED(guid); + return nullptr; } +void* BlobBase::castAs(const SlangUUID& guid) +{ + if (auto intf = getInterface(guid)) + { + return intf; + } + return getObject(guid); +} + +/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! StaticBlob !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ + SlangResult StaticBlob::queryInterface(SlangUUID const& guid, void** outObject) { - if (guid == ISlangUnknown::getTypeGuid() || guid == ISlangBlob::getTypeGuid()) + if (auto intf = getInterface(guid)) { - *outObject = static_cast(this); + *outObject = intf; return SLANG_OK; } return SLANG_E_NO_INTERFACE; } - + +void* StaticBlob::castAs(const SlangUUID& guid) +{ + if (auto intf = getInterface(guid)) + { + return intf; + } + return getObject(guid); +} + +ISlangUnknown* StaticBlob::getInterface(const Guid& guid) +{ + if (guid == ISlangUnknown::getTypeGuid() || + guid == ISlangBlob::getTypeGuid()) + { + return static_cast(this); + } + if (guid == ICastable::getTypeGuid()) + { + return static_cast(this); + } + return nullptr; +} + +void* StaticBlob::getObject(const Guid& guid) +{ + SLANG_UNUSED(guid); + return nullptr; +} + } // namespace Slang -- cgit v1.2.3