cleanup include guards of our private headers

filament/backend/include/private/backend/AcquiredImage.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_BACKEND_ACQUIRED_IMAGE_H
-#define TNT_FILAMENT_BACKEND_ACQUIRED_IMAGE_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_ACQUIREDIMAGE_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_ACQUIREDIMAGE_H
 
 #include <backend/DriverEnums.h>
 
@@ -35,4 +35,4 @@ struct AcquiredImage {
 } // namespace backend
 } // namespace filament
 
-#endif // TNT_FILAMENT_BACKEND_ACQUIRED_IMAGE_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_ACQUIREDIMAGE_H

filament/backend/include/private/backend/BackendUtils.h

@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_BACKENDUTILS_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_BACKENDUTILS_H
+
 #include <backend/DriverEnums.h>
 
 #include <backend/PixelBufferDescriptor.h>
@@ -68,3 +71,5 @@ bool reshape(const PixelBufferDescriptor& data, PixelBufferDescriptor& reshaped)
 
 } // namespace backend
 } // namespace filament
+
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_BACKENDUTILS_H

filament/backend/include/private/backend/CircularBuffer.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DRIVER_CIRCULARBUFFER_H
-#define TNT_FILAMENT_DRIVER_CIRCULARBUFFER_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_CIRCULARBUFFER_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_CIRCULARBUFFER_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -88,4 +88,4 @@ private:
 } // namespace backend
 } // namespace filament
 
-#endif // TNT_FILAMENT_DRIVER_CIRCULARBUFFER_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_CIRCULARBUFFER_H

filament/backend/include/private/backend/CommandBufferQueue.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DRIVER_COMMANDBUFFERQUEUE_H
-#define TNT_FILAMENT_DRIVER_COMMANDBUFFERQUEUE_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_COMMANDBUFFERQUEUE_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_COMMANDBUFFERQUEUE_H
 
 #include "private/backend/CircularBuffer.h"
 
@@ -82,4 +82,4 @@ public:
 } // namespace backend
 } // namespace filament
 
-#endif // TNT_FILAMENT_DRIVER_COMMANDBUFFERQUEUE_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_COMMANDBUFFERQUEUE_H

filament/backend/include/private/backend/CommandStream.h

@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DRIVER_COMMANDSTREAM_H
-#define TNT_FILAMENT_DRIVER_COMMANDSTREAM_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_COMMANDSTREAM_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_COMMANDSTREAM_H
 
 #include "private/backend/CircularBuffer.h"
 
@@ -343,4 +343,4 @@ PodType* CommandStream::allocatePod(size_t count, size_t alignment) noexcept {
 } // namespace backend
 } // namespace filament
 
-#endif // TNT_FILAMENT_DRIVER_COMMANDSTREAM_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_COMMANDSTREAM_H

filament/backend/include/private/backend/Driver.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DRIVER_DRIVER_H
-#define TNT_FILAMENT_DRIVER_DRIVER_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_DRIVER_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_DRIVER_H
 
 #include <backend/BufferDescriptor.h>
 #include <backend/Handle.h>
@@ -143,4 +143,4 @@ utils::io::ostream& operator<<(utils::io::ostream& out, const filament::backend:
 
 #endif
 
-#endif // TNT_FILAMENT_DRIVER_DRIVER_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_DRIVER_H

filament/backend/include/private/backend/DriverApi.h

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DRIVER_DRIVERAPI_H
-#define TNT_FILAMENT_DRIVER_DRIVERAPI_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_DRIVERAPI_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_DRIVERAPI_H
 
 #include "private/backend/DriverApiForward.h"
 #include "private/backend/CommandStream.h"
 
-#endif // TNT_FILAMENT_DRIVER_DRIVERAPI_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_DRIVERAPI_H

filament/backend/include/private/backend/DriverApiForward.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DRIVER_DRIVERAPIFORWARD_H
-#define TNT_FILAMENT_DRIVER_DRIVERAPIFORWARD_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_DRIVERAPIFORWARD_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_DRIVERAPIFORWARD_H
 
 
 namespace filament {
@@ -28,4 +28,4 @@ using DriverApi = CommandStream;
 } // namespace backend
 } // namespace filament
 
-#endif // TNT_FILAMENT_DRIVER_DRIVERAPIFORWARD_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_DRIVERAPIFORWARD_H

