From d70cee7fec6c2e8f0be396f0466a6c77cfd70fe8 Mon Sep 17 00:00:00 2001
From: Ben Doherty <bendoherty@google.com>
Date: Tue, 26 Jul 2022 09:51:55 -0700
Subject: [PATCH] Fix config object related build failures (#5814)

---
 filament/backend/src/CommandBufferQueue.cpp       | 4 ++--
 filament/backend/src/metal/MetalDriverFactory.h   | 2 ++
 filament/backend/src/opengl/OpenGLDriverFactory.h | 5 ++++-
 filament/backend/src/vulkan/VulkanDriverFactory.h | 5 ++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/filament/backend/src/CommandBufferQueue.cpp b/filament/backend/src/CommandBufferQueue.cpp
index 8227e2dc10..f9cb536eae 100644
--- a/filament/backend/src/CommandBufferQueue.cpp
+++ b/filament/backend/src/CommandBufferQueue.cpp
@@ -83,9 +83,9 @@ void CommandBufferQueue::flush() noexcept {
     // circular buffer is too small, we corrupted the stream
     ASSERT_POSTCONDITION(used <= mFreeSpace,
             "Backend CommandStream overflow. Commands are corrupted and unrecoverable.\n"
-            "Please increase FILAMENT_MIN_COMMAND_BUFFERS_SIZE_IN_MB (currently %u MiB).\n"
+            "Please increase minCommandBufferSizeMB inside the Config passed to Engine::create.\n"
             "Space used at this time: %u bytes",
-            (unsigned)FILAMENT_MIN_COMMAND_BUFFERS_SIZE_IN_MB, (unsigned)used);
+            (unsigned)used);
 
     // wait until there is enough space in the buffer
     mFreeSpace -= used;
diff --git a/filament/backend/src/metal/MetalDriverFactory.h b/filament/backend/src/metal/MetalDriverFactory.h
index 5da98020a2..bff7439077 100644
--- a/filament/backend/src/metal/MetalDriverFactory.h
+++ b/filament/backend/src/metal/MetalDriverFactory.h
@@ -17,6 +17,8 @@
 #ifndef TNT_FILAMENT_DRIVER_METALDRIVERFACTORY_H
 #define TNT_FILAMENT_DRIVER_METALDRIVERFACTORY_H
 
+#include <backend/Platform.h>
+
 namespace filament {
 namespace backend {
 class MetalPlatform;
diff --git a/filament/backend/src/opengl/OpenGLDriverFactory.h b/filament/backend/src/opengl/OpenGLDriverFactory.h
index 823841bc9c..36130c2391 100644
--- a/filament/backend/src/opengl/OpenGLDriverFactory.h
+++ b/filament/backend/src/opengl/OpenGLDriverFactory.h
@@ -17,6 +17,8 @@
 #ifndef TNT_FILAMENT_BACKEND_OPENGL_OPENGLDRIVERFACTORY_H
 #define TNT_FILAMENT_BACKEND_OPENGL_OPENGLDRIVERFACTORY_H
 
+#include <backend/Platform.h>
+
 namespace filament::backend {
 
 class OpenGLPlatform;
@@ -24,7 +26,8 @@ class Driver;
 
 class OpenGLDriverFactory {
 public:
-    static Driver* create(OpenGLPlatform* platform, void* sharedGLContext, const Platform::DriverConfig& driverConfig) noexcept;
+    static Driver* create(OpenGLPlatform* platform, void* sharedGLContext,
+            const Platform::DriverConfig& driverConfig) noexcept;
 };
 
 } // namespace filament::backend
diff --git a/filament/backend/src/vulkan/VulkanDriverFactory.h b/filament/backend/src/vulkan/VulkanDriverFactory.h
index c7e3209362..4b5d0bc834 100644
--- a/filament/backend/src/vulkan/VulkanDriverFactory.h
+++ b/filament/backend/src/vulkan/VulkanDriverFactory.h
@@ -17,6 +17,8 @@
 #ifndef TNT_FILAMENT_BACKEND_VULKANDRIVERFACTORY_H
 #define TNT_FILAMENT_BACKEND_VULKANDRIVERFACTORY_H
 
+#include <backend/Platform.h>
+
 #include <stdint.h>
 
 namespace filament::backend {
@@ -27,7 +29,8 @@ class Driver;
 class VulkanDriverFactory {
 public:
     static Driver* create(VulkanPlatform* platform,
-            const char* const* ppEnabledExtensions, uint32_t enabledExtensionCount, const Platform::DriverConfig& driverConfig) noexcept;
+            const char* const* ppEnabledExtensions, uint32_t enabledExtensionCount,
+            const Platform::DriverConfig& driverConfig) noexcept;
 };
 
 } // namespace filament::backend