diff options
Diffstat (limited to 'source/slang')
| -rw-r--r-- | source/slang/slang-compiler.h | 6 | ||||
| -rw-r--r-- | source/slang/slang-parser.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/slang/slang-compiler.h b/source/slang/slang-compiler.h index 8a9b8985a..26a4bb43b 100644 --- a/source/slang/slang-compiler.h +++ b/source/slang/slang-compiler.h @@ -1520,12 +1520,12 @@ public: return SLANG_OK; } - virtual SlangInt32 SLANG_MCALL getDefinedEntryPointCount() override + virtual SLANG_NO_THROW SlangInt32 SLANG_MCALL getDefinedEntryPointCount() override { return (SlangInt32)m_entryPoints.getCount(); } - virtual SlangResult SLANG_MCALL + virtual SLANG_NO_THROW SlangResult SLANG_MCALL getDefinedEntryPoint(SlangInt32 index, slang::IEntryPoint** outEntryPoint) override { if (index < 0 || index >= m_entryPoints.getCount()) @@ -1625,7 +1625,7 @@ public: virtual void buildHash(DigestBuilder<SHA1>& builder) SLANG_OVERRIDE; - virtual slang::DeclReflection* SLANG_MCALL getModuleReflection() SLANG_OVERRIDE; + virtual SLANG_NO_THROW slang::DeclReflection* SLANG_MCALL getModuleReflection() SLANG_OVERRIDE; void setDigest(SHA1::Digest const& digest) { m_digest = digest; } SHA1::Digest computeDigest(); diff --git a/source/slang/slang-parser.cpp b/source/slang/slang-parser.cpp index b7828999a..00f15cbb3 100644 --- a/source/slang/slang-parser.cpp +++ b/source/slang/slang-parser.cpp @@ -8098,7 +8098,7 @@ static std::optional<SPIRVAsmInst> parseSPIRVAsmInst(Parser* parser) } if (ret.opcode.flavor == SPIRVAsmOperand::Flavor::NamedValue && - ret.opcode.knownValue == SpvOp(0xffffffff)) + ret.opcode.knownValue == (SpvWord)(SpvOp(0xffffffff))) { if (ret.opcode.token.type == TokenType::IntegerLiteral) { |