diff --git a/engine/src/flutter/ci/licenses_golden/licenses_flutter b/engine/src/flutter/ci/licenses_golden/licenses_flutter index 9a30bdf66f..12128f9ba4 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_flutter +++ b/engine/src/flutter/ci/licenses_golden/licenses_flutter @@ -1285,11 +1285,11 @@ FILE: ../../../flutter/impeller/entity/shaders/morphology_filter.frag FILE: ../../../flutter/impeller/entity/shaders/morphology_filter.vert FILE: ../../../flutter/impeller/entity/shaders/position.vert FILE: ../../../flutter/impeller/entity/shaders/position_color.vert -FILE: ../../../flutter/impeller/entity/shaders/position_no_color.vert FILE: ../../../flutter/impeller/entity/shaders/position_uv.vert FILE: ../../../flutter/impeller/entity/shaders/radial_gradient_fill.frag FILE: ../../../flutter/impeller/entity/shaders/rrect_blur.frag FILE: ../../../flutter/impeller/entity/shaders/rrect_blur.vert +FILE: ../../../flutter/impeller/entity/shaders/runtime_effect.vert FILE: ../../../flutter/impeller/entity/shaders/solid_fill.frag FILE: ../../../flutter/impeller/entity/shaders/solid_fill.vert FILE: ../../../flutter/impeller/entity/shaders/srgb_to_linear_filter.frag diff --git a/engine/src/flutter/impeller/entity/BUILD.gn b/engine/src/flutter/impeller/entity/BUILD.gn index 821d8e12ad..4dce88ea47 100644 --- a/engine/src/flutter/impeller/entity/BUILD.gn +++ b/engine/src/flutter/impeller/entity/BUILD.gn @@ -45,12 +45,12 @@ impeller_shaders("entity_shaders") { "shaders/morphology_filter.frag", "shaders/morphology_filter.vert", "shaders/position_color.vert", - "shaders/position_no_color.vert", "shaders/position_uv.vert", "shaders/position.vert", "shaders/radial_gradient_fill.frag", "shaders/rrect_blur.vert", "shaders/rrect_blur.frag", + "shaders/runtime_effect.vert", "shaders/solid_fill.frag", "shaders/solid_fill.vert", "shaders/srgb_to_linear_filter.frag", diff --git a/engine/src/flutter/impeller/entity/contents/runtime_effect_contents.cc b/engine/src/flutter/impeller/entity/contents/runtime_effect_contents.cc index 0bce852176..116e7d4347 100644 --- a/engine/src/flutter/impeller/entity/contents/runtime_effect_contents.cc +++ b/engine/src/flutter/impeller/entity/contents/runtime_effect_contents.cc @@ -12,7 +12,7 @@ #include "impeller/base/validation.h" #include "impeller/entity/contents/clip_contents.h" #include "impeller/entity/contents/content_context.h" -#include "impeller/entity/position_no_color.vert.h" +#include "impeller/entity/runtime_effect.vert.h" #include "impeller/renderer/formats.h" #include "impeller/renderer/pipeline_library.h" #include "impeller/renderer/render_pass.h" @@ -92,7 +92,7 @@ bool RuntimeEffectContents::Render(const ContentContext& renderer, /// Get or create runtime stage pipeline. /// - using VS = PositionNoColorVertexShader; + using VS = RuntimeEffectVertexShader; PipelineDescriptor desc; desc.SetLabel("Runtime Stage"); desc.AddStageEntrypoint( diff --git a/engine/src/flutter/impeller/entity/shaders/position_no_color.vert b/engine/src/flutter/impeller/entity/shaders/runtime_effect.vert similarity index 76% rename from engine/src/flutter/impeller/entity/shaders/position_no_color.vert rename to engine/src/flutter/impeller/entity/shaders/runtime_effect.vert index 16007d94bb..a29402d71e 100644 --- a/engine/src/flutter/impeller/entity/shaders/position_no_color.vert +++ b/engine/src/flutter/impeller/entity/shaders/runtime_effect.vert @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include - uniform VertInfo { mat4 mvp; } vert_info; @@ -13,5 +11,5 @@ out vec2 v_position; void main() { gl_Position = vert_info.mvp * vec4(position, 0.0, 1.0); - v_position = IPVec2TransformPosition(vert_info.mvp, position); + v_position = position; }