1 files changed, 5 insertions, 4 deletions
diff --git a/source/val/validate_primitives.cpp b/source/val/validate_primitives.cpp
index 3616cb99..7d11f2e7 100644
--- a/source/val/validate_primitives.cpp
+++ b/source/val/validate_primitives.cpp
@@ -35,10 +35,11 @@ spv_result_t PrimitivesPass(ValidationState_t& _, const Instruction* inst) {
     case SpvOpEndPrimitive:
     case SpvOpEmitStreamVertex:
     case SpvOpEndStreamPrimitive:
-      _.current_function().RegisterExecutionModelLimitation(
-          SpvExecutionModelGeometry,
-          std::string(spvOpcodeString(opcode)) +
-              " instructions require Geometry execution model");
+      _.function(inst->function()->id())
+          ->RegisterExecutionModelLimitation(
+              SpvExecutionModelGeometry,
+              std::string(spvOpcodeString(opcode)) +
+                  " instructions require Geometry execution model");
       break;
     default:
       break;