2 files changed, 3 insertions, 2 deletions
diff --git a/source/slang/slang-check-decl.cpp b/source/slang/slang-check-decl.cpp
index e4206827f..4a4ade047 100644
--- a/source/slang/slang-check-decl.cpp
+++ b/source/slang/slang-check-decl.cpp
@@ -8789,7 +8789,8 @@ void SemanticsDeclHeaderVisitor::checkMeshOutputDecl(VarDeclBase* varDecl)
         nullptr,
         ConstantFoldingKind::LinkTime,
         getSink());
-
+    if (!index)
+        return;
     Type* d = m_astBuilder->getMeshOutputTypeFromModifier(modifier, base, index);
     varDecl->type.type = d;
 }
diff --git a/source/slang/slang-emit-spirv.cpp b/source/slang/slang-emit-spirv.cpp
index b0da7e4a6..58f5e4f66 100644
--- a/source/slang/slang-emit-spirv.cpp
+++ b/source/slang/slang-emit-spirv.cpp
@@ -4467,7 +4467,7 @@ struct SPIRVEmitContext : public SourceEmitterBase, public SPIRVEmitSharedContex
                     if (t == "triangle")
                         m = SpvExecutionModeOutputTrianglesEXT;
                     else if (t == "line")
-                        m = SpvExecutionModeOutputTrianglesEXT;
+                        m = SpvExecutionModeOutputLinesEXT;
                     else if (t == "point")
                         m = SpvExecutionModeOutputPoints;
                 }