From 35a5dc18653595e8ac124d940d9b0ee5845abace Mon Sep 17 00:00:00 2001 From: jonahwilliams Date: Thu, 13 Jul 2023 14:51:30 -0700 Subject: [PATCH 1/2] [Impeller] no-op fragment program on Android until it works. --- impeller/entity/contents/runtime_effect_contents.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/impeller/entity/contents/runtime_effect_contents.cc b/impeller/entity/contents/runtime_effect_contents.cc index c3798abdb0ae8..a6fc87fba320f 100644 --- a/impeller/entity/contents/runtime_effect_contents.cc +++ b/impeller/entity/contents/runtime_effect_contents.cc @@ -47,6 +47,10 @@ bool RuntimeEffectContents::Render(const ContentContext& renderer, auto context = renderer.GetContext(); auto library = context->GetShaderLibrary(); +#ifdef FML_OS_ANDROID + return true; +#endif + //-------------------------------------------------------------------------- /// Get or register shader. /// From 922341851e75046b039e8d772494a33f80fa699e Mon Sep 17 00:00:00 2001 From: jonahwilliams Date: Thu, 13 Jul 2023 14:57:57 -0700 Subject: [PATCH 2/2] ++ --- impeller/entity/contents/runtime_effect_contents.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/impeller/entity/contents/runtime_effect_contents.cc b/impeller/entity/contents/runtime_effect_contents.cc index a6fc87fba320f..ba2dff69c4e43 100644 --- a/impeller/entity/contents/runtime_effect_contents.cc +++ b/impeller/entity/contents/runtime_effect_contents.cc @@ -44,13 +44,16 @@ bool RuntimeEffectContents::CanInheritOpacity(const Entity& entity) const { bool RuntimeEffectContents::Render(const ContentContext& renderer, const Entity& entity, RenderPass& pass) const { - auto context = renderer.GetContext(); - auto library = context->GetShaderLibrary(); - +// TODO(jonahwilliams): FragmentProgram API is not fully wired up on Android. +// Disable until this is complete so that integration tests and benchmarks can +// run m3 applications. #ifdef FML_OS_ANDROID return true; #endif + auto context = renderer.GetContext(); + auto library = context->GetShaderLibrary(); + //-------------------------------------------------------------------------- /// Get or register shader. ///