Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move some private headers out of src/details

Browse Source 
src/details now only has the private headers of public types/classes.
Private/implementation classes have their header next to them under src.

This makes things more consistant.
This commit is contained in:
Mathias Agopian
2021-08-16 16:50:35 -07:00
committed by Mathias Agopian
parent dd914066f3
commit cd903b412f
33 changed files with 106 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
filament/CMakeLists.txt
+14 -14
View File
@@ -95,54 +95,54 @@ set(SRCS
src/fg2/Blackboard.cpp
src/fg2/DependencyGraph.cpp
src/fg2/FrameGraph.cpp
src/fg2/FrameGraphResources.cpp
src/fg2/FrameGraphPass.cpp
src/fg2/FrameGraphResources.cpp
src/fg2/FrameGraphTexture.cpp
src/fg2/PassNode.cpp
src/fg2/ResourceNode.cpp
src/fg2/FrameGraphTexture.cpp
)
set(PRIVATE_HDRS
src/Allocators.h
src/ColorSpace.h
src/Culler.h
src/DFG.h
src/FilamentAPI-impl.h
src/FrameHistory.h
src/FrameInfo.h
src/FrameSkipper.h
src/Froxelizer.h
src/Intersections.h
src/MaterialParser.h
src/PerViewUniforms.h
src/PostProcessManager.h
src/RenderPass.h
src/RenderPrimitive.h
src/ResourceAllocator.h
src/ResourceList.h
src/ShadowMap.h
src/ShadowMapManager.h
src/TypedUniformBuffer.h
src/UniformBuffer.h
src/components/CameraManager.h
src/components/LightManager.h
src/components/RenderableManager.h
src/components/TransformManager.h
src/details/Allocators.h
src/details/BufferObject.h
src/details/Camera.h
src/details/ColorGrading.h
src/details/Culler.h
src/details/DFG.h
src/details/DebugRegistry.h
src/details/Engine.h
src/details/Fence.h
src/details/FrameSkipper.h
src/details/Froxelizer.h
src/details/IndexBuffer.h
src/details/IndirectLight.h
src/details/Material.h
src/details/MaterialInstance.h
src/details/RenderPrimitive.h
src/details/RenderTarget.h
src/details/Renderer.h
src/details/ResourceList.h
src/details/Scene.h
src/details/ShadowMap.h
src/details/ShadowMapManager.h
src/details/Skybox.h
src/details/SkinningBuffer.h
src/details/Skybox.h
src/details/Stream.h
src/details/SwapChain.h
src/details/Texture.h
@@ -151,11 +151,11 @@ set(PRIVATE_HDRS
src/fg2/Blackboard.h
src/fg2/FrameGraph.h
src/fg2/FrameGraphId.h
src/fg2/FrameGraphResources.h
src/fg2/FrameGraphPass.h
src/fg2/FrameGraphRenderPass.h
src/fg2/Resource.cpp
src/fg2/FrameGraphResources.h
src/fg2/FrameGraphTexture.h
src/fg2/Resource.cpp
src/fg2/details/DependencyGraph.h
src/fg2/details/PassNode.h
src/fg2/details/Resource.h
filament/benchmark/benchmark_filament.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
#include <filament/Box.h>
#include <filament/Frustum.h>
#include "details/Culler.h"
#include "Culler.h"
#include <utils/Allocator.h>
filament/src/details/Allocators.h → filament/src/Allocators.h
View File
filament/src/Culler.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "details/Culler.h"
#include "Culler.h"
#include <filament/Box.h>
filament/src/details/Culler.h → filament/src/Culler.h
View File
filament/src/DFG.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "details/DFG.h"
#include "DFG.h"
#include "details/Engine.h"
#include "details/Texture.h"
filament/src/details/DFG.h → filament/src/DFG.h
+2 -3
View File
@@ -17,16 +17,15 @@
#ifndef TNT_FILAMENT_DETAILS_DFG_H
#define TNT_FILAMENT_DETAILS_DFG_H
#include "details/Texture.h"
#include <backend/Handle.h>
#include "details/Texture.h"
#include <utils/compiler.h>
namespace filament {
class FEngine;
class FTexture;
#if !defined(FILAMENT_DFG_LUT_SIZE)
#define FILAMENT_DFG_LUT_SIZE 128
filament/src/Engine.cpp
+8 -6
View File
@@ -19,29 +19,31 @@
#include "MaterialParser.h"
#include "ResourceAllocator.h"
#include "backend/DriverEnums.h"
#include "DFG.h"
#include "RenderPrimitive.h"
#include "details/BufferObject.h"
#include "details/DFG.h"
#include "details/VertexBuffer.h"
#include "details/Fence.h"
#include "details/Camera.h"
#include "details/Fence.h"
#include "details/IndexBuffer.h"
#include "details/IndirectLight.h"
#include "details/Material.h"
#include "details/Renderer.h"
#include "details/RenderPrimitive.h"
#include "details/Scene.h"
#include "details/Skybox.h"
#include "details/SkinningBuffer.h"
#include "details/Skybox.h"
#include "details/Stream.h"
#include "details/SwapChain.h"
#include "details/Texture.h"
#include "details/VertexBuffer.h"
#include "details/View.h"
#include <private/filament/SibGenerator.h>
#include <filament/MaterialEnums.h>
#include <backend/DriverEnums.h>
#include <utils/compiler.h>
#include <utils/Log.h>
#include <utils/Panic.h>
filament/src/FrameSkipper.cpp
+4 -3
View File
@@ -14,12 +14,13 @@
* limitations under the License.
*/
#include "FrameSkipper.h"
#include "details/Engine.h"
#include <utils/Log.h>
#include <utils/debug.h>
#include "details/FrameSkipper.h"
#include "details/Engine.h"
namespace filament {
using namespace utils;
filament/src/details/FrameSkipper.h → filament/src/FrameSkipper.h
+1 -1
View File
@@ -17,7 +17,7 @@
#ifndef TNT_FILAMENT_DETAILS_FRAMESKIPPER_H
#define TNT_FILAMENT_DETAILS_FRAMESKIPPER_H
#include "backend/Handle.h"
#include <backend/Handle.h>
#include <array>
filament/src/Froxelizer.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "details/Froxelizer.h"
#include "Froxelizer.h"
#include "Intersections.h"
filament/src/details/Froxelizer.h → filament/src/Froxelizer.h
+2 -1
View File
@@ -17,7 +17,8 @@
#ifndef TNT_FILAMENT_DETAILS_FROXELIZER_H
#define TNT_FILAMENT_DETAILS_FROXELIZER_H
#include "details/Allocators.h"
#include "Allocators.h"
#include "details/Scene.h"
#include "details/Engine.h"
filament/src/Frustum.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
#include <filament/Frustum.h>
#include "details/Culler.h"
#include "Culler.h"
#include <utils/compiler.h>
filament/src/Material.cpp
+6 -6
View File
@@ -16,15 +16,13 @@
#include "details/Material.h"
#include "details/Engine.h"
#include "details/DFG.h"
#include "DFG.h"
#include "MaterialParser.h"
#include "private/backend/Program.h"
#include "details/Engine.h"
#include "FilamentAPI-impl.h"
#include <backend/DriverEnums.h>
#include <private/filament/SibGenerator.h>
#include <private/filament/UibStructs.h>
#include <private/filament/Variant.h>
@@ -32,7 +30,9 @@
#include <private/filament/SamplerInterfaceBlock.h>
#include <private/filament/UniformInterfaceBlock.h>
#include <MaterialParser.h>
#include "private/backend/Program.h"
#include <backend/DriverEnums.h>
#include <utils/CString.h>
#include <utils/Panic.h>
filament/src/PerViewUniforms.cpp
+9 -8
View File
@@ -16,20 +16,21 @@
#include "PerViewUniforms.h"
#include "DFG.h"
#include "Froxelizer.h"
#include "ShadowMapManager.h"
#include "details/Camera.h"
#include "details/Engine.h"
#include "details/IndirectLight.h"
#include "details/Texture.h"
#include <filament/Exposure.h>
#include <filament/Options.h>
#include <filament/TextureSampler.h>
#include <private/filament/SibGenerator.h>
#include "details/Camera.h"
#include "details/DFG.h"
#include "details/Engine.h"
#include "details/Froxelizer.h"
#include "details/IndirectLight.h"
#include "details/ShadowMapManager.h"
#include "details/Texture.h"
#include <math/mat4.h>
namespace filament {
filament/src/RenderPass.cpp
+4 -4
View File
@@ -16,14 +16,14 @@
#include "RenderPass.h"
#include "RenderPrimitive.h"
#include "ShadowMap.h"
#include "details/Material.h"
#include "details/MaterialInstance.h"
#include "details/RenderPrimitive.h"
#include "details/ShadowMap.h"
#include "details/View.h"
// NOTE: We only need Renderer.h here because the definition of some FRenderer methods are here
#include "details/Renderer.h"
#include "details/View.h"
#include <private/filament/UibStructs.h>
filament/src/RenderPass.h
+4 -3
View File
@@ -17,7 +17,8 @@
#ifndef TNT_FILAMENT_RENDERPASS_H
#define TNT_FILAMENT_RENDERPASS_H
#include "details/Allocators.h"
#include "Allocators.h"
#include "details/Camera.h"
#include "details/Scene.h"
@@ -28,11 +29,11 @@
#include <backend/DriverEnums.h>
#include <backend/Handle.h>
#include <utils/Allocator.h>
#include <utils/Range.h>
#include <utils/architecture.h>
#include <utils/compiler.h>
#include <utils/debug.h>
#include <utils/Allocator.h>
#include <utils/Range.h>
#include <functional>
#include <limits>
filament/src/RenderPrimitive.cpp
+2 -2
View File
@@ -14,12 +14,12 @@
* limitations under the License.
*/
#include "details/RenderPrimitive.h"
#include "RenderPrimitive.h"
#include "details/Engine.h"
#include "details/VertexBuffer.h"
#include "details/IndexBuffer.h"
#include "details/Material.h"
#include "details/VertexBuffer.h"
#include <utils/debug.h>
filament/src/details/RenderPrimitive.h → filament/src/RenderPrimitive.h
View File
filament/src/details/ResourceList.h → filament/src/ResourceList.h
View File
filament/src/ShadowMap.cpp
+3 -3
View File
@@ -14,7 +14,9 @@
* limitations under the License.
*/
#include "details/ShadowMap.h"
#include "ShadowMap.h"
#include "RenderPass.h"
#include "components/LightManager.h"
@@ -22,8 +24,6 @@
#include "details/Scene.h"
#include "details/View.h"
#include "RenderPass.h"
#include <backend/DriverEnums.h>
#include <utils/debug.h>
filament/src/details/ShadowMap.h → filament/src/ShadowMap.h
View File
filament/src/ShadowMapManager.cpp
+5 -5
View File
@@ -14,15 +14,15 @@
* limitations under the License.
*/
#include "details/ShadowMapManager.h"
#include "ShadowMapManager.h"
#include "RenderPass.h"
#include "ShadowMap.h"
#include "details/ShadowMap.h"
#include "details/Texture.h"
#include "details/View.h"
#include "fg2/FrameGraph.h"
#include "RenderPass.h"
#include <fg2/FrameGraph.h>
#include <private/filament/SibGenerator.h>
filament/src/details/ShadowMapManager.h → filament/src/ShadowMapManager.h
+1 -2
View File
@@ -19,8 +19,8 @@
#include <filament/Viewport.h>
#include "TypedUniformBuffer.h"
#include "ShadowMap.h"
#include "TypedUniformBuffer.h"
#include "details/Engine.h"
#include "details/Scene.h"
@@ -30,7 +30,6 @@
#include <private/backend/DriverApi.h>
#include <private/backend/DriverApiForward.h>
#include <private/backend/SamplerGroup.h>
#include <private/backend/SamplerGroup.h>
#include <backend/DriverEnums.h>
#include <backend/Handle.h>
filament/src/View.cpp
+4 -4
View File
@@ -16,15 +16,15 @@
#include "details/View.h"
#include "Culler.h"
#include "DFG.h"
#include "Froxelizer.h"
#include "ResourceAllocator.h"
#include "details/Engine.h"
#include "details/Culler.h"
#include "details/DFG.h"
#include "details/Froxelizer.h"
#include "details/IndirectLight.h"
#include "details/Renderer.h"
#include "details/RenderTarget.h"
#include "details/Renderer.h"
#include "details/Scene.h"
#include "details/Skybox.h"
filament/src/components/RenderableManager.cpp
+2 -2
View File
@@ -16,20 +16,20 @@
#include "FilamentAPI-impl.h"
#include "RenderPrimitive.h"
#include "components/RenderableManager.h"
#include "details/Engine.h"
#include "details/VertexBuffer.h"
#include "details/IndexBuffer.h"
#include "details/Material.h"
#include "details/RenderPrimitive.h"
#include <backend/DriverEnums.h>
#include <utils/Log.h>
#include <utils/Panic.h>
#include <utils/debug.h>
#include <filament/RenderableManager.h>
using namespace filament::math;
filament/src/details/Engine.h
+9 -9
View File
@@ -18,42 +18,42 @@
#define TNT_FILAMENT_DETAILS_ENGINE_H
#include "upcast.h"
#include "Allocators.h"
#include "PostProcessManager.h"
#include "ResourceList.h"
#include "components/CameraManager.h"
#include "components/LightManager.h"
#include "components/TransformManager.h"
#include "components/RenderableManager.h"
#include "details/Allocators.h"
#include "details/BufferObject.h"
#include "details/Camera.h"
#include "details/ColorGrading.h"
#include "details/DebugRegistry.h"
#include "details/Fence.h"
#include "details/IndexBuffer.h"
#include "details/RenderTarget.h"
#include "details/ResourceList.h"
#include "details/ColorGrading.h"
#include "details/Skybox.h"
#include "details/SkinningBuffer.h"
#include "details/Skybox.h"
#include "private/backend/CommandStream.h"
#include "private/backend/CommandBufferQueue.h"
#include "private/backend/CommandStream.h"
#include "private/backend/DriverApi.h"
#include <private/filament/EngineEnums.h>
#include <private/filament/UniformInterfaceBlock.h>
#include <filament/ColorGrading.h>
#include <filament/Engine.h>
#include <filament/VertexBuffer.h>
#include <filament/IndirectLight.h>
#include <filament/Material.h>
#include <filament/MaterialEnums.h>
#include <filament/Texture.h>
#include <filament/ColorGrading.h>
#include <filament/Skybox.h>
#include <filament/Stream.h>
#include <filament/Texture.h>
#include <filament/VertexBuffer.h>
#if FILAMENT_ENABLE_MATDBG
#include <matdbg/DebugServer.h>
filament/src/details/Renderer.h
+4 -4
View File
@@ -19,20 +19,20 @@
#include "upcast.h"
#include "Allocators.h"
#include "FrameInfo.h"
#include "FrameSkipper.h"
#include "RenderPass.h"
#include "details/Allocators.h"
#include "details/FrameSkipper.h"
#include "details/SwapChain.h"
#include "private/backend/DriverApiForward.h"
#include <fg2/FrameGraphId.h>
#include <filament/Renderer.h>
#include <filament/View.h>
#include <fg2/FrameGraphId.h>
#include <backend/DriverEnums.h>
#include <backend/Handle.h>
#include <backend/PresentCallable.h>
filament/src/details/Scene.h
+6 -5
View File
@@ -18,14 +18,14 @@
#define TNT_FILAMENT_DETAILS_SCENE_H
#include "upcast.h"
#include "Allocators.h"
#include "Culler.h"
#include "components/LightManager.h"
#include "components/RenderableManager.h"
#include "components/TransformManager.h"
#include "details/Culler.h"
#include "Allocators.h"
#include <filament/Box.h>
#include <filament/Scene.h>
@@ -36,7 +36,8 @@
#include <utils/Range.h>
#include <utils/debug.h>
#include <cstddef>
#include <stddef.h>
#include <tsl/robin_set.h>
namespace filament {
filament/src/details/View.h
+6 -6
View File
@@ -21,18 +21,18 @@
#include "upcast.h"
#include "FrameInfo.h"
#include "Allocators.h"
#include "FrameHistory.h"
#include "FrameInfo.h"
#include "Froxelizer.h"
#include "PerViewUniforms.h"
#include "ShadowMap.h"
#include "ShadowMapManager.h"
#include "TypedUniformBuffer.h"
#include "details/Allocators.h"
#include "details/Camera.h"
#include "details/ColorGrading.h"
#include "details/Froxelizer.h"
#include "details/RenderTarget.h"
#include "details/ShadowMap.h"
#include "details/ShadowMapManager.h"
#include "details/Scene.h"
#include <private/filament/EngineEnums.h>
@@ -44,8 +44,8 @@
#include <utils/compiler.h>
#include <utils/Allocator.h>
#include <utils/StructureOfArrays.h>
#include <utils/Slice.h>
#include <utils/Range.h>
#include <utils/Slice.h>
#include <math/scalar.h>
filament/src/fg2/FrameGraph.h
+2 -2
View File
@@ -17,6 +17,8 @@
#ifndef TNT_FILAMENT_FG2_FRAMEGRAPH_H
#define TNT_FILAMENT_FG2_FRAMEGRAPH_H
#include "Allocators.h"
#include "fg2/Blackboard.h"
#include "fg2/FrameGraphId.h"
#include "fg2/FrameGraphPass.h"
@@ -27,8 +29,6 @@
#include "fg2/details/Resource.h"
#include "fg2/details/Utilities.h"
#include "details/Allocators.h"
#include "private/backend/DriverApiForward.h"
#include <backend/DriverEnums.h>
filament/src/fg2/details/Utilities.h
+1 -1
View File
@@ -17,7 +17,7 @@
#ifndef TNT_FILAMENT_FG2_DETAILS_UTILITIES_H
#define TNT_FILAMENT_FG2_DETAILS_UTILITIES_H
#include "details/Allocators.h"
#include "Allocators.h"
#include <vector>
#include <memory>
filament/test/filament_test.cpp
+2 -2
View File
@@ -36,10 +36,10 @@
#include <private/filament/UibStructs.h>
#include <private/backend/BackendUtils.h>
#include "details/Allocators.h"
#include "Allocators.h"
#include "details/Material.h"
#include "details/Camera.h"
#include "details/Froxelizer.h"
#include "Froxelizer.h"
#include "details/Engine.h"
#include "components/RenderableManager.h"
#include "components/TransformManager.h"