Add EXT_mesh_shader validation support

source/val/validate_annotation.cpp

@@ -143,6 +143,11 @@ spv_result_t ValidateDecorationTarget(ValidationState_t& _, spv::Decoration dec,
         return fail(0) << "must be a variable";
       }
       break;
+    case spv::Decoration::PerPrimitiveNV:
+      if (target->opcode() != spv::Op::OpVariable) {
+        return fail(0) << "must be a memory object declaration";
+      }
+      break;
     case spv::Decoration::NoPerspective:
     case spv::Decoration::Flat:
     case spv::Decoration::Patch:
@@ -361,6 +366,15 @@ spv_result_t ValidateMemberDecorate(ValidationState_t& _,
            << _.SpvDecorationString(decoration)
            << " cannot be applied to structure members";
   }
+
+  const auto target_id = inst->GetOperandAs<uint32_t>(0);
+  const auto target = _.FindDef(target_id);
+  if (decoration == spv::Decoration::PerPrimitiveNV && 
+    target->opcode() != spv::Op::OpTypeStruct) {
+      return _.diag(SPV_ERROR_INVALID_ID, inst)
+             << _.SpvDecorationString(decoration)
+             << " must be a memory object declaration";
+  }
 
   return SPV_SUCCESS;
 }

source/val/validate_builtins.cpp

@@ -667,6 +667,36 @@ class BuiltInsValidator {
   // instruction.
   void Update(const Instruction& inst);
 
+  uint32_t GetMeshEntryPoint() {
+    if (mesh_entry_point_ == 0) {
+      for (const uint32_t entry_point : _.entry_points()) {
+        // Every entry point from which this function is called needs to have
+        // Execution Mode DepthReplacing.
+        const auto* models = _.GetExecutionModels(entry_point);
+        if (models->find(spv::ExecutionModel::MeshEXT ) != models->end() ||
+            models->find(spv::ExecutionModel::MeshNV ) != models->end()) {
+          mesh_entry_point_ = entry_point;
+          break;
+        }
+      }
+    }
+    return mesh_entry_point_;
+  }
+
+  bool isMeshInterfaceVar(const Instruction& inst) {
+    uint32_t mesh_entry_point = GetMeshEntryPoint();
+    if (!mesh_entry_point) return false;
+    for (const auto& desc : _.entry_point_descriptions(mesh_entry_point)) {
+      for (auto interface : desc.interfaces) {
+        if (inst.id() == interface) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+
   ValidationState_t& _;
 
   // Mapping id -> list of rules which validate instruction referencing the
@@ -684,7 +714,7 @@ class BuiltInsValidator {
   // or to no_entry_points_. The pointer is guaranteed to never be null.
   const std::vector<uint32_t> no_entry_points;
   const std::vector<uint32_t>* entry_points_ = &no_entry_points;
-
+  uint32_t mesh_entry_point_ = 0;
   // Execution models with which the current function can be called.
   std::set<spv::ExecutionModel> execution_models_;
 };
@@ -2146,6 +2176,28 @@ spv_result_t BuiltInsValidator::ValidatePrimitiveIdAtDefinition(
         return error;
       }
     }
+
+    if (isMeshInterfaceVar(inst)) {
+      if (_.HasCapability(spv::Capability::MeshShadingEXT) &&
+          !_.HasDecoration(inst.id(), spv::Decoration::PerPrimitiveEXT)) {
+        return _.diag(SPV_ERROR_INVALID_DATA, &inst)
+               << _.VkErrorID(7040)
+               << "According to the Vulkan spec the variable decorated with "
+                  "Builtin PrimitiveId within the MeshEXT Execution Model must "
+                  "also be decorated with the PerPrimitiveEXT decoration. ";
+      }
+#if 0
+      const spv::StorageClass storage_class =
+          inst.GetOperandAs<spv::StorageClass>(2);
+      if (storage_class != spv::StorageClass::Output) {
+        return _.diag(SPV_ERROR_INVALID_DATA, &inst)
+               << _.VkErrorID(4336)
+               << "According to the Vulkan spec the variable decorated with "
+                  "Builtin PrimitiveId within the MeshEXT Execution Model must "
+                  "must be declared using the Output Storage Class. ";
+      }
+#endif
+    }
   }
 
   // Seed at reference checks with this built-in.
@@ -2753,6 +2805,21 @@ spv_result_t BuiltInsValidator::ValidateLayerOrViewportIndexAtDefinition(
         return error;
       }
     }
+
+    if (isMeshInterfaceVar(inst) &&
+        _.HasCapability(spv::Capability::MeshShadingEXT) &&
+        !_.HasDecoration(inst.id(), spv::Decoration::PerPrimitiveEXT)) {
+      const spv::BuiltIn label = spv::BuiltIn(decoration.params()[0]);
+      uint32_t vkerrid = (label == spv::BuiltIn::Layer) ? 7039 : 7060;
+      return _.diag(SPV_ERROR_INVALID_DATA, &inst)
+             << _.VkErrorID(vkerrid)
+             << "According to the Vulkan spec the variable decorated with "
+                "Builtin "
+             << _.grammar().lookupOperandName(SPV_OPERAND_TYPE_BUILT_IN,
+                                              decoration.params()[0])
+             << " within the MeshEXT Execution Model must also be decorated "
+                "with the PerPrimitiveEXT decoration. ";
+    }
   }
 
   // Seed at reference checks with this built-in.
