summaryrefslogtreecommitdiff
path: root/source/compiler-core/slang-dxc-compiler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'source/compiler-core/slang-dxc-compiler.cpp')
-rw-r--r--source/compiler-core/slang-dxc-compiler.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/source/compiler-core/slang-dxc-compiler.cpp b/source/compiler-core/slang-dxc-compiler.cpp
index 771aa870a..5126e53cc 100644
--- a/source/compiler-core/slang-dxc-compiler.cpp
+++ b/source/compiler-core/slang-dxc-compiler.cpp
@@ -155,15 +155,15 @@ protected:
IncludeSystem m_system;
};
-class DXCDownstreamCompiler : public DownstreamCompiler
+class DXCDownstreamCompiler : public DownstreamCompilerBase
{
public:
- typedef DownstreamCompiler Super;
+ typedef DownstreamCompilerBase Super;
- // DownstreamCompiler
- virtual SlangResult compile(const CompileOptions& options, RefPtr<DownstreamCompileResult>& outResult) SLANG_OVERRIDE;
- virtual SlangResult disassemble(SlangCompileTarget sourceBlobTarget, const void* blob, size_t blobSize, ISlangBlob** out) SLANG_OVERRIDE;
- virtual bool isFileBased() SLANG_OVERRIDE { return false; }
+ // IDownstreamCompiler
+ virtual SLANG_NO_THROW SlangResult SLANG_MCALL compile(const CompileOptions& options, RefPtr<DownstreamCompileResult>& outResult) SLANG_OVERRIDE;
+ virtual SLANG_NO_THROW SlangResult SLANG_MCALL disassemble(SlangCompileTarget sourceBlobTarget, const void* blob, size_t blobSize, ISlangBlob** out) SLANG_OVERRIDE;
+ virtual SLANG_NO_THROW bool SLANG_MCALL isFileBased() SLANG_OVERRIDE { return false; }
/// Must be called before use
SlangResult init(ISlangSharedLibrary* library);
@@ -174,7 +174,6 @@ protected:
DxcCreateInstanceProc m_createInstance = nullptr;
-
ComPtr<ISlangSharedLibrary> m_sharedLibrary;
};
@@ -560,10 +559,11 @@ SlangResult DXCDownstreamCompiler::disassemble(SlangCompileTarget sourceBlobTarg
return SLANG_FAIL;
}
- RefPtr<DXCDownstreamCompiler> compiler(new DXCDownstreamCompiler);
+ auto compiler = new DXCDownstreamCompiler;
+ ComPtr<IDownstreamCompiler> compilerIntf(compiler);
SLANG_RETURN_ON_FAIL(compiler->init(library));
- set->addCompiler(compiler);
+ set->addCompiler(compilerIntf);
return SLANG_OK;
}