[Impeller] Fix shader depth assignment & glyph atlas transform.

impeller/aiks/aiks_unittests.cc

@@ -2995,14 +2995,11 @@ TEST_P(AiksTest, SolidColorApplyColorFilter) {
 
 TEST_P(AiksTest, DrawScaledTextWithPerspectiveNoSaveLayer) {
   Canvas canvas;
-  // clang-format off
-  canvas.Transform(Matrix(
-       2.000000,       0.000000,   0.000000,  0.000000,
-       1.445767,       2.637070,  -0.507928,  0.001524,
-      -2.451887,      -0.534662,   0.861399, -0.002584,
-    1063.481934,    1025.951416, -48.300270,  1.144901
-  ));
-  // clang-format on
+  canvas.Transform(Matrix(1.0, 0.0, 0.0, 0.0,    //
+                          0.0, 1.0, 0.0, 0.0,    //
+                          0.0, 0.0, 1.0, 0.01,   //
+                          0.0, 0.0, 0.0, 1.0) *  //
+                   Matrix::MakeRotationY({Degrees{10}}));
 
   ASSERT_TRUE(RenderTextInCanvasSkia(GetContext(), canvas, "Hello world",
                                      "Roboto-Regular.ttf"));
@@ -3014,14 +3011,11 @@ TEST_P(AiksTest, DrawScaledTextWithPerspectiveSaveLayer) {
   Canvas canvas;
   Paint save_paint;
   canvas.SaveLayer(save_paint);
-  // clang-format off
-  canvas.Transform(Matrix(
-       2.000000,       0.000000,   0.000000,  0.000000,
-       1.445767,       2.637070,  -0.507928,  0.001524,
-      -2.451887,      -0.534662,   0.861399, -0.002584,
-    1063.481934,    1025.951416, -48.300270,  1.144901
-  ));
-  // clang-format on
+  canvas.Transform(Matrix(1.0, 0.0, 0.0, 0.0,    //
+                          0.0, 1.0, 0.0, 0.0,    //
+                          0.0, 0.0, 1.0, 0.01,   //
+                          0.0, 0.0, 0.0, 1.0) *  //
+                   Matrix::MakeRotationY({Degrees{10}}));
 
   ASSERT_TRUE(RenderTextInCanvasSkia(GetContext(), canvas, "Hello world",
                                      "Roboto-Regular.ttf"));

impeller/entity/shaders/blending/framebuffer_blend.vert

@@ -22,6 +22,7 @@ out vec2 v_src_texture_coords;
 
 void main() {
   gl_Position = frame_info.mvp * vec4(vertices, 0.0, 1.0);
+  gl_Position /= gl_Position.w;
   gl_Position.z = frame_info.depth;
   v_src_texture_coords =
       IPRemapCoords(src_texture_coords, frame_info.src_y_coord_scale);

impeller/entity/shaders/blending/porter_duff_blend.vert

@@ -21,6 +21,7 @@ out f16vec4 v_color;
 
 void main() {
   gl_Position = frame_info.mvp * vec4(vertices, 0.0, 1.0);
+  gl_Position /= gl_Position.w;
   gl_Position.z = frame_info.depth;
   v_color = f16vec4(color);
   v_texture_coords =

impeller/entity/shaders/border_mask_blur.vert

@@ -19,6 +19,7 @@ out vec2 v_texture_coords;
 
 void main() {
   gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  gl_Position /= gl_Position.w;
   gl_Position.z = frame_info.depth;
   v_texture_coords =
       IPRemapCoords(texture_coords, frame_info.texture_sampler_y_coord_scale);

impeller/entity/shaders/clip.vert

@@ -14,5 +14,6 @@ in vec2 position;
 
 void main() {
   gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  gl_Position /= gl_Position.w;
   gl_Position.z = frame_info.depth;
 }

impeller/entity/shaders/color_matrix_color_filter.vert

@@ -18,6 +18,7 @@ out vec2 v_texture_coords;
 
 void main() {
   gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  gl_Position /= gl_Position.w;
   gl_Position.z = frame_info.depth;
   v_texture_coords =
       IPRemapCoords(position, frame_info.texture_sampler_y_coord_scale);

impeller/entity/shaders/glyph_atlas.vert

@@ -80,7 +80,8 @@ void main() {
                     0.0, 1.0);
   }
 
-  gl_Position = frame_info.mvp * vec4(position.xy, 0.0, 1.0);
+  gl_Position = frame_info.mvp * position;
+  gl_Position /= gl_Position.w;
   gl_Position.z = frame_info.depth;
   v_uv = uv_origin + unit_position * uv_size;
   v_text_color = frame_info.text_color;

impeller/entity/shaders/gradient_fill.vert

@@ -18,6 +18,7 @@ out vec2 v_position;
 
 void main() {
   gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  gl_Position /= gl_Position.w;
   gl_Position.z = frame_info.depth;
   v_position = IPVec2TransformPosition(frame_info.matrix, position);
 }

impeller/entity/shaders/linear_to_srgb_filter.vert

@@ -18,6 +18,7 @@ out vec2 v_texture_coords;
 
 void main() {
   gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  gl_Position /= gl_Position.w;
   gl_Position.z = frame_info.depth;
   v_texture_coords =
       IPRemapCoords(position, frame_info.texture_sampler_y_coord_scale);

impeller/entity/shaders/position_color.vert

@@ -18,6 +18,7 @@ out f16vec4 v_color;
 
 void main() {
   gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  gl_Position /= gl_Position.w;
   gl_Position.z = frame_info.depth;
   v_color = f16vec4(color);
 }

impeller/entity/shaders/rrect_blur.vert

@@ -16,6 +16,7 @@ out vec2 v_position;
 
 void main() {
   gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  gl_Position /= gl_Position.w;
   gl_Position.z = frame_info.depth;
   // The fragment stage uses local coordinates to compute the blur.
   v_position = position;

impeller/entity/shaders/runtime_effect.vert

@@ -18,6 +18,7 @@ out vec2 _fragCoord;
 
 void main() {
   gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  gl_Position /= gl_Position.w;
   gl_Position.z = frame_info.depth;
   _fragCoord = position;
 }

impeller/entity/shaders/solid_fill.vert

@@ -18,5 +18,6 @@ IMPELLER_MAYBE_FLAT out f16vec4 v_color;
 void main() {
   v_color = frame_info.color;
   gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  gl_Position /= gl_Position.w;
   gl_Position.z = frame_info.depth;
 }

impeller/entity/shaders/srgb_to_linear_filter.vert

@@ -18,6 +18,7 @@ out vec2 v_texture_coords;
 
 void main() {
   gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  gl_Position /= gl_Position.w;
   gl_Position.z = frame_info.depth;
   v_texture_coords =
       IPRemapCoords(position, frame_info.texture_sampler_y_coord_scale);

impeller/entity/shaders/texture_fill.vert

@@ -21,6 +21,7 @@ IMPELLER_MAYBE_FLAT out float16_t v_alpha;
 
 void main() {
   gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  gl_Position /= gl_Position.w;
   gl_Position.z = frame_info.depth;
   v_alpha = frame_info.alpha;
   v_texture_coords =

impeller/entity/shaders/yuv_to_rgb_filter.vert

@@ -18,6 +18,7 @@ out vec2 v_texture_coords;
 
 void main() {
   gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  gl_Position /= gl_Position.w;
   gl_Position.z = frame_info.depth;
   v_texture_coords =
       IPRemapCoords(position, frame_info.texture_sampler_y_coord_scale);