From d4316c88457a32f1169b2d7d82053ccbc05fa7ed Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Fri, 14 May 2021 17:50:00 -0400 Subject: FXC as DownstreamCompiler (#1844) * #include an absolute path didn't work - because paths were taken to always be relative. * WIP Fxc as downstream compiler. * First pass FXC downstream compiler working. * GCC compile fix. * Fix FXC parsing issue. * Special case filesystem access. * Use StringUtil getSlice. * Fix isses with not emitting source for FXC. * Small fixes for DXBC handling. --- source/slang/slang-include-system.h | 62 ------------------------------------- 1 file changed, 62 deletions(-) delete mode 100644 source/slang/slang-include-system.h (limited to 'source/slang/slang-include-system.h') diff --git a/source/slang/slang-include-system.h b/source/slang/slang-include-system.h deleted file mode 100644 index 70f6dd81e..000000000 --- a/source/slang/slang-include-system.h +++ /dev/null @@ -1,62 +0,0 @@ -#ifndef SLANG_INCLUDE_SYSTEM_H -#define SLANG_INCLUDE_SYSTEM_H -// slang-include-system.h - -#include "../compiler-core/slang-source-loc.h" - -namespace Slang -{ - -// A directory to be searched when looking for files (e.g., `#include`) -struct SearchDirectory -{ - SearchDirectory() = default; - SearchDirectory(SearchDirectory const& other) = default; - SearchDirectory(String const& path) - : path(path) - {} - - String path; -}; - -/// A list of directories to search for files (e.g., `#include`) -struct SearchDirectoryList -{ - // A parent list that should also be searched - SearchDirectoryList* parent = nullptr; - - // Directories to be searched - List searchDirectories; -}; - -/* A helper class that builds basic include handling on top of searchDirectories/fileSystemExt and optionally a sourceManager */ -struct IncludeSystem -{ - IncludeSystem(SearchDirectoryList* searchDirectories, ISlangFileSystemExt* fileSystemExt, SourceManager* sourceManager = nullptr) : - m_searchDirectories(searchDirectories), - m_fileSystemExt(fileSystemExt), - m_sourceManager(sourceManager) - { - } - - SlangResult findFile(const String& pathToInclude, const String& pathIncludedFrom, PathInfo& outPathInfo); - SlangResult findFile(SlangPathType fromPathType, const String& fromPath, const String& path, PathInfo& outPathInfo); - String simplifyPath(const String& path); - SlangResult loadFile(const PathInfo& pathInfo, ComPtr& outBlob); - - SlangResult findAndLoadFile(const String& pathToInclude, const String& pathIncludedFrom, PathInfo& outPathInfo, ComPtr& outBlob); - - SearchDirectoryList* getSearchDirectoryList() const { return m_searchDirectories; } - ISlangFileSystemExt* getFileSystem() const { return m_fileSystemExt; } - SourceManager* getSourceManager() const { return m_sourceManager; } - -protected: - - SearchDirectoryList* m_searchDirectories; - ISlangFileSystemExt* m_fileSystemExt; - SourceManager* m_sourceManager; ///< If not set, will not look up the content in the source manager -}; - -} - -#endif // SLANG_INCLUDE_HANDLER_H -- cgit v1.2.3