@@ -3458,6 +3525,7 @@ spv_result_t BuiltInsValidator::ValidateViewIndexAtReference(
                                    referenced_from_inst, execution_model);
       }
     }
+
   }
 
   if (function_id_ == 0) {
@@ -4167,6 +4235,23 @@ spv_result_t BuiltInsValidator::ValidateRayTracingBuiltinsAtReference(
 spv_result_t BuiltInsValidator::ValidateMeshShadingEXTBuiltinsAtDefinition(
     const Decoration& decoration, const Instruction& inst) {
   if (spvIsVulkanEnv(_.context()->target_env)) {
+    uint32_t mesh_entry_point = GetMeshEntryPoint();
+    assert(mesh_entry_point);
+    bool execution_mode_OuputPoints = false;
+    bool execution_mode_OutputLinesEXT = false;
+    bool execution_mode_OutputTrianglesEXT = false;
+
+    const auto* modes = _.GetExecutionModes(mesh_entry_point);
+    if (modes->find(spv::ExecutionMode::OutputPoints) != modes->end()) {
+        execution_mode_OuputPoints = true;
+    }
+    if (modes->find(spv::ExecutionMode::OutputLinesEXT) != modes->end()) {
+        execution_mode_OutputLinesEXT = true;
+    }
+    if (modes->find(spv::ExecutionMode::OutputTrianglesEXT) !=
+        modes->end()) {
+        execution_mode_OutputTrianglesEXT = true;
+    }
     const spv::BuiltIn builtin = spv::BuiltIn(decoration.params()[0]);
     uint32_t vuid = GetVUIDForBuiltin(builtin, VUIDErrorType);
     if (builtin == spv::BuiltIn::PrimitivePointIndicesEXT) {
@@ -4185,6 +4270,12 @@ spv_result_t BuiltInsValidator::ValidateMeshShadingEXTBuiltinsAtDefinition(
               })) {
         return error;
       }
+      if (!execution_mode_OuputPoints) {
+        return _.diag(SPV_ERROR_INVALID_DATA, &inst)
+               << _.VkErrorID(7042)
+               << "The PrimitivePointIndicesEXT decoration must be used with "
+                  "the OutputPoints Execution Mode";
+      }
     }
     if (builtin == spv::BuiltIn::PrimitiveLineIndicesEXT) {
       if (spv_result_t error = ValidateArrayedI32Vec(
@@ -4203,6 +4294,12 @@ spv_result_t BuiltInsValidator::ValidateMeshShadingEXTBuiltinsAtDefinition(
               })) {
         return error;
       }
+      if (!execution_mode_OutputLinesEXT) {
+        return _.diag(SPV_ERROR_INVALID_DATA, &inst)
+               << _.VkErrorID(7048)
+               << "The PrimitiveLineIndicesEXT decoration must be used with "
+                  "the OutputLinesEXT Execution Mode";
+      }
     }
     if (builtin == spv::BuiltIn::PrimitiveTriangleIndicesEXT) {
       if (spv_result_t error = ValidateArrayedI32Vec(
@@ -4221,6 +4318,12 @@ spv_result_t BuiltInsValidator::ValidateMeshShadingEXTBuiltinsAtDefinition(
               })) {
         return error;
       }
+      if (!execution_mode_OutputTrianglesEXT) {
+        return _.diag(SPV_ERROR_INVALID_DATA, &inst)
+               << _.VkErrorID(7054)
+               << "The PrimitiveTriangleIndicesEXT decoration must be used with "
+                  "the OutputTrianglesEXT Execution Mode";
+      }
     }
   }
   // Seed at reference checks with this built-in.
@@ -4249,7 +4352,6 @@ spv_result_t BuiltInsValidator::ValidateMeshShadingEXTBuiltinsAtReference(
                                  referenced_from_inst)
              << " " << GetStorageClassDesc(referenced_from_inst);
     }
