Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

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

Merged
auto-submit merged 3 commits into from
Mar 12, 2024
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7325563
[Impeller] Fix glyph atlas transform.
bdero Mar 12, 2024
367f891
Apply projective coordinate before overriding the final depth in all …
bdero Mar 12, 2024
54e295d
malioc
bdero Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions impeller/aiks/aiks_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand All @@ -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"));
Expand Down
3 changes: 2 additions & 1 deletion impeller/entity/shaders/glyph_atlas.vert
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 / gl_Position.w;
gl_Position.z = frame_info.depth;
v_uv = uv_origin + unit_position * uv_size;
v_text_color = frame_info.text_color;
Expand Down