From 053326a93f93734389939c90fe5d51391186743f Mon Sep 17 00:00:00 2001 From: Brandon DeRosier Date: Thu, 14 Dec 2023 14:27:12 -0800 Subject: [PATCH 1/2] Fix gn check typo --- shell/platform/android/android_context_gl_impeller.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/android/android_context_gl_impeller.cc b/shell/platform/android/android_context_gl_impeller.cc index 8c9b80645d7ab..eb6ad21d69614 100644 --- a/shell/platform/android/android_context_gl_impeller.cc +++ b/shell/platform/android/android_context_gl_impeller.cc @@ -13,7 +13,7 @@ #include "impeller/entity/gles/framebuffer_blend_shaders_gles.h" #if IMPELLER_ENABLE_3D -#include "impeller/scene/shaders/gles/scene_shaders_gles.h" // nogcncheck +#include "impeller/scene/shaders/gles/scene_shaders_gles.h" // nogncheck #endif // IMPELLER_ENABLE_3D namespace flutter { From 5fac0f63d4bca5fd6d548dffa92faf2255cfbda1 Mon Sep 17 00:00:00 2001 From: Brandon DeRosier Date: Thu, 14 Dec 2023 14:30:56 -0800 Subject: [PATCH 2/2] Add missing guard --- impeller/playground/backend/gles/playground_impl_gles.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/impeller/playground/backend/gles/playground_impl_gles.cc b/impeller/playground/backend/gles/playground_impl_gles.cc index 84fc103c7ffbc..8b6d321d4beed 100644 --- a/impeller/playground/backend/gles/playground_impl_gles.cc +++ b/impeller/playground/backend/gles/playground_impl_gles.cc @@ -13,7 +13,10 @@ #include "impeller/playground/imgui/gles/imgui_shaders_gles.h" #include "impeller/renderer/backend/gles/context_gles.h" #include "impeller/renderer/backend/gles/surface_gles.h" -#include "impeller/scene/shaders/gles/scene_shaders_gles.h" + +#if IMPELLER_ENABLE_3D +#include "impeller/scene/shaders/gles/scene_shaders_gles.h" // nogncheck +#endif // IMPELLER_ENABLE_3D namespace impeller { @@ -98,8 +101,10 @@ ShaderLibraryMappingsForPlayground() { impeller_fixtures_shaders_gles_length), std::make_shared( impeller_imgui_shaders_gles_data, impeller_imgui_shaders_gles_length), +#if IMPELLER_ENABLE_3D std::make_shared( impeller_scene_shaders_gles_data, impeller_scene_shaders_gles_length), +#endif }; }