-
     for (const spv::ExecutionModel execution_model : execution_models_) {
       if (execution_model != spv::ExecutionModel::MeshEXT) {
         uint32_t vuid = GetVUIDForBuiltin(builtin, VUIDErrorExecutionModel);

source/val/validate_decorations.cpp

@@ -767,6 +767,7 @@ spv_result_t CheckDecorationsOfEntryPoints(ValidationState_t& vstate) {
     int num_workgroup_variables = 0;
     int num_workgroup_variables_with_block = 0;
     int num_workgroup_variables_with_aliased = 0;
+    bool has_task_payload = false;
     for (const auto& desc : descs) {
       std::unordered_set<Instruction*> seen_vars;
       for (auto interface : desc.interfaces) {
@@ -779,6 +780,19 @@ spv_result_t CheckDecorationsOfEntryPoints(ValidationState_t& vstate) {
         }
         const spv::StorageClass storage_class =
             var_instr->GetOperandAs<spv::StorageClass>(2);
+        if (vstate.version() >= SPV_SPIRV_VERSION_WORD(1, 5)) {
+          // SPV_EXT_mesh_shader, at most one task payload is permitted
+          // per entry point
+          if (storage_class == spv::StorageClass::TaskPayloadWorkgroupEXT) {
+            if (has_task_payload) {
+              return vstate.diag(SPV_ERROR_INVALID_ID, var_instr)
+                     << "There can be at most one OpVariable with storage "
+                        "class TaskPayloadWorkgroupEXT associated with "
+                        "an OpEntryPoint";
+            }
+            has_task_payload = true;
+          }
+        }
         if (vstate.version() >= SPV_SPIRV_VERSION_WORD(1, 4)) {
           // Starting in 1.4, OpEntryPoint must list all global variables
           // it statically uses and those interfaces must be unique.

source/val/validate_mesh_shading.cpp

@@ -15,13 +15,32 @@
 // Validates ray query instructions from SPV_KHR_ray_query
 
 #include "source/opcode.h"
+#include "source/spirv_target_env.h"
 #include "source/val/instruction.h"
 #include "source/val/validate.h"
 #include "source/val/validation_state.h"
 
 namespace spvtools {
 namespace val {
 
+bool IsInterfaceVariable(ValidationState_t& _, const Instruction* inst,
+                         spv::ExecutionModel model) {
+  bool foundInterface = false;
+  for (auto entry_point : _.entry_points()) {
+    const auto* models = _.GetExecutionModels(entry_point);
+    if (models->find(model) == models->end()) return false;
+    for (const auto& desc : _.entry_point_descriptions(entry_point)) {
+      for (auto interface : desc.interfaces) {
+        if (inst->id() == interface) {
+          foundInterface = true;
+          break;
+        }
+      }
+    }
+  }
+  return foundInterface;
+}
+
 spv_result_t MeshShadingPass(ValidationState_t& _, const Instruction* inst) {
   const spv::Op opcode = inst->opcode();
   switch (opcode) {
@@ -103,15 +122,48 @@ spv_result_t MeshShadingPass(ValidationState_t& _, const Instruction* inst) {
         return _.diag(SPV_ERROR_INVALID_DATA, inst)
                << "Primitive Count must be a 32-bit unsigned int scalar";
       }
-
+      
       break;
     }
 
     case spv::Op::OpWritePackedPrimitiveIndices4x8NV: {
       // No validation rules (for the moment).
       break;
     }
-
+    case spv::Op::OpVariable: {
+      if (_.HasCapability(spv::Capability::MeshShadingEXT)) {
+        bool meshInterfaceVar = IsInterfaceVariable(
+            _, inst, spv::ExecutionModel::MeshEXT);
+        bool fragInterfaceVar = IsInterfaceVariable(
+            _, inst, spv::ExecutionModel::Fragment);
+
+        const spv::StorageClass storage_class =
+            inst->GetOperandAs<spv::StorageClass>(2);
+        bool storage_output = (storage_class == spv::StorageClass::Output);
+        bool storage_input = (storage_class == spv::StorageClass::Input);
+
+        if (_.HasDecoration(inst->id(), spv::Decoration::PerPrimitiveEXT)) {
+          if (fragInterfaceVar && !storage_input) {
+            return _.diag(SPV_ERROR_INVALID_DATA, inst)
+                   << "PerPrimitiveEXT decoration must be applied only to "
+                      "variables in the Input Storage Class in the Fragment "
+                      "Execution Model.";
+          }
+
+          if (meshInterfaceVar && !storage_output) {
+            std::string vkerror = (spvIsVulkanEnv(_.context()->target_env))
+                                      ? _.VkErrorID(4336)
+                                      : "";
+            return _.diag(SPV_ERROR_INVALID_DATA, inst)
+                   << vkerror
+                   << "PerPrimitiveEXT decoration must be applied only to "
+                      "variables in the Output Storage Class in the "
+                      "Storage Class in the MeshEXT Execution Model.";
+          }
+        }
+      }
+      break;
+    } 
     default:
       break;
   }

source/val/validate_mode_setting.cpp

@@ -543,6 +543,15 @@ spv_result_t ValidateExecutionMode(ValidationState_t& _,
                     "tessellation execution model.";
         }
       }
+      if (spvIsVulkanEnv(_.context()->target_env)) {
+        if (_.HasCapability(spv::Capability::MeshShadingEXT) &&
+            inst->GetOperandAs<uint32_t>(2) == 0) {
+          return _.diag(SPV_ERROR_INVALID_DATA, inst)
+                 << _.VkErrorID(7330)
+                 << "In mesh shaders using the MeshEXT Execution Model the "
+                    "OutputVertices Execution Mode must be greater than 0";
+        }
+      }
       break;
     case spv::ExecutionMode::OutputLinesEXT:
     case spv::ExecutionMode::OutputTrianglesEXT:
@@ -557,6 +566,16 @@ spv_result_t ValidateExecutionMode(ValidationState_t& _,
                   "execution "
                   "model.";
       }
+      if (mode == spv::ExecutionMode::OutputPrimitivesEXT &&
+          spvIsVulkanEnv(_.context()->target_env)) {
+        if (_.HasCapability(spv::Capability::MeshShadingEXT) &&
+            inst->GetOperandAs<uint32_t>(2) == 0) {
+          return _.diag(SPV_ERROR_INVALID_DATA, inst)
+                 << _.VkErrorID(7331)
+                 << "In mesh shaders using the MeshEXT Execution Model the "
+                    "OutputPrimitivesEXT Execution Mode must be greater than 0";
+        }
+      }
       break;
     case spv::ExecutionMode::QuadDerivativesKHR:
       if (!std::all_of(models->begin(), models->end(),