From 1500802d2c6342ba2da52eb58731d4f8ed037a3d Mon Sep 17 00:00:00 2001 From: Brandon DeRosier Date: Wed, 8 Mar 2023 18:05:28 -0800 Subject: [PATCH] [Impeller] Fix scene build --- display_list/display_list_color_source.h | 2 -- display_list/skia/dl_sk_conversions.cc | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/display_list/display_list_color_source.h b/display_list/display_list_color_source.h index 52937226381c7..764623406fc55 100644 --- a/display_list/display_list_color_source.h +++ b/display_list/display_list_color_source.h @@ -702,8 +702,6 @@ class DlSceneColorSource final : public DlColorSource { impeller::Matrix camera_matrix() const { return camera_matrix_; } - sk_sp skia_object() const override { return nullptr; } - protected: bool equals_(DlColorSource const& other) const override { FML_DCHECK(other.type() == DlColorSourceType::kScene); diff --git a/display_list/skia/dl_sk_conversions.cc b/display_list/skia/dl_sk_conversions.cc index 7ec52f9e19f76..e986564c3bf65 100644 --- a/display_list/skia/dl_sk_conversions.cc +++ b/display_list/skia/dl_sk_conversions.cc @@ -106,6 +106,11 @@ sk_sp ToSk(const DlColorSource* source) { return runtime_effect->skia_runtime_effect()->makeShader( sk_uniform_data, sk_samplers.data(), sk_samplers.size()); } +#ifdef IMPELLER_ENABLE_3D + case DlColorSourceType::kScene: + // Impeller Scene is not supported for Skia. + return nullptr; +#endif } }