commit d894ca5037e95115a679b73aa24eac29dbb76225
author Jiawei Shao <jiawei.shao@intel.com> Thu Aug 31 01:02:03 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Aug 31 01:02:03 2023 +0000
tree b85940dde5f6981c5f25f6388cf278a256a31f33
parent b4e92bfd888021292c84d3e19ae1049042bc3a45

Use mat2x2f in BindGroupTests

Bug: tint:369
Change-Id: I96c9670ea1bf9cf5cd98160b33b7dd84fabdc82b
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/149104
Reviewed-by: Austin Eng <enga@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>

src/dawn/tests/end2end/BindGroupTests.cpp

diff --git a/src/dawn/tests/end2end/BindGroupTests.cpp b/src/dawn/tests/end2end/BindGroupTests.cpp
index 401154f..b6aa9f0 100644
--- a/src/dawn/tests/end2end/BindGroupTests.cpp
+++ b/src/dawn/tests/end2end/BindGroupTests.cpp
@@ -169,9 +169,8 @@
     utils::BasicRenderPass renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
 
     wgpu::ShaderModule vsModule = utils::CreateShaderModule(device, R"(
-        // TODO(crbug.com/tint/369): Use a mat2x2 when Tint translates it correctly.
         struct VertexUniformBuffer {
-            transform : vec4f
+            transform : mat2x2f
         }
 
         @group(0) @binding(0) var <uniform> vertexUbo : VertexUniformBuffer;
@@ -183,8 +182,7 @@
                 vec2f( 1.0, 1.0),
                 vec2f(-1.0, -1.0));
 
-            var transform = mat2x2<f32>(vertexUbo.transform.xy, vertexUbo.transform.zw);
-            return vec4f(transform * pos[VertexIndex], 0.0, 1.0);
+            return vec4f(vertexUbo.transform * pos[VertexIndex], 0.0, 1.0);
         })");
 
     wgpu::ShaderModule fsModule = utils::CreateShaderModule(device, R"(
@@ -247,11 +245,7 @@
     utils::BasicRenderPass renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
 
     wgpu::ShaderModule vsModule = utils::CreateShaderModule(device, R"(
-        // TODO(crbug.com/tint/369): Use a mat2x2 when Tint translates it correctly.
-        struct VertexUniformBuffer {
-            transform : vec4f
-        }
-        @group(0) @binding(0) var <uniform> vertexUbo : VertexUniformBuffer;
+        @group(0) @binding(0) var <uniform> transform : mat2x2f;
 
         @vertex
         fn main(@builtin(vertex_index) VertexIndex : u32) -> @builtin(position) vec4f {
@@ -260,7 +254,6 @@
                 vec2f( 1.0, 1.0),
                 vec2f(-1.0, -1.0));
 
-            var transform = mat2x2<f32>(vertexUbo.transform.xy, vertexUbo.transform.zw);
             return vec4f(transform * pos[VertexIndex], 0.0, 1.0);
         })");
 
@@ -350,10 +343,9 @@
     utils::BasicRenderPass renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
 
     wgpu::ShaderModule vsModule = utils::CreateShaderModule(device, R"(
-        // TODO(crbug.com/tint/369): Use a mat2x2 when Tint translates it correctly.
-        struct VertexUniformBuffer {
-            transform : vec4f
-        }
+         struct VertexUniformBuffer {
+             transform : mat2x2f
+         }
 
         @group(0) @binding(0) var <uniform> vertexUbo1 : VertexUniformBuffer;
         @group(1) @binding(0) var <uniform> vertexUbo2 : VertexUniformBuffer;
@@ -365,10 +357,8 @@
                 vec2f( 1.0, 1.0),
                 vec2f(-1.0, -1.0));
 
-            return vec4f(mat2x2<f32>(
-                vertexUbo1.transform.xy + vertexUbo2.transform.xy,
-                vertexUbo1.transform.zw + vertexUbo2.transform.zw
-            ) * pos[VertexIndex], 0.0, 1.0);
+            return vec4f(
+                (vertexUbo1.transform + vertexUbo2.transform) * pos[VertexIndex], 0.0, 1.0);
         })");
 
     wgpu::ShaderModule fsModule = utils::CreateShaderModule(device, R"(