commit 1bde07c1b470ca86c204947f5ac55b2702be9d32
author dan sinclair <dsinclair@chromium.org> Tue Oct 08 15:53:56 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Oct 08 15:53:56 2024 +0000
tree d85a1293c45ab2af9731b572092ba4723789e7ae
parent 367c032d62299f0653f6f910a48f69e9475c4337

[glsl][ir] Consistently use `idx` for texture arguments.

This CL updates the existing methods to consistently access the texture
call arguments with `idx`.

Bug: 42251044
Change-Id: Id5677e30f6d6cf937e94e73b75f99fdb777c5484
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/209556
Reviewed-by: James Price <jrprice@google.com>
Commit-Queue: dan sinclair <dsinclair@chromium.org>

src/tint/lang/glsl/writer/raise/texture_polyfill.cc

diff --git a/src/tint/lang/glsl/writer/raise/texture_polyfill.cc b/src/tint/lang/glsl/writer/raise/texture_polyfill.cc
index 8f69170..c8cca47 100644
--- a/src/tint/lang/glsl/writer/raise/texture_polyfill.cc
+++ b/src/tint/lang/glsl/writer/raise/texture_polyfill.cc
@@ -462,8 +462,10 @@
         b.InsertBefore(call, [&] {
             auto func = glsl::BuiltinFn::kTextureSize;
 
+            uint32_t idx = 0;
+
             Vector<core::ir::Value*, 2> new_args;
-            auto* tex = GetNewTexture(args[0]);
+            auto* tex = GetNewTexture(args[idx++]);
             auto* tex_ty = tex->Type()->As<core::type::Texture>();
 
             new_args.Push(tex);
@@ -481,7 +483,7 @@
                     new_args.Push(b.Constant(0_i));
                 } else {
                     // Make sure the LOD is a i32
-                    new_args.Push(b.Bitcast(ty.i32(), args[1])->Result(0));
+                    new_args.Push(b.Bitcast(ty.i32(), args[idx++])->Result(0));
                 }
             }
 
@@ -545,8 +547,9 @@
 
     void TextureLoad(core::ir::CoreBuiltinCall* call) {
         b.InsertBefore(call, [&] {
+            uint32_t idx = 0;
             auto args = call->Args();
-            auto* tex = GetNewTexture(args[0]);
+            auto* tex = GetNewTexture(args[idx++]);
 
             // No loading from a depth texture in GLSL, so we should never have gotten here.
             TINT_ASSERT(!tex->Type()->Is<core::type::DepthTexture>());
@@ -566,31 +569,31 @@
             Vector<core::ir::Value*, 3> call_args{tex};
             switch (tex_type->Dim()) {
                 case core::type::TextureDimension::k2d: {
-                    call_args.Push(b.Convert(ty.vec2<i32>(), args[1])->Result(0));
+                    call_args.Push(b.Convert(ty.vec2<i32>(), args[idx++])->Result(0));
                     if (is_ms) {
-                        call_args.Push(b.Convert(ty.i32(), args[2])->Result(0));
+                        call_args.Push(b.Convert(ty.i32(), args[idx++])->Result(0));
                     } else {
                         if (!is_storage) {
-                            call_args.Push(b.Convert(ty.i32(), args[2])->Result(0));
+                            call_args.Push(b.Convert(ty.i32(), args[idx++])->Result(0));
                         }
                     }
                     break;
                 }
                 case core::type::TextureDimension::k2dArray: {
-                    auto* coord = b.Convert(ty.vec2<i32>(), args[1]);
-                    auto* ary_idx = b.Convert(ty.i32(), args[2]);
+                    auto* coord = b.Convert(ty.vec2<i32>(), args[idx++]);
+                    auto* ary_idx = b.Convert(ty.i32(), args[idx++]);
                     call_args.Push(b.Construct(ty.vec3<i32>(), coord, ary_idx)->Result(0));
 
                     if (!is_storage) {
-                        call_args.Push(b.Convert(ty.i32(), args[3])->Result(0));
+                        call_args.Push(b.Convert(ty.i32(), args[idx++])->Result(0));
                     }
                     break;
                 }
                 case core::type::TextureDimension::k3d: {
-                    call_args.Push(b.Convert(ty.vec3<i32>(), args[1])->Result(0));
+                    call_args.Push(b.Convert(ty.vec3<i32>(), args[idx++])->Result(0));
 
                     if (!is_storage) {
-                        call_args.Push(b.Convert(ty.i32(), args[2])->Result(0));
+                        call_args.Push(b.Convert(ty.i32(), args[idx++])->Result(0));
                     }
                     break;
                 }
@@ -606,8 +609,9 @@
 
     void TextureStore(core::ir::BuiltinCall* call) {
         b.InsertBefore(call, [&] {
+            uint32_t idx = 0;
             auto args = call->Args();
-            auto* tex = GetNewTexture(args[0]);
+            auto* tex = GetNewTexture(args[idx++]);
             auto* tex_type = tex->Type()->As<core::type::StorageTexture>();
             TINT_ASSERT(tex_type);
 
@@ -615,8 +619,8 @@
             new_args.Push(tex);
 
             if (tex_type->Dim() == core::type::TextureDimension::k2dArray) {
-                auto* coords = args[1];
-                auto* array_idx = args[2];
+                auto* coords = args[idx++];
+                auto* array_idx = args[idx++];
 
                 auto* coords_ty = coords->Type()->As<core::type::Vector>();
                 TINT_ASSERT(coords_ty);
@@ -625,10 +629,10 @@
                                                b.Convert(coords_ty->Type(), array_idx));
                 new_args.Push(new_coords->Result(0));
 
-                new_args.Push(args[3]);
+                new_args.Push(args[idx++]);
             } else {
-                new_args.Push(args[1]);
-                new_args.Push(args[2]);
+                new_args.Push(args[idx++]);
+                new_args.Push(args[idx++]);
             }
 
             b.CallWithResult<glsl::ir::BuiltinCall>(