From f65d756bff8d4c5cbc15bd0322a2ae8e6b896a21 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 29 Oct 2024 14:49:26 +0800 Subject: format * format * Minor test fixes * enable checking cpp format in ci --- source/slang/slang-module-library.cpp | 44 ++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 14 deletions(-) (limited to 'source/slang/slang-module-library.cpp') diff --git a/source/slang/slang-module-library.cpp b/source/slang/slang-module-library.cpp index 02ace07d3..060c9007c 100644 --- a/source/slang/slang-module-library.cpp +++ b/source/slang/slang-module-library.cpp @@ -1,24 +1,23 @@ // slang-module-library.cpp #include "slang-module-library.h" -#include #include "../core/slang-blob.h" #include "../core/slang-riff.h" - #include "../core/slang-type-text-util.h" +#include + // Serialization -#include "slang-serialize-ir.h" #include "slang-serialize-container.h" +#include "slang-serialize-ir.h" -namespace Slang { +namespace Slang +{ void* ModuleLibrary::getInterface(const Guid& uuid) { - if (uuid == ISlangUnknown::getTypeGuid() || - uuid == ICastable::getTypeGuid() || - uuid == IArtifactRepresentation::getTypeGuid() || - uuid == IModuleLibrary::getTypeGuid()) + if (uuid == ISlangUnknown::getTypeGuid() || uuid == ICastable::getTypeGuid() || + uuid == IArtifactRepresentation::getTypeGuid() || uuid == IModuleLibrary::getTypeGuid()) { return static_cast(this); } @@ -39,7 +38,12 @@ void* ModuleLibrary::castAs(const Guid& guid) return getObject(guid); } -SlangResult loadModuleLibrary(const Byte* inBytes, size_t bytesCount, String path, EndToEndCompileRequest* req, ComPtr& outLibrary) +SlangResult loadModuleLibrary( + const Byte* inBytes, + size_t bytesCount, + String path, + EndToEndCompileRequest* req, + ComPtr& outLibrary) { auto library = new ModuleLibrary; ComPtr scopeLibrary(library); @@ -63,7 +67,8 @@ SlangResult loadModuleLibrary(const Byte* inBytes, size_t bytesCount, String pat options.sink = req->getSink(); options.astBuilder = linkage->getASTBuilder(); options.modulePath = path; - SLANG_RETURN_ON_FAIL(SerialContainerUtil::read(&riffContainer, options, nullptr, containerData)); + SLANG_RETURN_ON_FAIL( + SerialContainerUtil::read(&riffContainer, options, nullptr, containerData)); DiagnosticSink sink; // Modules in the container should be serialized in its depedency order, @@ -80,7 +85,8 @@ SlangResult loadModuleLibrary(const Byte* inBytes, size_t bytesCount, String pat auto loadedModule = linkage->loadDeserializedModule( as(module.astRootNode)->getName(), PathInfo::makePath(module.dependentFiles.getFirst()), - module, &sink); + module, + &sink); if (!loadedModule) return SLANG_FAIL; library->m_modules.add(loadedModule); @@ -103,7 +109,12 @@ SlangResult loadModuleLibrary(const Byte* inBytes, size_t bytesCount, String pat return SLANG_OK; } -SlangResult loadModuleLibrary(ArtifactKeep keep, IArtifact* artifact, String path, EndToEndCompileRequest* req, ComPtr& outLibrary) +SlangResult loadModuleLibrary( + ArtifactKeep keep, + IArtifact* artifact, + String path, + EndToEndCompileRequest* req, + ComPtr& outLibrary) { if (auto foundLibrary = findRepresentation(artifact)) { @@ -117,8 +128,13 @@ SlangResult loadModuleLibrary(ArtifactKeep keep, IArtifact* artifact, String pat // Load the module ComPtr library; - SLANG_RETURN_ON_FAIL(loadModuleLibrary((const Byte*)blob->getBufferPointer(), blob->getBufferSize(), path, req, library)); - + SLANG_RETURN_ON_FAIL(loadModuleLibrary( + (const Byte*)blob->getBufferPointer(), + blob->getBufferSize(), + path, + req, + library)); + if (canKeep(keep)) { artifact->addRepresentation(library); -- cgit v1.2.3