filament/backend/include/private/backend/HandleAllocator.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_BACKEND_HANDLEALLOCATOR_H
-#define TNT_FILAMENT_BACKEND_HANDLEALLOCATOR_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_HANDLEALLOCATOR_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_HANDLEALLOCATOR_H
 
 #include <backend/Handle.h>
 
@@ -314,4 +314,4 @@ private:
 
 } // namespace filament::backend
 
-#endif //TNT_FILAMENT_BACKEND_HANDLEALLOCATOR_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_HANDLEALLOCATOR_H

filament/backend/include/private/backend/MetalPlatform.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DRIVER_PLATFORM_METAL_H
-#define TNT_FILAMENT_DRIVER_PLATFORM_METAL_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_METALPLATFORM_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_METALPLATFORM_H
 
 #include <backend/DriverEnums.h>
 #include <backend/Platform.h>
@@ -63,4 +63,4 @@ private:
 } // namespace backend
 } // namespace filament
 
-#endif // TNT_FILAMENT_DRIVER_PLATFORM_METAL_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_METALPLATFORM_H

filament/backend/include/private/backend/OpenGLPlatform.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DRIVER_OPENGL_PLATFORM_H
-#define TNT_FILAMENT_DRIVER_OPENGL_PLATFORM_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_OPENGLPLATFORM_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_OPENGLPLATFORM_H
 
 #include <backend/Platform.h>
 
@@ -117,4 +117,4 @@ public:
 } // namespace backend
 } // namespace filament
 
-#endif // TNT_FILAMENT_DRIVER_OPENGL_PLATFORM_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_OPENGLPLATFORM_H

filament/backend/include/private/backend/Program.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DRIVER_PROGRAM_H
-#define TNT_FILAMENT_DRIVER_PROGRAM_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_PROGRAM_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_PROGRAM_H
 
 #include <utils/compiler.h>
 #include <utils/FixedCapacityVector.h>
@@ -115,4 +115,4 @@ private:
 } // namespace backend;
 } // namespace filament;
 
-#endif // TNT_FILAMENT_DRIVER_PROGRAM_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_PROGRAM_H

filament/backend/include/private/backend/SamplerGroup.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_SAMPLERGROUP_H
-#define TNT_FILAMENT_SAMPLERGROUP_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_SAMPLERGROUP_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_SAMPLERGROUP_H
 
 #include <array>
 #include <stddef.h>
@@ -154,4 +154,4 @@ private:
 } // namespace backend
 } // namespace filament
 
-#endif // TNT_FILAMENT_SAMPLERGROUP_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_SAMPLERGROUP_H

filament/src/components/CameraManager.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_CAMERAMANAGER_H
-#define TNT_FILAMENT_CAMERAMANAGER_H
+#ifndef TNT_FILAMENT_COMPONENTS_CAMERAMANAGER_H
+#define TNT_FILAMENT_COMPONENTS_CAMERAMANAGER_H
 
 #include "upcast.h"
 
@@ -87,4 +87,4 @@ private:
 
 } // namespace filament
 
-#endif // TNT_FILAMENT_CAMERAMANAGER_H
+#endif // TNT_FILAMENT_COMPONENTS_CAMERAMANAGER_H

filament/src/components/LightManager.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DETAILS_LIGHTMANAGER_H
-#define TNT_FILAMENT_DETAILS_LIGHTMANAGER_H
+#ifndef TNT_FILAMENT_COMPONENTS_LIGHTMANAGER_H
+#define TNT_FILAMENT_COMPONENTS_LIGHTMANAGER_H
 
 #include "upcast.h"
 
@@ -307,4 +307,4 @@ FILAMENT_UPCAST(LightManager)
 
 } // namespace filament
 
-#endif // TNT_FILAMENT_DETAILS_LIGHTMANAGER_H
+#endif // TNT_FILAMENT_COMPONENTS_LIGHTMANAGER_H

filament/src/components/RenderableManager.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DETAILS_RENDERABLECOMPONENTMANAGER_H
-#define TNT_FILAMENT_DETAILS_RENDERABLECOMPONENTMANAGER_H
+#ifndef TNT_FILAMENT_COMPONENTS_RENDERABLEMANAGER_H
+#define TNT_FILAMENT_COMPONENTS_RENDERABLEMANAGER_H
 
 #include "upcast.h"
 
@@ -359,4 +359,4 @@ size_t FRenderableManager::getPrimitiveCount(Instance instance, uint8_t level) c
 
 } // namespace filament
 
-#endif // TNT_FILAMENT_DETAILS_RENDERABLECOMPONENTMANAGER_H
+#endif // TNT_FILAMENT_COMPONENTS_RENDERABLEMANAGER_H

