commit 443c41de337153fa8c2202b9d011a81641205fa6
author Sarah <sarahmashay@google.com> Fri Jun 18 19:58:27 2021 +0000
committer Tint LUCI CQ <tint-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jun 18 19:58:27 2021 +0000
tree a51e3b2493e9dd60aff89290b0ffb28e66ef5d5f
parent 8b2be2d1e2dbfc3c8772a944e7bd23d6c6d9f3e4

validation: store type of sample_index and sample_mask builtins must be 'u32'

Bug: tint:506
Change-Id: I786a74640d9ad9d98a76cdbe4dfcbfffdb0ccf2c
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/55121
Kokoro: Kokoro <noreply+kokoro@google.com>
Auto-Submit: Sarah Mashayekhi <sarahmashay@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>

src/resolver/resolver.cc

diff --git a/src/resolver/resolver.cc b/src/resolver/resolver.cc
index 31e9f5d..a9f0e8d 100644
--- a/src/resolver/resolver.cc
+++ b/src/resolver/resolver.cc
@@ -121,6 +121,16 @@
   return false;
 }
 
+// Helper to stringify a pipeline IO decoration.
+std::string deco_to_str(const ast::Decoration* deco) {
+  std::stringstream str;
+  if (auto* builtin = deco->As<ast::BuiltinDecoration>()) {
+    str << "builtin(" << builtin->value() << ")";
+  } else if (auto* location = deco->As<ast::LocationDecoration>()) {
+    str << "location(" << location->value() << ")";
+  }
+  return str.str();
+}
 }  // namespace
 
 Resolver::Resolver(ProgramBuilder* builder)
@@ -891,22 +901,44 @@
 }
 
 bool Resolver::ValidateParameter(const VariableInfo* info) {
-  auto* var = info->declaration;
-  for (auto* deco : var->decorations()) {
+  if (!ValidateVariable(info)) {
+    return false;
+  }
+  for (auto* deco : info->declaration->decorations()) {
     if (auto* builtin = deco->As<ast::BuiltinDecoration>()) {
-      if (builtin->value() == ast::Builtin::kFrontFacing) {
-        auto* storage_type = info->type->UnwrapRef();
-        if (!(storage_type->Is<sem::Bool>())) {
-          diagnostics_.add_error("v-15001",
-                                 "front_facing builtin must be boolean",
-                                 deco->source());
-          return false;
-        }
+      if (!ValidateBuiltinDecoration(builtin, info->type)) {
+        return false;
       }
     }
   }
+  return true;
+}
 
-  return ValidateVariable(info);
+bool Resolver::ValidateBuiltinDecoration(const ast::BuiltinDecoration* deco,
+                                         const sem::Type* storage_type) {
+  auto* type = storage_type->UnwrapRef();
+  switch (deco->value()) {
+    case ast::Builtin::kFrontFacing:
+      if (!type->Is<sem::Bool>()) {
+        diagnostics_.add_error(
+            "store type of " + deco_to_str(deco) + " must be 'bool'",
+            deco->source());
+        return false;
+      }
+      break;
+    case ast::Builtin::kSampleMask:
+    case ast::Builtin::kSampleIndex:
+      if (!type->Is<sem::U32>()) {
+        diagnostics_.add_error(
+            "store type of " + deco_to_str(deco) + " must be 'u32'",
+            deco->source());
+        return false;
+      }
+      break;
+    default:
+      break;
+  }
+  return true;
 }
 
 bool Resolver::ValidateFunction(const ast::Function* func,
@@ -1014,16 +1046,7 @@
     kParameter,
     kReturnType,
   };
-  // Helper to stringify a pipeline IO decoration.
-  auto deco_to_str = [](const ast::Decoration* deco) {
-    std::stringstream str;
-    if (auto* builtin = deco->As<ast::BuiltinDecoration>()) {
-      str << "builtin(" << builtin->value() << ")";
-    } else if (auto* location = deco->As<ast::LocationDecoration>()) {
-      str << "location(" << location->value() << ")";
-    }
-    return str.str();
-  };
+
   // Inner lambda that is applied to a type and all of its members.
   auto validate_entry_point_decorations_inner =
       [&](const ast::DecorationList& decos, sem::Type* ty, Source source,
@@ -3178,13 +3201,8 @@
         return false;
       }
       if (auto* builtin = deco->As<ast::BuiltinDecoration>()) {
-        if (builtin->value() == ast::Builtin::kFrontFacing) {
-          if (!(member->Type()->Is<sem::Bool>())) {
-            diagnostics_.add_error("v-15001",
-                                   "front_facing builtin must be boolean",
-                                   deco->source());
-            return false;
-          }
+        if (!ValidateBuiltinDecoration(builtin, member->Type())) {
+          return false;
         }
       }
     }