[Impeller] Apply Entity depth in filter shaders that may render directly to an EntityPass. (#50742)
diff --git a/impeller/entity/contents/filters/border_mask_blur_filter_contents.cc b/impeller/entity/contents/filters/border_mask_blur_filter_contents.cc
index 842b667..cd52ee2 100644
--- a/impeller/entity/contents/filters/border_mask_blur_filter_contents.cc
+++ b/impeller/entity/contents/filters/border_mask_blur_filter_contents.cc
@@ -105,6 +105,7 @@
options.primitive_type = PrimitiveType::kTriangleStrip;
VS::FrameInfo frame_info;
+ frame_info.depth = entity.GetShaderClipDepth();
frame_info.mvp = pass.GetOrthographicTransform() * entity.GetTransform();
frame_info.texture_sampler_y_coord_scale =
input_snapshot->texture->GetYCoordScale();
diff --git a/impeller/entity/contents/filters/color_matrix_filter_contents.cc b/impeller/entity/contents/filters/color_matrix_filter_contents.cc
index f01dbcb..371a5f9 100644
--- a/impeller/entity/contents/filters/color_matrix_filter_contents.cc
+++ b/impeller/entity/contents/filters/color_matrix_filter_contents.cc
@@ -75,6 +75,7 @@
pass.SetVertexBuffer(vtx_builder.CreateVertexBuffer(host_buffer));
VS::FrameInfo frame_info;
+ frame_info.depth = entity.GetShaderClipDepth();
frame_info.mvp = pass.GetOrthographicTransform() * entity.GetTransform() *
input_snapshot->transform *
Matrix::MakeScale(Vector2(size));
diff --git a/impeller/entity/contents/filters/linear_to_srgb_filter_contents.cc b/impeller/entity/contents/filters/linear_to_srgb_filter_contents.cc
index e34bef9..0f06022 100644
--- a/impeller/entity/contents/filters/linear_to_srgb_filter_contents.cc
+++ b/impeller/entity/contents/filters/linear_to_srgb_filter_contents.cc
@@ -65,6 +65,7 @@
pass.SetVertexBuffer(vtx_builder.CreateVertexBuffer(host_buffer));
VS::FrameInfo frame_info;
+ frame_info.depth = entity.GetShaderClipDepth();
frame_info.mvp = pass.GetOrthographicTransform() * entity.GetTransform() *
input_snapshot->transform *
Matrix::MakeScale(Vector2(size));
diff --git a/impeller/entity/contents/filters/srgb_to_linear_filter_contents.cc b/impeller/entity/contents/filters/srgb_to_linear_filter_contents.cc
index 80cee8a..81fd297 100644
--- a/impeller/entity/contents/filters/srgb_to_linear_filter_contents.cc
+++ b/impeller/entity/contents/filters/srgb_to_linear_filter_contents.cc
@@ -65,6 +65,7 @@
pass.SetVertexBuffer(vtx_builder.CreateVertexBuffer(host_buffer));
VS::FrameInfo frame_info;
+ frame_info.depth = entity.GetShaderClipDepth();
frame_info.mvp = pass.GetOrthographicTransform() * entity.GetTransform() *
input_snapshot->transform *
Matrix::MakeScale(Vector2(size));
diff --git a/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.cc b/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.cc
index ee6b22f..c7e2ee2 100644
--- a/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.cc
+++ b/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.cc
@@ -94,6 +94,7 @@
pass.SetVertexBuffer(vtx_builder.CreateVertexBuffer(host_buffer));
VS::FrameInfo frame_info;
+ frame_info.depth = entity.GetShaderClipDepth();
frame_info.mvp = pass.GetOrthographicTransform() * entity.GetTransform() *
y_input_snapshot->transform *
Matrix::MakeScale(Vector2(size));
diff --git a/impeller/entity/shaders/border_mask_blur.vert b/impeller/entity/shaders/border_mask_blur.vert
index 0dbc6fd..16fc2f8 100644
--- a/impeller/entity/shaders/border_mask_blur.vert
+++ b/impeller/entity/shaders/border_mask_blur.vert
@@ -7,6 +7,7 @@
uniform FrameInfo {
mat4 mvp;
+ float depth;
float texture_sampler_y_coord_scale;
}
frame_info;
@@ -18,6 +19,7 @@
void main() {
gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+ gl_Position.z = frame_info.depth;
v_texture_coords =
IPRemapCoords(texture_coords, frame_info.texture_sampler_y_coord_scale);
}
diff --git a/impeller/entity/shaders/color_matrix_color_filter.vert b/impeller/entity/shaders/color_matrix_color_filter.vert
index 5a631d8..ffe3a9d 100644
--- a/impeller/entity/shaders/color_matrix_color_filter.vert
+++ b/impeller/entity/shaders/color_matrix_color_filter.vert
@@ -7,6 +7,7 @@
uniform FrameInfo {
mat4 mvp;
+ float depth;
float texture_sampler_y_coord_scale;
}
frame_info;
@@ -17,6 +18,7 @@
void main() {
gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+ gl_Position.z = frame_info.depth;
v_texture_coords =
IPRemapCoords(position, frame_info.texture_sampler_y_coord_scale);
}
diff --git a/impeller/entity/shaders/linear_to_srgb_filter.vert b/impeller/entity/shaders/linear_to_srgb_filter.vert
index 5a631d8..ffe3a9d 100644
--- a/impeller/entity/shaders/linear_to_srgb_filter.vert
+++ b/impeller/entity/shaders/linear_to_srgb_filter.vert
@@ -7,6 +7,7 @@
uniform FrameInfo {
mat4 mvp;
+ float depth;
float texture_sampler_y_coord_scale;
}
frame_info;
@@ -17,6 +18,7 @@
void main() {
gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+ gl_Position.z = frame_info.depth;
v_texture_coords =
IPRemapCoords(position, frame_info.texture_sampler_y_coord_scale);
}
diff --git a/impeller/entity/shaders/srgb_to_linear_filter.vert b/impeller/entity/shaders/srgb_to_linear_filter.vert
index 5a631d8..ffe3a9d 100644
--- a/impeller/entity/shaders/srgb_to_linear_filter.vert
+++ b/impeller/entity/shaders/srgb_to_linear_filter.vert
@@ -7,6 +7,7 @@
uniform FrameInfo {
mat4 mvp;
+ float depth;
float texture_sampler_y_coord_scale;
}
frame_info;
@@ -17,6 +18,7 @@
void main() {
gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+ gl_Position.z = frame_info.depth;
v_texture_coords =
IPRemapCoords(position, frame_info.texture_sampler_y_coord_scale);
}
diff --git a/impeller/entity/shaders/yuv_to_rgb_filter.vert b/impeller/entity/shaders/yuv_to_rgb_filter.vert
index 5a631d8..ffe3a9d 100644
--- a/impeller/entity/shaders/yuv_to_rgb_filter.vert
+++ b/impeller/entity/shaders/yuv_to_rgb_filter.vert
@@ -7,6 +7,7 @@
uniform FrameInfo {
mat4 mvp;
+ float depth;
float texture_sampler_y_coord_scale;
}
frame_info;
@@ -17,6 +18,7 @@
void main() {
gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+ gl_Position.z = frame_info.depth;
v_texture_coords =
IPRemapCoords(position, frame_info.texture_sampler_y_coord_scale);
}
diff --git a/impeller/tools/malioc.json b/impeller/tools/malioc.json
index 676ff84..eb4965b 100644
--- a/impeller/tools/malioc.json
+++ b/impeller/tools/malioc.json
@@ -457,9 +457,9 @@
"load_store"
],
"longest_path_cycles": [
- 0.125,
- 0.125,
- 0.0,
+ 0.09375,
+ 0.09375,
+ 0.015625,
0.0,
2.0,
0.0
@@ -476,9 +476,9 @@
"load_store"
],
"shortest_path_cycles": [
- 0.125,
- 0.125,
- 0.0,
+ 0.09375,
+ 0.09375,
+ 0.015625,
0.0,
2.0,
0.0
@@ -487,9 +487,9 @@
"load_store"
],
"total_cycles": [
- 0.125,
- 0.125,
- 0.0,
+ 0.09375,
+ 0.09375,
+ 0.015625,
0.0,
2.0,
0.0
@@ -497,7 +497,7 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
- "uniform_registers_used": 30,
+ "uniform_registers_used": 24,
"work_registers_used": 32
},
"Varying": {
@@ -548,7 +548,7 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
- "uniform_registers_used": 22,
+ "uniform_registers_used": 20,
"work_registers_used": 8
}
}
@@ -913,9 +913,9 @@
"load_store"
],
"longest_path_cycles": [
- 0.125,
- 0.125,
- 0.0,
+ 0.09375,
+ 0.09375,
+ 0.015625,
0.0,
2.0,
0.0
@@ -932,9 +932,9 @@
"load_store"
],
"shortest_path_cycles": [
- 0.125,
- 0.125,
- 0.0,
+ 0.09375,
+ 0.09375,
+ 0.015625,
0.0,
2.0,
0.0
@@ -943,9 +943,9 @@
"load_store"
],
"total_cycles": [
- 0.125,
- 0.125,
- 0.0,
+ 0.09375,
+ 0.09375,
+ 0.015625,
0.0,
2.0,
0.0
@@ -953,7 +953,7 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
- "uniform_registers_used": 30,
+ "uniform_registers_used": 24,
"work_registers_used": 32
},
"Varying": {
@@ -1004,7 +1004,7 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
- "uniform_registers_used": 22,
+ "uniform_registers_used": 20,
"work_registers_used": 8
}
}
@@ -2098,8 +2098,8 @@
"load_store"
],
"longest_path_cycles": [
- 0.140625,
- 0.140625,
+ 0.109375,
+ 0.109375,
0.0,
0.0,
2.0,
@@ -2117,8 +2117,8 @@
"load_store"
],
"shortest_path_cycles": [
- 0.140625,
- 0.140625,
+ 0.109375,
+ 0.109375,
0.0,
0.0,
2.0,
@@ -2128,8 +2128,8 @@
"load_store"
],
"total_cycles": [
- 0.140625,
- 0.140625,
+ 0.109375,
+ 0.109375,
0.0,
0.0,
2.0,
@@ -2138,7 +2138,7 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
- "uniform_registers_used": 22,
+ "uniform_registers_used": 20,
"work_registers_used": 32
},
"Varying": {
@@ -2235,7 +2235,7 @@
},
"thread_occupancy": 100,
"uniform_registers_used": 6,
- "work_registers_used": 2
+ "work_registers_used": 3
}
}
}
@@ -2824,8 +2824,8 @@
"load_store"
],
"longest_path_cycles": [
- 0.140625,
- 0.140625,
+ 0.109375,
+ 0.109375,
0.0,
0.0,
2.0,
@@ -2843,8 +2843,8 @@
"load_store"
],
"shortest_path_cycles": [
- 0.140625,
- 0.140625,
+ 0.109375,
+ 0.109375,
0.0,
0.0,
2.0,
@@ -2854,8 +2854,8 @@
"load_store"
],
"total_cycles": [
- 0.140625,
- 0.140625,
+ 0.109375,
+ 0.109375,
0.0,
0.0,
2.0,
@@ -2864,7 +2864,7 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
- "uniform_registers_used": 22,
+ "uniform_registers_used": 20,
"work_registers_used": 32
},
"Varying": {
@@ -2961,7 +2961,7 @@
},
"thread_occupancy": 100,
"uniform_registers_used": 6,
- "work_registers_used": 2
+ "work_registers_used": 3
}
}
}
@@ -4515,8 +4515,8 @@
"load_store"
],
"longest_path_cycles": [
- 0.140625,
- 0.140625,
+ 0.109375,
+ 0.109375,
0.0,
0.0,
2.0,
@@ -4534,8 +4534,8 @@
"load_store"
],
"shortest_path_cycles": [
- 0.140625,
- 0.140625,
+ 0.109375,
+ 0.109375,
0.0,
0.0,
2.0,
@@ -4545,8 +4545,8 @@
"load_store"
],
"total_cycles": [
- 0.140625,
- 0.140625,
+ 0.109375,
+ 0.109375,
0.0,
0.0,
2.0,
@@ -4555,7 +4555,7 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
- "uniform_registers_used": 22,
+ "uniform_registers_used": 20,
"work_registers_used": 32
},
"Varying": {
@@ -4652,7 +4652,7 @@
},
"thread_occupancy": 100,
"uniform_registers_used": 6,
- "work_registers_used": 2
+ "work_registers_used": 3
}
}
}
@@ -6317,8 +6317,8 @@
"load_store"
],
"longest_path_cycles": [
- 0.140625,
- 0.140625,
+ 0.109375,
+ 0.109375,
0.0,
0.0,
2.0,
@@ -6336,8 +6336,8 @@
"load_store"
],
"shortest_path_cycles": [
- 0.140625,
- 0.140625,
+ 0.109375,
+ 0.109375,
0.0,
0.0,
2.0,
@@ -6347,8 +6347,8 @@
"load_store"
],
"total_cycles": [
- 0.140625,
- 0.140625,
+ 0.109375,
+ 0.109375,
0.0,
0.0,
2.0,
@@ -6357,7 +6357,7 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
- "uniform_registers_used": 22,
+ "uniform_registers_used": 20,
"work_registers_used": 32
},
"Varying": {
@@ -6454,7 +6454,7 @@
},
"thread_occupancy": 100,
"uniform_registers_used": 6,
- "work_registers_used": 2
+ "work_registers_used": 3
}
}
}
@@ -7570,8 +7570,8 @@
"load_store"
],
"longest_path_cycles": [
- 0.140625,
- 0.140625,
+ 0.109375,
+ 0.109375,
0.0,
0.0,
2.0,
@@ -7589,8 +7589,8 @@
"load_store"
],
"shortest_path_cycles": [
- 0.140625,
- 0.140625,
+ 0.109375,
+ 0.109375,
0.0,
0.0,
2.0,
@@ -7600,8 +7600,8 @@
"load_store"
],
"total_cycles": [
- 0.140625,
- 0.140625,
+ 0.109375,
+ 0.109375,
0.0,
0.0,
2.0,
@@ -7610,7 +7610,7 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
- "uniform_registers_used": 22,
+ "uniform_registers_used": 20,
"work_registers_used": 32
},
"Varying": {
@@ -7707,7 +7707,7 @@
},
"thread_occupancy": 100,
"uniform_registers_used": 6,
- "work_registers_used": 2
+ "work_registers_used": 3
}
}
}
@@ -8451,9 +8451,9 @@
"load_store"
],
"longest_path_cycles": [
- 0.125,
- 0.125,
- 0.0,
+ 0.09375,
+ 0.09375,
+ 0.015625,
0.0,
2.0,
0.0
@@ -8470,9 +8470,9 @@
"load_store"
],
"shortest_path_cycles": [
- 0.125,
- 0.125,
- 0.0,
+ 0.09375,
+ 0.09375,
+ 0.015625,
0.0,
2.0,
0.0
@@ -8481,9 +8481,9 @@
"load_store"
],
"total_cycles": [
- 0.125,
- 0.125,
- 0.0,
+ 0.09375,
+ 0.09375,
+ 0.015625,
0.0,
2.0,
0.0
@@ -8491,7 +8491,7 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
- "uniform_registers_used": 30,
+ "uniform_registers_used": 24,
"work_registers_used": 32
},
"Varying": {
@@ -8542,7 +8542,7 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
- "uniform_registers_used": 22,
+ "uniform_registers_used": 20,
"work_registers_used": 8
}
}
@@ -9799,9 +9799,9 @@
"load_store"
],
"longest_path_cycles": [
- 0.125,
- 0.125,
- 0.0,
+ 0.09375,
+ 0.09375,
+ 0.015625,
0.0,
2.0,
0.0
@@ -9818,9 +9818,9 @@
"load_store"
],
"shortest_path_cycles": [
- 0.125,
- 0.125,
- 0.0,
+ 0.09375,
+ 0.09375,
+ 0.015625,
0.0,
2.0,
0.0
@@ -9829,9 +9829,9 @@
"load_store"
],
"total_cycles": [
- 0.125,
- 0.125,
- 0.0,
+ 0.09375,
+ 0.09375,
+ 0.015625,
0.0,
2.0,
0.0
@@ -9839,7 +9839,7 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
- "uniform_registers_used": 30,
+ "uniform_registers_used": 24,
"work_registers_used": 32
},
"Varying": {
@@ -9890,7 +9890,7 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
- "uniform_registers_used": 22,
+ "uniform_registers_used": 20,
"work_registers_used": 8
}
}
@@ -10725,9 +10725,9 @@
"load_store"
],
"longest_path_cycles": [
- 0.125,
- 0.125,
- 0.0,
+ 0.09375,
+ 0.09375,
+ 0.015625,
0.0,
2.0,
0.0
@@ -10744,9 +10744,9 @@
"load_store"
],
"shortest_path_cycles": [
- 0.125,
- 0.125,
- 0.0,
+ 0.09375,
+ 0.09375,
+ 0.015625,
0.0,
2.0,
0.0
@@ -10755,9 +10755,9 @@
"load_store"
],
"total_cycles": [
- 0.125,
- 0.125,
- 0.0,
+ 0.09375,
+ 0.09375,
+ 0.015625,
0.0,
2.0,
0.0
@@ -10765,7 +10765,7 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
- "uniform_registers_used": 30,
+ "uniform_registers_used": 24,
"work_registers_used": 32
},
"Varying": {
@@ -10816,7 +10816,7 @@
},
"stack_spill_bytes": 0,
"thread_occupancy": 100,
- "uniform_registers_used": 22,
+ "uniform_registers_used": 20,
"work_registers_used": 8
}
}