filament/src/components/TransformManager.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DETAILS_TRANSFORMMANAGER_H
-#define TNT_FILAMENT_DETAILS_TRANSFORMMANAGER_H
+#ifndef TNT_FILAMENT_COMPONENTS_TRANSFORMMANAGER_H
+#define TNT_FILAMENT_COMPONENTS_TRANSFORMMANAGER_H
 
 #include "upcast.h"
 
@@ -201,4 +201,4 @@ FILAMENT_UPCAST(TransformManager)
 
 } // namespace filament
 
-#endif // TNT_FILAMENT_DETAILS_TRANSFORMMANAGER_H
+#endif // TNT_FILAMENT_COMPONENTS_TRANSFORMMANAGER_H

filament/src/details/DebugRegistry.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DETAILS_DEBUG_H
-#define TNT_FILAMENT_DETAILS_DEBUG_H
+#ifndef TNT_FILAMENT_DETAILS_DEBUGREGISTRY_H
+#define TNT_FILAMENT_DETAILS_DEBUGREGISTRY_H
 
 #include "upcast.h"
 
@@ -68,4 +68,4 @@ FILAMENT_UPCAST(DebugRegistry)
 
 } // namespace filament
 
-#endif // TNT_FILAMENT_DETAILS_DEBUG_H
+#endif // TNT_FILAMENT_DETAILS_DEBUGREGISTRY_H

filament/src/details/Froxelizer.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DETAILS_FROXEL_H
-#define TNT_FILAMENT_DETAILS_FROXEL_H
+#ifndef TNT_FILAMENT_DETAILS_FROXELIZER_H
+#define TNT_FILAMENT_DETAILS_FROXELIZER_H
 
 #include "details/Allocators.h"
 #include "details/Scene.h"
@@ -261,4 +261,4 @@ private:
 
 } // namespace filament
 
-#endif // TNT_FILAMENT_DETAILS_FROXEL_H
+#endif // TNT_FILAMENT_DETAILS_FROXELIZER_H

filament/src/details/IndirectLight.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DETAILS_INDIRECT_LIGHT_H
-#define TNT_FILAMENT_DETAILS_INDIRECT_LIGHT_H
+#ifndef TNT_FILAMENT_DETAILS_INDIRECTLIGHT_H
+#define TNT_FILAMENT_DETAILS_INDIRECTLIGHT_H
 
 #include "upcast.h"
 
@@ -70,4 +70,4 @@ FILAMENT_UPCAST(IndirectLight)
 
 } // namespace filament
 
-#endif // TNT_FILAMENT_DETAILS_INDIRECT_LIGHT_H
+#endif // TNT_FILAMENT_DETAILS_INDIRECTLIGHT_H

filament/src/details/Skybox.h

@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+#ifndef TNT_FILAMENT_DETAILS_SKYBOX_H
+#define TNT_FILAMENT_DETAILS_SKYBOX_H
+
 #include "upcast.h"
 
 #include <filament/Skybox.h>
@@ -23,9 +26,6 @@
 #include <utils/compiler.h>
 #include <utils/Entity.h>
 
-#ifndef TNT_FILAMENT_DETAILS_SKYBOX_H
-#define TNT_FILAMENT_DETAILS_SKYBOX_H
-
 namespace filament {
 
 class FEngine;

filament/src/fg2/FrameGraphPass.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_FG2_PASS_H
-#define TNT_FILAMENT_FG2_PASS_H
+#ifndef TNT_FILAMENT_FG2_FRAMEGRAPHPASS_H
+#define TNT_FILAMENT_FG2_FRAMEGRAPHPASS_H
 
 #include "private/backend/DriverApiForward.h"
 
@@ -79,4 +79,4 @@ public:
 
 } // namespace filament
 
-#endif //TNT_FILAMENT_FG2_PASS_H
+#endif //TNT_FILAMENT_FG2_FRAMEGRAPHPASS_H

filament/src/fg2/FrameGraphRenderPass.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_FG2_RENDERTARGET_H
-#define TNT_FILAMENT_FG2_RENDERTARGET_H
+#ifndef TNT_FILAMENT_FG2_FRAMEGRAPHRENDERPASS_H
+#define TNT_FILAMENT_FG2_FRAMEGRAPHRENDERPASS_H
 
 #include "fg2/FrameGraphTexture.h"
 
