From d192b8e1d82176573075359673e66ee2a9bda1b1 Mon Sep 17 00:00:00 2001 From: Alexander Biggs Date: Thu, 30 Dec 2021 21:12:27 +0000 Subject: [PATCH] [fuchsia] Remove unused zx/cpp/fidl.h include. This include redefines several symbols that are now coming from the SDK. See this SDK roll failure https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8826397088488060737/+/u/build_fuchsia_debug_x64_flutter_shell_platform_fuchsia:fuchsia_fuchsia_tests/stdout. This include does not appear to be used. --- shell/platform/fuchsia/flutter/software_surface.cc | 1 - shell/platform/fuchsia/flutter/vulkan_surface_producer.cc | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/shell/platform/fuchsia/flutter/software_surface.cc b/shell/platform/fuchsia/flutter/software_surface.cc index 7c38b9502ff4e..f5ef369175074 100644 --- a/shell/platform/fuchsia/flutter/software_surface.cc +++ b/shell/platform/fuchsia/flutter/software_surface.cc @@ -19,7 +19,6 @@ #include "third_party/skia/include/core/SkImageInfo.h" #include "../runtime/dart/utils/inlines.h" -#include "zx/cpp/fidl.h" namespace flutter_runner { diff --git a/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc b/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc index 91225efc21928..f1cd71146f282 100644 --- a/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc +++ b/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc @@ -131,10 +131,12 @@ bool VulkanSurfaceProducer::Initialize(scenic::Session* scenic_session) { const char* device_extensions[] = { VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME, }; + const int device_extensions_count = + sizeof(device_extensions) / sizeof(device_extensions[0]); GrVkExtensions vk_extensions; vk_extensions.init(backend_context.fGetProc, backend_context.fInstance, backend_context.fPhysicalDevice, 0, nullptr, - countof(device_extensions), device_extensions); + device_extensions_count, device_extensions); backend_context.fVkExtensions = &vk_extensions; GrContextOptions options; options.fReduceOpsTaskSplitting = GrContextOptions::Enable::kNo;