[Impeller] combine translate* scale mat mul when computing shader transform.

impeller/entity/entity.cc

@@ -52,8 +52,8 @@ Matrix Entity::GetShaderTransform(const RenderPass& pass) const {
 Matrix Entity::GetShaderTransform(Scalar shader_clip_depth,
                                   const RenderPass& pass,
                                   const Matrix& transform) {
-  return Matrix::MakeTranslation({0, 0, shader_clip_depth}) *
-         Matrix::MakeScale({1, 1, Entity::kDepthEpsilon}) *
+  return Matrix::MakeTranslateScale({1, 1, Entity::kDepthEpsilon},
+                                    {0, 0, shader_clip_depth}) *
          pass.GetOrthographicTransform() * transform;
 }
 

impeller/geometry/matrix.h

@@ -110,6 +110,16 @@ struct Matrix {
     // clang-format on
   }
 
+  static constexpr Matrix MakeTranslateScale(const Vector3& s,
+                                             const Vector3& t) {
+    // clang-format off
+    return Matrix(s.x, 0.0f, 0.0f, 0.0f,
+                  0.0f, s.y, 0.0f, 0.0f,
+                  0.0f, 0.0f, s.z, 0.0f,
+                  t.x , t.y, t.z, 1.0f);
+    // clang-format on
+  }
+
   static constexpr Matrix MakeScale(const Vector2& s) {
     return MakeScale(Vector3(s.x, s.y, 1.0f));
   }

impeller/geometry/matrix_unittests.cc

@@ -211,5 +211,20 @@ TEST(MatrixTest, TranslateWithPerspective) {
                                                  0.0, 2.0, 0.0, 430.0)));
 }
 
+TEST(MatrixTest, MakeScaleTranslate) {
+  EXPECT_TRUE(MatrixNear(
+      Matrix::MakeTranslateScale({1, 1, 1.0 / 1024}, {10, 10, 1.0 / 1024}),
+      Matrix::MakeTranslation({10, 10, 1.0 / 1024}) *
+          Matrix::MakeScale({1, 1, 1.0 / 1024})));
+
+  EXPECT_TRUE(MatrixNear(
+      Matrix::MakeTranslateScale({2, 2, 2}, {10, 10, 0}),
+      Matrix::MakeTranslation({10, 10, 0}) * Matrix::MakeScale({2, 2, 2})));
+
+  EXPECT_TRUE(MatrixNear(
+      Matrix::MakeTranslateScale({0, 0, 0}, {0, 0, 0}),
+      Matrix::MakeTranslation({0, 0, 0}) * Matrix::MakeScale({0, 0, 0})));
+}
+
 }  // namespace testing
 }  // namespace impeller