commit 0ce9ab042ef5896b57833dd73dfa19fc94973b13
author Ben Clayton <bclayton@google.com> Thu May 05 20:23:40 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu May 05 20:23:40 2022 +0000
tree 0be26ce7b6969f887c975f52b639ff8b331d871d
parent 8b9d1e080077d50d165e9af821c2e2346884c657

tint: Change all ProgramBuilder literals to 'i' or 'u' suffix

Unsuffixed integer literals are currently treated as i32,
but will shortly become AbstractInteger. To keep tests behaving
identically to how they are currently, change all test literals
to using either 'i' or 'u' suffixes.

Bug: tint:1504
Change-Id: Ic373d18ce1c718a16b6905568aec89da3641d36b
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/88845
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
Commit-Queue: Ben Clayton <bclayton@google.com>

src/tint/transform/multiplanar_external_texture.cc

diff --git a/src/tint/transform/multiplanar_external_texture.cc b/src/tint/transform/multiplanar_external_texture.cc
index 671c6c1..47cc9ce 100644
--- a/src/tint/transform/multiplanar_external_texture.cc
+++ b/src/tint/transform/multiplanar_external_texture.cc
@@ -26,6 +26,8 @@
 TINT_INSTANTIATE_TYPEINFO(tint::transform::MultiplanarExternalTexture);
 TINT_INSTANTIATE_TYPEINFO(tint::transform::MultiplanarExternalTexture::NewBindingPoints);
 
+using namespace tint::number_suffixes;  // NOLINT
+
 namespace tint::transform {
 namespace {
 
@@ -261,7 +263,6 @@
     /// Creates the gammaCorrection function if needed and returns a call
     /// expression to it.
     void createGammaCorrectionFn() {
-        using f32 = ProgramBuilder::f32;
         ast::VariableList varList = {b.Param("v", b.ty.vec3<f32>()),
                                      b.Param("params", b.ty.type_name(gamma_transfer_struct_sym))};
 
@@ -298,7 +299,6 @@
     /// @param call_type determines which function body to generate
     /// @returns a statement list that makes of the body of the chosen function
     ast::StatementList createTexFnExtStatementList(sem::BuiltinType call_type) {
-        using f32 = ProgramBuilder::f32;
         const ast::CallExpression* single_plane_call = nullptr;
         const ast::CallExpression* plane_0_call = nullptr;
         const ast::CallExpression* plane_1_call = nullptr;
@@ -311,11 +311,11 @@
             plane_1_call = b.Call("textureSampleLevel", "plane1", "smp", "coord", 0.0f);
         } else if (call_type == sem::BuiltinType::kTextureLoad) {
             // textureLoad(plane0, coords.xy, 0);
-            single_plane_call = b.Call("textureLoad", "plane0", "coord", 0);
+            single_plane_call = b.Call("textureLoad", "plane0", "coord", 0_i);
             // textureLoad(plane0, coords.xy, 0);
-            plane_0_call = b.Call("textureLoad", "plane0", "coord", 0);
+            plane_0_call = b.Call("textureLoad", "plane0", "coord", 0_i);
             // textureLoad(plane1, coords.xy, 0);
-            plane_1_call = b.Call("textureLoad", "plane1", "coord", 0);
+            plane_1_call = b.Call("textureLoad", "plane1", "coord", 0_i);
         } else {
             TINT_ICE(Transform, b.Diagnostics()) << "unhandled builtin: " << call_type;
         }
@@ -325,7 +325,7 @@
             b.Decl(b.Var("color", b.ty.vec3(b.ty.f32()))),
             // if ((params.numPlanes == 1u))
             b.If(b.create<ast::BinaryExpression>(
-                     ast::BinaryOp::kEqual, b.MemberAccessor("params", "numPlanes"), b.Expr(1u)),
+                     ast::BinaryOp::kEqual, b.MemberAccessor("params", "numPlanes"), b.Expr(1_u)),
                  b.Block(
                      // color = textureLoad(plane0, coord, 0).rgb;
                      b.Assign("color", b.MemberAccessor(single_plane_call, "rgb"))),