From a0ac6b432cdfd96354f60906df149d39b15a98d9 Mon Sep 17 00:00:00 2001
From: Brandon DeRosier <bdero@google.com>
Date: Tue, 31 Oct 2023 18:42:14 -0700
Subject: [PATCH] [Impeller] Include cstdint everywhere that uint32_t is used.
 (#47533)

Sprinkle cstdint everywhere that it's used. Unblocks the next impeller-cmake bump.

Ran into include issues during the build for the most recent impeller-cmake bump: https://github.com/bdero/impeller-cmake/pull/20

Going to add an optional libcxx STL build to help avoid stuff like this later (in the AAOS action items).
---
 impeller/base/allocation.h                                   | 1 +
 impeller/compiler/compiler.cc                                | 1 +
 impeller/compiler/compiler_backend.h                         | 1 +
 impeller/compiler/reflector.h                                | 1 +
 impeller/compiler/runtime_stage_data.cc                      | 1 +
 impeller/compiler/source_options.h                           | 1 +
 impeller/compiler/spirv_compiler.h                           | 1 +
 impeller/compiler/spirv_sksl.h                               | 1 +
 impeller/compiler/switches.h                                 | 1 +
 impeller/compiler/uniform_sorter.cc                          | 2 ++
 impeller/core/shader_types.h                                 | 1 +
 impeller/entity/entity.h                                     | 5 ++---
 impeller/entity/entity_pass.h                                | 1 +
 impeller/entity/inline_pass_context.h                        | 2 ++
 impeller/geometry/color.h                                    | 1 +
 impeller/geometry/gradient.h                                 | 1 +
 impeller/geometry/point.h                                    | 1 +
 impeller/renderer/backend/gles/device_buffer_gles.h          | 1 +
 impeller/renderer/backend/gles/gpu_tracer_gles.h             | 1 +
 impeller/renderer/backend/gles/render_pass_gles.cc           | 2 ++
 impeller/renderer/backend/vulkan/allocator_vk.h              | 1 +
 .../vulkan/android_hardware_buffer_texture_source_vk.cc      | 3 +++
 impeller/renderer/backend/vulkan/blit_command_vk.cc          | 2 ++
 impeller/renderer/backend/vulkan/capabilities_vk.h           | 1 +
 impeller/renderer/backend/vulkan/command_encoder_vk.h        | 1 +
 impeller/renderer/backend/vulkan/descriptor_pool_vk.h        | 2 ++
 impeller/renderer/backend/vulkan/formats_vk.h                | 2 ++
 impeller/renderer/backend/vulkan/pass_bindings_cache.h       | 1 +
 impeller/renderer/backend/vulkan/pipeline_library_vk.cc      | 1 +
 impeller/renderer/backend/vulkan/shader_library_vk.cc        | 2 ++
 impeller/renderer/backend/vulkan/swapchain_impl_vk.h         | 1 +
 impeller/renderer/backend/vulkan/test/mock_vulkan.cc         | 3 +++
 impeller/renderer/backend/vulkan/vertex_descriptor_vk.cc     | 2 ++
 impeller/renderer/command.h                                  | 1 +
 impeller/renderer/compute_tessellator.cc                     | 2 ++
 impeller/renderer/pool.h                                     | 1 +
 impeller/scene/importer/vertices_builder.cc                  | 1 +
 impeller/tessellator/c/tessellator.h                         | 2 ++
 38 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/impeller/base/allocation.h b/impeller/base/allocation.h
index 94e4e4cfa834a..6df0ca8b0f4e5 100644
--- a/impeller/base/allocation.h
+++ b/impeller/base/allocation.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <limits>
 #include <memory>
 
diff --git a/impeller/compiler/compiler.cc b/impeller/compiler/compiler.cc
index fa8cbc865d658..6fee0cc600de3 100644
--- a/impeller/compiler/compiler.cc
+++ b/impeller/compiler/compiler.cc
@@ -4,6 +4,7 @@
 
 #include "impeller/compiler/compiler.h"
 
+#include <cstdint>
 #include <filesystem>
 #include <memory>
 #include <optional>
diff --git a/impeller/compiler/compiler_backend.h b/impeller/compiler/compiler_backend.h
index deb57e9235107..e06ec4ccfc461 100644
--- a/impeller/compiler/compiler_backend.h
+++ b/impeller/compiler/compiler_backend.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <memory>
 #include <variant>
 
diff --git a/impeller/compiler/reflector.h b/impeller/compiler/reflector.h
index 61ed22f8f96dd..bb1572793f1d4 100644
--- a/impeller/compiler/reflector.h
+++ b/impeller/compiler/reflector.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <memory>
 #include <optional>
 
diff --git a/impeller/compiler/runtime_stage_data.cc b/impeller/compiler/runtime_stage_data.cc
index 0957f0dfcd47b..0a15de1f6f0cb 100644
--- a/impeller/compiler/runtime_stage_data.cc
+++ b/impeller/compiler/runtime_stage_data.cc
@@ -5,6 +5,7 @@
 #include "impeller/compiler/runtime_stage_data.h"
 
 #include <array>
+#include <cstdint>
 #include <optional>
 
 #include "inja/inja.hpp"
diff --git a/impeller/compiler/source_options.h b/impeller/compiler/source_options.h
index 6c30194b58c24..8a740c69a297a 100644
--- a/impeller/compiler/source_options.h
+++ b/impeller/compiler/source_options.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/impeller/compiler/spirv_compiler.h b/impeller/compiler/spirv_compiler.h
index c2fca382da5de..6935f4a0fa43f 100644
--- a/impeller/compiler/spirv_compiler.h
+++ b/impeller/compiler/spirv_compiler.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <vector>
 
 #include "flutter/fml/macros.h"
diff --git a/impeller/compiler/spirv_sksl.h b/impeller/compiler/spirv_sksl.h
index bdcccad1c36cf..7df5a76c84a5c 100644
--- a/impeller/compiler/spirv_sksl.h
+++ b/impeller/compiler/spirv_sksl.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <memory>
 #include <utility>
 #include <variant>
diff --git a/impeller/compiler/switches.h b/impeller/compiler/switches.h
index e82bab6a07dac..c1911359c60da 100644
--- a/impeller/compiler/switches.h
+++ b/impeller/compiler/switches.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <iostream>
 #include <memory>
 
diff --git a/impeller/compiler/uniform_sorter.cc b/impeller/compiler/uniform_sorter.cc
index 21ebdf7d02a8f..02a98d5dd1665 100644
--- a/impeller/compiler/uniform_sorter.cc
+++ b/impeller/compiler/uniform_sorter.cc
@@ -4,6 +4,8 @@
 
 #include "impeller/compiler/uniform_sorter.h"
 
+#include <cstdint>
+
 namespace impeller {
 
 std::vector<spirv_cross::ID> SortUniforms(
diff --git a/impeller/core/shader_types.h b/impeller/core/shader_types.h
index 9ce7954998e0c..9e549a0c2f65b 100644
--- a/impeller/core/shader_types.h
+++ b/impeller/core/shader_types.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <cstddef>
+#include <cstdint>
 #include <optional>
 #include <string_view>
 #include <vector>
diff --git a/impeller/entity/entity.h b/impeller/entity/entity.h
index 26fa0b3974e14..9c1d64747a0ac 100644
--- a/impeller/entity/entity.h
+++ b/impeller/entity/entity.h
@@ -4,14 +4,13 @@
 
 #pragma once
 
-#include <variant>
+#include <cstdint>
+
 #include "impeller/core/capture.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/geometry/color.h"
 #include "impeller/geometry/matrix.h"
-#include "impeller/geometry/path.h"
 #include "impeller/geometry/rect.h"
-#include "impeller/image/decompressed_image.h"
 
 namespace impeller {
 
diff --git a/impeller/entity/entity_pass.h b/impeller/entity/entity_pass.h
index 90d2eb51adece..b44fa0cc57aa9 100644
--- a/impeller/entity/entity_pass.h
+++ b/impeller/entity/entity_pass.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <optional>
diff --git a/impeller/entity/inline_pass_context.h b/impeller/entity/inline_pass_context.h
index 0c89bd5630e75..cd18d4e744dc1 100644
--- a/impeller/entity/inline_pass_context.h
+++ b/impeller/entity/inline_pass_context.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <cstdint>
+
 #include "impeller/entity/entity_pass_target.h"
 #include "impeller/renderer/context.h"
 #include "impeller/renderer/render_pass.h"
diff --git a/impeller/geometry/color.h b/impeller/geometry/color.h
index 14247f1c6e5fd..e16e87c59ea95 100644
--- a/impeller/geometry/color.h
+++ b/impeller/geometry/color.h
@@ -7,6 +7,7 @@
 #include <stdint.h>
 #include <algorithm>
 #include <array>
+#include <cstdint>
 #include <cstdlib>
 #include <ostream>
 #include <type_traits>
diff --git a/impeller/geometry/gradient.h b/impeller/geometry/gradient.h
index b99f63b4a44bf..5aca0be745f41 100644
--- a/impeller/geometry/gradient.h
+++ b/impeller/geometry/gradient.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <memory>
 #include <vector>
 
diff --git a/impeller/geometry/point.h b/impeller/geometry/point.h
index 6434fe5a285a5..ea01002e8a483 100644
--- a/impeller/geometry/point.h
+++ b/impeller/geometry/point.h
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <cstdint>
 #include <ostream>
 #include <string>
 #include <type_traits>
diff --git a/impeller/renderer/backend/gles/device_buffer_gles.h b/impeller/renderer/backend/gles/device_buffer_gles.h
index 894729e8c2fe6..65661059bab96 100644
--- a/impeller/renderer/backend/gles/device_buffer_gles.h
+++ b/impeller/renderer/backend/gles/device_buffer_gles.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <memory>
 
 #include "flutter/fml/macros.h"
diff --git a/impeller/renderer/backend/gles/gpu_tracer_gles.h b/impeller/renderer/backend/gles/gpu_tracer_gles.h
index 8de6963fc6759..f0f4397480267 100644
--- a/impeller/renderer/backend/gles/gpu_tracer_gles.h
+++ b/impeller/renderer/backend/gles/gpu_tracer_gles.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <deque>
 #include <thread>
 
diff --git a/impeller/renderer/backend/gles/render_pass_gles.cc b/impeller/renderer/backend/gles/render_pass_gles.cc
index 2746c012fc6fb..427225eb491df 100644
--- a/impeller/renderer/backend/gles/render_pass_gles.cc
+++ b/impeller/renderer/backend/gles/render_pass_gles.cc
@@ -4,6 +4,8 @@
 
 #include "impeller/renderer/backend/gles/render_pass_gles.h"
 
+#include <cstdint>
+
 #include "GLES3/gl3.h"
 #include "flutter/fml/trace_event.h"
 #include "fml/closure.h"
diff --git a/impeller/renderer/backend/vulkan/allocator_vk.h b/impeller/renderer/backend/vulkan/allocator_vk.h
index 6fe0184b7328e..a22369462d8b7 100644
--- a/impeller/renderer/backend/vulkan/allocator_vk.h
+++ b/impeller/renderer/backend/vulkan/allocator_vk.h
@@ -13,6 +13,7 @@
 #include "impeller/renderer/backend/vulkan/vk.h"
 
 #include <array>
+#include <cstdint>
 #include <memory>
 
 namespace impeller {
diff --git a/impeller/renderer/backend/vulkan/android_hardware_buffer_texture_source_vk.cc b/impeller/renderer/backend/vulkan/android_hardware_buffer_texture_source_vk.cc
index 164d2b5276ac5..40deb31f006a5 100644
--- a/impeller/renderer/backend/vulkan/android_hardware_buffer_texture_source_vk.cc
+++ b/impeller/renderer/backend/vulkan/android_hardware_buffer_texture_source_vk.cc
@@ -3,6 +3,9 @@
 // found in the LICENSE file.
 
 #include "impeller/renderer/backend/vulkan/android_hardware_buffer_texture_source_vk.h"
+
+#include <cstdint>
+
 #include "impeller/renderer/backend/vulkan/texture_source_vk.h"
 
 #ifdef FML_OS_ANDROID
diff --git a/impeller/renderer/backend/vulkan/blit_command_vk.cc b/impeller/renderer/backend/vulkan/blit_command_vk.cc
index 376b3ea65d7e2..e44a07dc43f03 100644
--- a/impeller/renderer/backend/vulkan/blit_command_vk.cc
+++ b/impeller/renderer/backend/vulkan/blit_command_vk.cc
@@ -4,6 +4,8 @@
 
 #include "impeller/renderer/backend/vulkan/blit_command_vk.h"
 
+#include <cstdint>
+
 #include "impeller/renderer/backend/vulkan/command_encoder_vk.h"
 #include "impeller/renderer/backend/vulkan/texture_vk.h"
 
diff --git a/impeller/renderer/backend/vulkan/capabilities_vk.h b/impeller/renderer/backend/vulkan/capabilities_vk.h
index efcb4c1fcb146..a768610d9c4ba 100644
--- a/impeller/renderer/backend/vulkan/capabilities_vk.h
+++ b/impeller/renderer/backend/vulkan/capabilities_vk.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <map>
 #include <set>
 #include <string>
diff --git a/impeller/renderer/backend/vulkan/command_encoder_vk.h b/impeller/renderer/backend/vulkan/command_encoder_vk.h
index a8aa25121267e..ea8eb08328a6a 100644
--- a/impeller/renderer/backend/vulkan/command_encoder_vk.h
+++ b/impeller/renderer/backend/vulkan/command_encoder_vk.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <functional>
 #include <optional>
 
diff --git a/impeller/renderer/backend/vulkan/descriptor_pool_vk.h b/impeller/renderer/backend/vulkan/descriptor_pool_vk.h
index cfd0bd9ae6a1e..d5e71a10969f6 100644
--- a/impeller/renderer/backend/vulkan/descriptor_pool_vk.h
+++ b/impeller/renderer/backend/vulkan/descriptor_pool_vk.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <cstdint>
+
 #include "flutter/fml/macros.h"
 #include "fml/status_or.h"
 #include "impeller/renderer/backend/vulkan/device_holder.h"
diff --git a/impeller/renderer/backend/vulkan/formats_vk.h b/impeller/renderer/backend/vulkan/formats_vk.h
index a865659764655..aa70f228634e3 100644
--- a/impeller/renderer/backend/vulkan/formats_vk.h
+++ b/impeller/renderer/backend/vulkan/formats_vk.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <cstdint>
+
 #include "flutter/fml/macros.h"
 #include "impeller/base/validation.h"
 #include "impeller/core/formats.h"
diff --git a/impeller/renderer/backend/vulkan/pass_bindings_cache.h b/impeller/renderer/backend/vulkan/pass_bindings_cache.h
index 2c7ed85445402..22b3a0e463cf0 100644
--- a/impeller/renderer/backend/vulkan/pass_bindings_cache.h
+++ b/impeller/renderer/backend/vulkan/pass_bindings_cache.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <optional>
 
 #include "flutter/impeller/renderer/backend/vulkan/vk.h"
diff --git a/impeller/renderer/backend/vulkan/pipeline_library_vk.cc b/impeller/renderer/backend/vulkan/pipeline_library_vk.cc
index 830d2d08120e1..8022f7edb4592 100644
--- a/impeller/renderer/backend/vulkan/pipeline_library_vk.cc
+++ b/impeller/renderer/backend/vulkan/pipeline_library_vk.cc
@@ -5,6 +5,7 @@
 #include "impeller/renderer/backend/vulkan/pipeline_library_vk.h"
 
 #include <chrono>
+#include <cstdint>
 #include <optional>
 #include <sstream>
 
diff --git a/impeller/renderer/backend/vulkan/shader_library_vk.cc b/impeller/renderer/backend/vulkan/shader_library_vk.cc
index 8e825beb1fa70..00d23ffa43aee 100644
--- a/impeller/renderer/backend/vulkan/shader_library_vk.cc
+++ b/impeller/renderer/backend/vulkan/shader_library_vk.cc
@@ -4,6 +4,8 @@
 
 #include "impeller/renderer/backend/vulkan/shader_library_vk.h"
 
+#include <cstdint>
+
 #include "flutter/fml/logging.h"
 #include "flutter/fml/trace_event.h"
 #include "impeller/renderer/backend/vulkan/context_vk.h"
diff --git a/impeller/renderer/backend/vulkan/swapchain_impl_vk.h b/impeller/renderer/backend/vulkan/swapchain_impl_vk.h
index b3b80162a2c32..e6e841eb9e86e 100644
--- a/impeller/renderer/backend/vulkan/swapchain_impl_vk.h
+++ b/impeller/renderer/backend/vulkan/swapchain_impl_vk.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <memory>
 #include <variant>
 
diff --git a/impeller/renderer/backend/vulkan/test/mock_vulkan.cc b/impeller/renderer/backend/vulkan/test/mock_vulkan.cc
index 99a79810868d5..6a11682647525 100644
--- a/impeller/renderer/backend/vulkan/test/mock_vulkan.cc
+++ b/impeller/renderer/backend/vulkan/test/mock_vulkan.cc
@@ -3,9 +3,12 @@
 // found in the LICENSE file.
 
 #include "impeller/renderer/backend/vulkan/test/mock_vulkan.h"
+
+#include <cstdint>
 #include <cstring>
 #include <utility>
 #include <vector>
+
 #include "fml/macros.h"
 #include "fml/thread_local.h"
 #include "impeller/base/thread_safety.h"
diff --git a/impeller/renderer/backend/vulkan/vertex_descriptor_vk.cc b/impeller/renderer/backend/vulkan/vertex_descriptor_vk.cc
index 7c18a245a8b85..83c344f555484 100644
--- a/impeller/renderer/backend/vulkan/vertex_descriptor_vk.cc
+++ b/impeller/renderer/backend/vulkan/vertex_descriptor_vk.cc
@@ -4,6 +4,8 @@
 
 #include "impeller/renderer/backend/vulkan/vertex_descriptor_vk.h"
 
+#include <cstdint>
+
 namespace impeller {
 
 vk::Format ToVertexDescriptorFormat(const ShaderStageIOSlot& input) {
diff --git a/impeller/renderer/command.h b/impeller/renderer/command.h
index 22d483d737399..39a79fad25113 100644
--- a/impeller/renderer/command.h
+++ b/impeller/renderer/command.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <optional>
diff --git a/impeller/renderer/compute_tessellator.cc b/impeller/renderer/compute_tessellator.cc
index 16a8d1015c488..87f27fc88f31b 100644
--- a/impeller/renderer/compute_tessellator.cc
+++ b/impeller/renderer/compute_tessellator.cc
@@ -4,6 +4,8 @@
 
 #include "impeller/renderer/compute_tessellator.h"
 
+#include <cstdint>
+
 #include "impeller/renderer/command_buffer.h"
 #include "impeller/renderer/path_polyline.comp.h"
 #include "impeller/renderer/pipeline_library.h"
diff --git a/impeller/renderer/pool.h b/impeller/renderer/pool.h
index a90357594196a..631284ff874e4 100644
--- a/impeller/renderer/pool.h
+++ b/impeller/renderer/pool.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <memory>
 #include <mutex>
 
diff --git a/impeller/scene/importer/vertices_builder.cc b/impeller/scene/importer/vertices_builder.cc
index 78bde249f6b53..589bd0abf6714 100644
--- a/impeller/scene/importer/vertices_builder.cc
+++ b/impeller/scene/importer/vertices_builder.cc
@@ -4,6 +4,7 @@
 
 #include "impeller/scene/importer/vertices_builder.h"
 
+#include <cstdint>
 #include <cstring>
 #include <limits>
 #include <memory>
diff --git a/impeller/tessellator/c/tessellator.h b/impeller/tessellator/c/tessellator.h
index 7a323b5413233..f79872f931619 100644
--- a/impeller/tessellator/c/tessellator.h
+++ b/impeller/tessellator/c/tessellator.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <cstdint>
+
 #include "impeller/geometry/path_builder.h"
 #include "impeller/tessellator/tessellator.h"