Add support for QCOM tile shading

Author: wooyoungqcom

source/val/validate_decorations.cpp

@@ -1765,6 +1765,7 @@ spv_result_t CheckNonWritableDecoration(ValidationState_t& vstate,
          var_storage_class == spv::StorageClass::Private) &&
         vstate.features().nonwritable_var_in_function_or_private) {
       // New permitted feature in SPIR-V 1.4.
+    } else if (var_storage_class == spv::StorageClass::TileAttachmentQCOM) {
     } else if (
         // It may point to a UBO, SSBO, storage image, or raw access chain.
         vstate.IsPointerToUniformBlock(type_id) ||

source/val/validate_memory.cpp

@@ -937,6 +937,53 @@ spv_result_t ValidateVariable(ValidationState_t& _, const Instruction* inst) {
     }
   }
 
+  if (_.HasCapability(spv::Capability::TileShadingQCOM) &&
+      storage_class == spv::StorageClass::TileAttachmentQCOM) {
+    if (result_type->opcode() == spv::Op::OpTypeImage) {
+      spv::Dim dim = static_cast<spv::Dim>(inst->word(3));
+      if (dim != spv::Dim::Dim2D) {
+        return _.diag(SPV_ERROR_INVALID_DATA, inst)
+               << "Any OpTpeImage variable in the TileAttachmentQCOM Storage Class must "
+                  "have 2D as its dimension";
+      }
+      unsigned sampled = inst->word(7);
+      if (sampled != 1 && sampled != 2) {
+        return _.diag(SPV_ERROR_INVALID_DATA, inst)
+               << "Any OpTpeImage variable in the TileAttachmentQCOM Storage Class must "
+                  "have 1 or 2 as Image 'Sampled' parameter";
+      }
+      for (const auto& pair : inst->uses()) {
+        const auto* use_inst = pair.first;
+        switch (use_inst->opcode()) {
+          case spv::Op::OpImageQueryFormat:
+          case spv::Op::OpImageQueryOrder:
+          case spv::Op::OpImageQuerySizeLod:
+          case spv::Op::OpImageQuerySize:
+          case spv::Op::OpImageQueryLod:
+          case spv::Op::OpImageQueryLevels:
+          case spv::Op::OpImageQuerySamples:
+             return _.diag(SPV_ERROR_INVALID_DATA, inst) 
+                    << "Any variable in the TileAttachmentQCOM Storage Class must "
+                       "not be consumed by an OpImageQuery* instruction";
+          default:
+            break;
+        }
+      }
+    }
+
+    if (!(_.HasDecoration(inst->id(), spv::Decoration::DescriptorSet) &&
+          _.HasDecoration(inst->id(), spv::Decoration::Binding))) {
+      return _.diag(SPV_ERROR_INVALID_ID, inst)
+             << "Any variable in the TileAttachmentQCOM Storage Class must "
+                "be decorated with DescriptorSet and Binding";
+    }
+    if (_.HasDecoration(inst->id(), spv::Decoration::Component)) {
+      return _.diag(SPV_ERROR_INVALID_ID, inst)
+             << "Any variable in the TileAttachmentQCOM Storage Class must "
+                "not be decorated with Component decoration";
+    }
+  }
+
   return SPV_SUCCESS;
 }
 

source/val/validate_mode_setting.cpp

@@ -286,11 +286,15 @@ spv_result_t ValidateEntryPoint(ValidationState_t& _, const Instruction* inst) {
 
   // TODO - Need to add TileShadingRateQCOM support
   if (spvIsVulkanEnv(_.context()->target_env)) {
+    bool ok = false;
+    bool foundLocalSizeId = false;
     switch (execution_model) {
       case spv::ExecutionModel::GLCompute:
-        if (!execution_modes ||
-            !execution_modes->count(spv::ExecutionMode::LocalSize)) {
-          bool ok = false;
+        if (_.HasCapability(spv::Capability::TileShadingQCOM)) {
+          ok = (execution_modes && execution_modes->count(spv::ExecutionMode::TileShadingRateQCOM));
+        }
+        if (!ok && (!execution_modes ||
+            !execution_modes->count(spv::ExecutionMode::LocalSize))) {
           for (auto& i : _.ordered_instructions()) {
             if (i.opcode() == spv::Op::OpDecorate) {
               if (i.operands().size() > 2) {
@@ -307,6 +311,7 @@ spv_result_t ValidateEntryPoint(ValidationState_t& _, const Instruction* inst) {
               const auto mode = i.GetOperandAs<spv::ExecutionMode>(1);
               if (mode == spv::ExecutionMode::LocalSizeId) {
                 ok = true;
+                foundLocalSizeId = true;
                 break;
               }
             }
@@ -315,9 +320,21 @@ spv_result_t ValidateEntryPoint(ValidationState_t& _, const Instruction* inst) {
             return _.diag(SPV_ERROR_INVALID_DATA, inst)
                    << _.VkErrorID(10685)
                    << "In the Vulkan environment, GLCompute execution model "
-                      "entry points require either the LocalSize or "
-                      "LocalSizeId execution mode or an object decorated with "
-                      "WorkgroupSize must be specified.";
+                      "entry points require either the "
+                   << (_.HasCapability(spv::Capability::TileShadingQCOM) ? "TileShadingRateQCOM, " : "")
+                   << "LocalSize or LocalSizeId execution mode or an object "
+                      "decorated with WorkgroupSize must be specified.";
+          }
+        }
+
+        if (_.HasCapability(spv::Capability::TileShadingQCOM)) {
+          if (execution_modes) {
+            if (execution_modes->count(spv::ExecutionMode::TileShadingRateQCOM) &&
+                (execution_modes->count(spv::ExecutionMode::LocalSize) || foundLocalSizeId)) {
+              return _.diag(SPV_ERROR_INVALID_DATA, inst)
+                     << "If the TileShadingRateQCOM Execution Mode is used, "
+                     << "LocalSize and LocalSizeId must not be specified.";
+            }
           }
         }
         break;