@@ -67,4 +67,4 @@ struct FrameGraphRenderPass {
 
 } // namespace filament
 
-#endif //TNT_FILAMENT_FG2_RENDERTARGET_H
+#endif // TNT_FILAMENT_FG2_FRAMEGRAPHRENDERPASS_H

filament/src/fg2/FrameGraphTexture.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_FG2_TEXTURE_H
-#define TNT_FILAMENT_FG2_TEXTURE_H
+#ifndef TNT_FILAMENT_FG2_FRAMEGRAPHTEXTURE_H
+#define TNT_FILAMENT_FG2_FRAMEGRAPHTEXTURE_H
 
 #include "fg2/FrameGraphId.h"
 
@@ -99,4 +99,4 @@ struct FrameGraphTexture {
 
 } // namespace filament
 
-#endif //TNT_FILAMENT_FG2_TEXTURE_H
+#endif // TNT_FILAMENT_FG2_FRAMEGRAPHTEXTURE_H

filament/src/fg2/details/DependencyGraph.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_FG2_GRAPH_H
-#define TNT_FILAMENT_FG2_GRAPH_H
+#ifndef TNT_FILAMENT_FG2_DETAILS_DEPENDENCYGRAPH_H
+#define TNT_FILAMENT_FG2_DETAILS_DEPENDENCYGRAPH_H
 
 #include <utils/ostream.h>
 #include <utils/CString.h>
@@ -195,4 +195,4 @@ inline DependencyGraph::Edge::Edge(DependencyGraph& graph,
 
 } // namespace filament
 
-#endif //TNT_FILAMENT_FG2_GRAPH_H
+#endif // TNT_FILAMENT_FG2_DETAILS_DEPENDENCYGRAPH_H

filament/src/fg2/details/PassNode.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_FG2_PASSNODE_H
-#define TNT_FILAMENT_FG2_PASSNODE_H
+#ifndef TNT_FILAMENT_FG2_DETAILS_PASSNODE_H
+#define TNT_FILAMENT_FG2_DETAILS_PASSNODE_H
 
 #include "fg2/details/DependencyGraph.h"
 #include "fg2/details/Utilities.h"
@@ -124,4 +124,4 @@ private:
 
 } // namespace filament
 
-#endif //TNT_FILAMENT_FG2_PASSNODE_H
+#endif // TNT_FILAMENT_FG2_DETAILS_PASSNODE_H

filament/src/fg2/details/Resource.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_FG2_RESOURCE_H
-#define TNT_FILAMENT_FG2_RESOURCE_H
+#ifndef TNT_FILAMENT_FG2_DETAILS_RESOURCE_H
+#define TNT_FILAMENT_FG2_DETAILS_RESOURCE_H
 
 #include "fg2/FrameGraphId.h"
 #include "fg2/FrameGraphTexture.h"
@@ -344,4 +344,4 @@ extern template class ImportedResource<FrameGraphTexture>;
 
 } // namespace filament
 
-#endif //TNT_FILAMENT_FG2_RESOURCE_H
+#endif // TNT_FILAMENT_FG2_DETAILS_RESOURCE_H

filament/src/fg2/details/ResourceNode.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_FG2_RESOURCENODE_H
-#define TNT_FILAMENT_FG2_RESOURCENODE_H
+#ifndef TNT_FILAMENT_FG2_DETAILS_RESOURCENODE_H
+#define TNT_FILAMENT_FG2_DETAILS_RESOURCENODE_H
 
 #include "fg2/details/DependencyGraph.h"
 #include "fg2/details/Utilities.h"
@@ -102,4 +102,4 @@ private:
 
 } // namespace filament
 
-#endif //TNT_FILAMENT_FG2_RESOURCENODE_H
+#endif // TNT_FILAMENT_FG2_DETAILS_RESOURCENODE_H

filament/src/fg2/details/Utilities.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_FG2_UTILITIES_H
-#define TNT_FILAMENT_FG2_UTILITIES_H
+#ifndef TNT_FILAMENT_FG2_DETAILS_UTILITIES_H
+#define TNT_FILAMENT_FG2_DETAILS_UTILITIES_H
 
 #include "details/Allocators.h"
 
@@ -39,4 +39,4 @@ template<typename T> using Vector = std::vector<T, Allocator<T>>; // 32 bytes
 
 } // namespace filament
 
-#endif //TNT_FILAMENT_FG2_UTILITIES_H
+#endif // TNT_FILAMENT_FG2_DETAILS_UTILITIES_H