From d529a7514ae424b2d981da9d0d2da30a1e71ddd5 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Fri, 19 Aug 2022 21:57:40 -0700 Subject: [PATCH] DriverApiForward.h should a backend public header --- filament/backend/CMakeLists.txt | 2 +- .../backend/include/{private => }/backend/DriverApiForward.h | 0 filament/backend/include/private/backend/Driver.h | 2 +- filament/backend/include/private/backend/DriverApi.h | 2 +- filament/backend/include/private/backend/Program.h | 2 +- filament/backend/include/private/backend/SamplerGroup.h | 2 +- filament/src/PostProcessManager.h | 2 +- filament/src/RenderPass.h | 2 +- filament/src/ResourceAllocator.h | 2 +- filament/src/ShadowMap.h | 2 +- filament/src/ShadowMapManager.h | 2 +- filament/src/components/LightManager.h | 2 +- filament/src/components/RenderableManager.h | 2 +- filament/src/details/MorphTargetBuffer.h | 2 +- filament/src/details/Renderer.h | 2 +- filament/src/fg/FrameGraph.h | 2 +- filament/src/fg/FrameGraphPass.h | 2 +- filament/src/fg/details/PassNode.h | 2 +- 18 files changed, 17 insertions(+), 17 deletions(-) rename filament/backend/include/{private => }/backend/DriverApiForward.h (100%) diff --git a/filament/backend/CMakeLists.txt b/filament/backend/CMakeLists.txt index 85f1e28e60..c68c4f2d63 100644 --- a/filament/backend/CMakeLists.txt +++ b/filament/backend/CMakeLists.txt @@ -11,6 +11,7 @@ set(GENERATION_ROOT ${CMAKE_CURRENT_BINARY_DIR}) set(PUBLIC_HDRS include/backend/BufferDescriptor.h include/backend/CallbackHandler.h + include/backend/DriverApiForward.h include/backend/DriverEnums.h include/backend/Handle.h include/backend/PipelineState.h @@ -47,7 +48,6 @@ set(PRIVATE_HDRS include/private/backend/Driver.h include/private/backend/DriverApi.h include/private/backend/DriverAPI.inc - include/private/backend/DriverApiForward.h include/private/backend/HandleAllocator.h include/private/backend/Program.h include/private/backend/SamplerGroup.h diff --git a/filament/backend/include/private/backend/DriverApiForward.h b/filament/backend/include/backend/DriverApiForward.h similarity index 100% rename from filament/backend/include/private/backend/DriverApiForward.h rename to filament/backend/include/backend/DriverApiForward.h diff --git a/filament/backend/include/private/backend/Driver.h b/filament/backend/include/private/backend/Driver.h index 4b512e09a0..d31ff64e12 100644 --- a/filament/backend/include/private/backend/Driver.h +++ b/filament/backend/include/private/backend/Driver.h @@ -22,7 +22,7 @@ #include #include -#include "private/backend/DriverApiForward.h" +#include "backend/DriverApiForward.h" #include diff --git a/filament/backend/include/private/backend/DriverApi.h b/filament/backend/include/private/backend/DriverApi.h index f27f8361a4..68d997a439 100644 --- a/filament/backend/include/private/backend/DriverApi.h +++ b/filament/backend/include/private/backend/DriverApi.h @@ -17,7 +17,7 @@ #ifndef TNT_FILAMENT_BACKEND_PRIVATE_DRIVERAPI_H #define TNT_FILAMENT_BACKEND_PRIVATE_DRIVERAPI_H -#include "private/backend/DriverApiForward.h" +#include "backend/DriverApiForward.h" #include "private/backend/CommandStream.h" #endif // TNT_FILAMENT_BACKEND_PRIVATE_DRIVERAPI_H diff --git a/filament/backend/include/private/backend/Program.h b/filament/backend/include/private/backend/Program.h index 304d77405f..7fe8d940e8 100644 --- a/filament/backend/include/private/backend/Program.h +++ b/filament/backend/include/private/backend/Program.h @@ -24,7 +24,7 @@ #include #include -#include +#include "backend/DriverApiForward.h" #include diff --git a/filament/backend/include/private/backend/SamplerGroup.h b/filament/backend/include/private/backend/SamplerGroup.h index 6eab3e6964..855dcd119c 100644 --- a/filament/backend/include/private/backend/SamplerGroup.h +++ b/filament/backend/include/private/backend/SamplerGroup.h @@ -17,7 +17,7 @@ #ifndef TNT_FILAMENT_BACKEND_PRIVATE_SAMPLERGROUP_H #define TNT_FILAMENT_BACKEND_PRIVATE_SAMPLERGROUP_H -#include "private/backend/DriverApiForward.h" +#include "backend/DriverApiForward.h" #include #include diff --git a/filament/src/PostProcessManager.h b/filament/src/PostProcessManager.h index 3742951fad..7ac387f5e9 100644 --- a/filament/src/PostProcessManager.h +++ b/filament/src/PostProcessManager.h @@ -17,7 +17,7 @@ #ifndef TNT_FILAMENT_POSTPROCESSMANAGER_H #define TNT_FILAMENT_POSTPROCESSMANAGER_H -#include "private/backend/DriverApiForward.h" +#include "backend/DriverApiForward.h" #include "FrameHistory.h" diff --git a/filament/src/RenderPass.h b/filament/src/RenderPass.h index 193191acf0..790c5acdaf 100644 --- a/filament/src/RenderPass.h +++ b/filament/src/RenderPass.h @@ -22,7 +22,7 @@ #include "details/Camera.h" #include "details/Scene.h" -#include "private/backend/DriverApiForward.h" +#include "backend/DriverApiForward.h" #include diff --git a/filament/src/ResourceAllocator.h b/filament/src/ResourceAllocator.h index 9ad1c89130..d16a046c6c 100644 --- a/filament/src/ResourceAllocator.h +++ b/filament/src/ResourceAllocator.h @@ -21,7 +21,7 @@ #include #include -#include "private/backend/DriverApiForward.h" +#include "backend/DriverApiForward.h" #include diff --git a/filament/src/ShadowMap.h b/filament/src/ShadowMap.h index 5c9932d041..71569e70db 100644 --- a/filament/src/ShadowMap.h +++ b/filament/src/ShadowMap.h @@ -22,7 +22,7 @@ #include "details/Camera.h" #include "details/Scene.h" -#include "private/backend/DriverApiForward.h" +#include "backend/DriverApiForward.h" #include "private/backend/SamplerGroup.h" #include diff --git a/filament/src/ShadowMapManager.h b/filament/src/ShadowMapManager.h index e7c7be8e2d..02c00db6c7 100644 --- a/filament/src/ShadowMapManager.h +++ b/filament/src/ShadowMapManager.h @@ -28,7 +28,7 @@ #include #include -#include +#include "backend/DriverApiForward.h" #include #include diff --git a/filament/src/components/LightManager.h b/filament/src/components/LightManager.h index c503cb1b8f..d2766a857b 100644 --- a/filament/src/components/LightManager.h +++ b/filament/src/components/LightManager.h @@ -19,7 +19,7 @@ #include "upcast.h" -#include "private/backend/DriverApiForward.h" +#include "backend/DriverApiForward.h" #include diff --git a/filament/src/components/RenderableManager.h b/filament/src/components/RenderableManager.h index 070fca25e0..d121f27f7d 100644 --- a/filament/src/components/RenderableManager.h +++ b/filament/src/components/RenderableManager.h @@ -22,7 +22,7 @@ #include "HwRenderPrimitiveFactory.h" #include "UniformBuffer.h" -#include "private/backend/DriverApiForward.h" +#include "backend/DriverApiForward.h" #include diff --git a/filament/src/details/MorphTargetBuffer.h b/filament/src/details/MorphTargetBuffer.h index e7063ac6e2..80b32cc539 100644 --- a/filament/src/details/MorphTargetBuffer.h +++ b/filament/src/details/MorphTargetBuffer.h @@ -21,7 +21,7 @@ #include -#include "private/backend/DriverApiForward.h" +#include "backend/DriverApiForward.h" #include "private/backend/SamplerGroup.h" diff --git a/filament/src/details/Renderer.h b/filament/src/details/Renderer.h index abf75c9a86..eb57de3219 100644 --- a/filament/src/details/Renderer.h +++ b/filament/src/details/Renderer.h @@ -27,7 +27,7 @@ #include "details/SwapChain.h" -#include "private/backend/DriverApiForward.h" +#include "backend/DriverApiForward.h" #include #include diff --git a/filament/src/fg/FrameGraph.h b/filament/src/fg/FrameGraph.h index fef18846d1..4538801bed 100644 --- a/filament/src/fg/FrameGraph.h +++ b/filament/src/fg/FrameGraph.h @@ -29,7 +29,7 @@ #include "fg/details/Resource.h" #include "fg/details/Utilities.h" -#include "private/backend/DriverApiForward.h" +#include "backend/DriverApiForward.h" #include #include diff --git a/filament/src/fg/FrameGraphPass.h b/filament/src/fg/FrameGraphPass.h index 89f72560bd..329ca37c32 100644 --- a/filament/src/fg/FrameGraphPass.h +++ b/filament/src/fg/FrameGraphPass.h @@ -17,7 +17,7 @@ #ifndef TNT_FILAMENT_FG_FRAMEGRAPHPASS_H #define TNT_FILAMENT_FG_FRAMEGRAPHPASS_H -#include "private/backend/DriverApiForward.h" +#include "backend/DriverApiForward.h" #include "fg/FrameGraphResources.h" diff --git a/filament/src/fg/details/PassNode.h b/filament/src/fg/details/PassNode.h index a82b7c18c4..f8fb4e6474 100644 --- a/filament/src/fg/details/PassNode.h +++ b/filament/src/fg/details/PassNode.h @@ -22,7 +22,7 @@ #include "fg/FrameGraph.h" #include "fg/FrameGraphRenderPass.h" -#include "private/backend/DriverApiForward.h" +#include "backend/DriverApiForward.h" #include