summaryrefslogtreecommitdiffstats
path: root/source/slang/slang-workspace-version.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/slang/slang-workspace-version.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/slang/slang-workspace-version.cpp')
-rw-r--r--source/slang/slang-workspace-version.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/slang/slang-workspace-version.cpp b/source/slang/slang-workspace-version.cpp
index 2451290f5..ebfe9218a 100644
--- a/source/slang/slang-workspace-version.cpp
+++ b/source/slang/slang-workspace-version.cpp
@@ -330,8 +330,7 @@ SlangResult Workspace::loadFile(const char* path, ISlangBlob** outBlob)
RefPtr<DocumentVersion> doc;
if (openedDocuments.TryGetValue(canonnicalPath, doc))
{
- RefPtr<StringBlob> stringBlob = new StringBlob(doc->getText());
- *outBlob = stringBlob.detach();
+ *outBlob = StringBlob::create(doc->getText()).detach();
return SLANG_OK;
}
return Slang::OSFileSystem::getExtSingleton()->loadFile(path, outBlob);
@@ -479,7 +478,8 @@ Module* WorkspaceVersion::getOrLoadModule(String path)
if (!doc)
return nullptr;
ComPtr<ISlangBlob> diagnosticBlob;
- RefPtr<StringBlob> sourceBlob = new StringBlob((*doc)->getText());
+ auto sourceBlob = StringBlob::create((*doc)->getText());
+
auto moduleName = getMangledNameFromNameString(path.getUnownedSlice());
linkage->contentAssistInfo.primaryModuleName = linkage->getNamePool()->getName(moduleName);
linkage->contentAssistInfo.primaryModulePath = path;
@@ -494,7 +494,7 @@ Module* WorkspaceVersion::getOrLoadModule(String path)
auto parsedModule = linkage->loadModuleFromSource(
moduleName.getBuffer(),
path.getBuffer(),
- sourceBlob.Ptr(),
+ sourceBlob,
diagnosticBlob.writeRef());
if (parsedModule)
{