From 2b5f6cafa6edb50476a81d55a660f0a4d739813a Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Thu, 21 Mar 2019 13:54:11 -0700 Subject: [PATCH] Separate src/driver into its own library In this first step, we just "blindly" move everything under src/driver to a new library libbackend.a. And all headers are moved under private/backend. Note that "driver" is renamed "backend", but namespaces are unchanged for now. Later we'll have to untangle the actual private headers from public ones and ideally not have any private headers. --- android/filament-android/CMakeLists.txt | 5 + .../src/main/cpp/Renderer.cpp | 2 +- .../filament-android/src/main/cpp/Stream.cpp | 2 +- .../filament-android/src/main/cpp/Texture.cpp | 2 +- filament/CMakeLists.txt | 119 +-------- filament/backend/CMakeLists.txt | 252 ++++++++++++++++++ .../include/backend}/BufferDescriptor.h | 0 .../include/backend}/PixelBufferDescriptor.h | 5 +- .../include/backend}/Platform.h | 2 +- .../include/private/backend}/CircularBuffer.h | 0 .../private/backend}/CommandBufferQueue.h | 2 +- .../include/private/backend}/CommandStream.h | 8 +- .../include/private/backend}/Driver.h | 19 +- .../include/private/backend}/DriverAPI.inc | 2 +- .../include/private/backend}/DriverApi.h | 4 +- .../private/backend}/DriverApiForward.h | 0 .../include/private/backend}/DriverBase.h | 6 +- .../include/private/backend}/GPUBuffer.h | 6 +- .../include/private/backend}/Handle.h | 0 .../include/private/backend}/Program.h | 0 .../include/private/backend}/SamplerGroup.h | 4 +- .../driver => backend/src}/CircularBuffer.cpp | 2 +- .../src}/CommandBufferQueue.cpp | 4 +- .../driver => backend/src}/CommandStream.cpp | 4 +- .../src}/CommandStreamDispatcher.h | 8 +- .../driver => backend/src}/DataReshaper.h | 0 .../{src/driver => backend/src}/Driver.cpp | 10 +- .../{src/driver => backend/src}/GPUBuffer.cpp | 8 +- .../{src/driver => backend/src}/Handle.cpp | 2 +- .../{src/driver => backend/src}/Platform.cpp | 30 +-- .../{src/driver => backend/src}/Program.cpp | 2 +- .../driver => backend/src}/SamplerGroup.cpp | 4 +- .../src}/TextureReshaper.cpp | 0 .../driver => backend/src}/TextureReshaper.h | 2 +- .../android/ExternalStreamManagerAndroid.cpp | 0 .../android/ExternalStreamManagerAndroid.h | 4 +- .../android/ExternalTextureManagerAndroid.cpp | 0 .../android/ExternalTextureManagerAndroid.h | 6 +- .../src}/android/VirtualMachineEnv.cpp | 0 .../src}/android/VirtualMachineEnv.h | 0 .../src}/metal/MetalContext.h | 0 .../src}/metal/MetalContext.mm | 0 .../src}/metal/MetalDriver.h | 6 +- .../src}/metal/MetalDriver.mm | 6 +- .../driver => backend/src}/metal/MetalEnums.h | 2 +- .../src}/metal/MetalHandles.h | 4 +- .../src}/metal/MetalHandles.mm | 0 .../driver => backend/src}/metal/MetalState.h | 2 +- .../src}/metal/MetalState.mm | 0 .../src}/metal/PlatformMetal.h | 4 +- .../src}/metal/PlatformMetal.mm | 0 .../src}/noop/NoopDriver.cpp | 4 +- .../driver => backend/src}/noop/NoopDriver.h | 6 +- .../src}/noop/PlatformNoop.cpp | 4 +- .../src}/noop/PlatformNoop.h | 4 +- .../driver => backend/src}/opengl/GLUtils.cpp | 4 +- .../driver => backend/src}/opengl/GLUtils.h | 4 +- .../driver => backend/src}/opengl/NullGLES.h | 0 .../src}/opengl/OpenGLBlitter.cpp | 6 +- .../src}/opengl/OpenGLBlitter.h | 2 +- .../src}/opengl/OpenGLDriver.cpp | 12 +- .../src}/opengl/OpenGLDriver.h | 8 +- .../src}/opengl/OpenGLProgram.cpp | 4 +- .../src}/opengl/OpenGLProgram.h | 10 +- .../src}/opengl/PlatformCocoaGL.h | 4 +- .../src}/opengl/PlatformCocoaGL.mm | 8 +- .../src}/opengl/PlatformCocoaTouchGL.h | 4 +- .../src}/opengl/PlatformCocoaTouchGL.mm | 8 +- .../src}/opengl/PlatformDummyGL.cpp | 4 +- .../src}/opengl/PlatformDummyGL.h | 4 +- .../src}/opengl/PlatformEGL.cpp | 10 +- .../src}/opengl/PlatformEGL.h | 4 +- .../src}/opengl/PlatformGLX.cpp | 4 +- .../src}/opengl/PlatformGLX.h | 4 +- .../src}/opengl/PlatformWGL.cpp | 4 +- .../src}/opengl/PlatformWGL.h | 4 +- .../src}/opengl/PlatformWebGL.cpp | 4 +- .../src}/opengl/PlatformWebGL.h | 4 +- .../src}/opengl/gl_headers.cpp | 0 .../src}/opengl/gl_headers.h | 2 +- .../src}/vulkan/PlatformVkAndroid.cpp | 2 +- .../src}/vulkan/PlatformVkAndroid.h | 4 +- .../src}/vulkan/PlatformVkCocoa.h | 4 +- .../src}/vulkan/PlatformVkCocoa.mm | 2 +- .../src}/vulkan/PlatformVkCocoaTouch.h | 2 +- .../src}/vulkan/PlatformVkCocoaTouch.mm | 2 +- .../src}/vulkan/PlatformVkLinux.cpp | 2 +- .../src}/vulkan/PlatformVkLinux.h | 4 +- .../src}/vulkan/PlatformVkWindows.cpp | 2 +- .../src}/vulkan/PlatformVkWindows.h | 4 +- .../src}/vulkan/VulkanBinder.cpp | 2 +- .../src}/vulkan/VulkanBinder.h | 0 .../src}/vulkan/VulkanBuffer.cpp | 2 +- .../src}/vulkan/VulkanBuffer.h | 0 .../src}/vulkan/VulkanContext.cpp | 0 .../src}/vulkan/VulkanContext.h | 2 +- .../src}/vulkan/VulkanDisposer.cpp | 2 +- .../src}/vulkan/VulkanDisposer.h | 0 .../src}/vulkan/VulkanDriver.cpp | 4 +- .../src}/vulkan/VulkanDriver.h | 6 +- .../src}/vulkan/VulkanFboCache.cpp | 2 +- .../src}/vulkan/VulkanFboCache.h | 0 .../src}/vulkan/VulkanHandles.cpp | 4 +- .../src}/vulkan/VulkanHandles.h | 0 .../src}/vulkan/VulkanSamplerCache.cpp | 2 +- .../src}/vulkan/VulkanSamplerCache.h | 0 .../src}/vulkan/VulkanStagePool.cpp | 2 +- .../src}/vulkan/VulkanStagePool.h | 0 .../src}/vulkan/VulkanUtility.cpp | 0 .../src}/vulkan/VulkanUtility.h | 2 +- filament/include/filament/Engine.h | 2 +- filament/include/filament/Fence.h | 2 +- filament/include/filament/IndexBuffer.h | 5 +- filament/include/filament/Material.h | 2 +- filament/include/filament/Stream.h | 5 +- filament/include/filament/SwapChain.h | 2 +- filament/include/filament/Texture.h | 4 +- filament/include/filament/TextureSampler.h | 2 +- filament/include/filament/VertexBuffer.h | 5 +- filament/include/filament/View.h | 2 +- filament/include/filament/Viewport.h | 2 +- filament/src/Engine.cpp | 4 +- filament/src/Material.cpp | 5 +- filament/src/MaterialParser.h | 2 +- filament/src/PostProcessManager.h | 4 +- filament/src/RenderPass.h | 2 +- filament/src/Renderer.cpp | 2 +- filament/src/ShadowMap.cpp | 2 +- filament/src/Skybox.cpp | 2 +- filament/src/Stream.cpp | 2 +- filament/src/UniformBuffer.h | 4 +- filament/src/components/LightManager.h | 2 +- filament/src/components/RenderableManager.cpp | 2 +- filament/src/components/RenderableManager.h | 4 +- filament/src/details/DFG.h | 2 +- filament/src/details/Engine.h | 6 +- filament/src/details/Fence.h | 2 +- filament/src/details/Froxelizer.h | 4 +- filament/src/details/IndexBuffer.h | 2 +- filament/src/details/IndirectLight.h | 2 +- filament/src/details/MaterialInstance.h | 5 +- filament/src/details/RenderPrimitive.h | 2 +- filament/src/details/Renderer.h | 6 +- filament/src/details/ShadowMap.h | 4 +- filament/src/details/Skybox.h | 4 +- filament/src/details/Stream.h | 2 +- filament/src/details/SwapChain.h | 2 +- filament/src/details/Texture.h | 2 +- filament/src/details/VertexBuffer.h | 4 +- filament/src/details/View.h | 4 +- filament/src/fg/FrameGraph.cpp | 9 +- filament/src/fg/FrameGraph.h | 4 +- filament/src/fg/FrameGraphPass.h | 2 +- filament/src/fg/FrameGraphPassResources.h | 4 +- filament/src/fg/FrameGraphResource.h | 2 +- filament/test/filament_framegraph_test.cpp | 4 +- .../{driver => backend}/DriverEnums.h | 0 .../private/filament/SamplerInterfaceBlock.h | 2 +- .../include/private/filament/SibGenerator.h | 2 +- .../private/filament/UniformInterfaceBlock.h | 2 +- libs/filabridge/src/SibGenerator.cpp | 2 +- libs/filabridge/src/UibGenerator.cpp | 2 +- .../filamat/include/filamat/MaterialBuilder.h | 2 +- .../filamat/PostprocessMaterialBuilder.h | 2 +- libs/filamat/src/GLSLPostProcessor.h | 2 +- libs/filamat/src/shaders/CodeGenerator.h | 2 +- libs/filamat/src/shaders/MaterialInfo.h | 2 +- samples/app/MeshAssimp.cpp | 2 +- samples/frame_generator.cpp | 3 +- tools/matc/src/matc/Config.h | 2 +- tools/matinfo/src/main.cpp | 2 +- 171 files changed, 539 insertions(+), 386 deletions(-) create mode 100644 filament/backend/CMakeLists.txt rename filament/{include/filament/driver => backend/include/backend}/BufferDescriptor.h (100%) rename filament/{include/filament/driver => backend/include/backend}/PixelBufferDescriptor.h (98%) rename filament/{include/filament/driver => backend/include/backend}/Platform.h (99%) rename filament/{src/driver => backend/include/private/backend}/CircularBuffer.h (100%) rename filament/{src/driver => backend/include/private/backend}/CommandBufferQueue.h (98%) rename filament/{src/driver => backend/include/private/backend}/CommandStream.h (98%) rename filament/{src/driver => backend/include/private/backend}/Driver.h (97%) rename filament/{src/driver => backend/include/private/backend}/DriverAPI.inc (99%) rename filament/{src/driver => backend/include/private/backend}/DriverApi.h (89%) rename filament/{src/driver => backend/include/private/backend}/DriverApiForward.h (100%) rename filament/{src/driver => backend/include/private/backend}/DriverBase.h (97%) rename filament/{src/driver => backend/include/private/backend}/GPUBuffer.h (95%) rename filament/{src/driver => backend/include/private/backend}/Handle.h (100%) rename filament/{src/driver => backend/include/private/backend}/Program.h (100%) rename filament/{src/driver => backend/include/private/backend}/SamplerGroup.h (97%) rename filament/{src/driver => backend/src}/CircularBuffer.cpp (99%) rename filament/{src/driver => backend/src}/CommandBufferQueue.cpp (97%) rename filament/{src/driver => backend/src}/CommandStream.cpp (99%) rename filament/{src/driver => backend/src}/CommandStreamDispatcher.h (95%) rename filament/{src/driver => backend/src}/DataReshaper.h (100%) rename filament/{src/driver => backend/src}/Driver.cpp (94%) rename filament/{src/driver => backend/src}/GPUBuffer.cpp (97%) rename filament/{src/driver => backend/src}/Handle.cpp (98%) rename filament/{src/driver => backend/src}/Platform.cpp (83%) rename filament/{src/driver => backend/src}/Program.cpp (98%) rename filament/{src/driver => backend/src}/SamplerGroup.cpp (97%) rename filament/{src/driver => backend/src}/TextureReshaper.cpp (100%) rename filament/{src/driver => backend/src}/TextureReshaper.h (98%) rename filament/{src/driver => backend/src}/android/ExternalStreamManagerAndroid.cpp (100%) rename filament/{src/driver => backend/src}/android/ExternalStreamManagerAndroid.h (96%) rename filament/{src/driver => backend/src}/android/ExternalTextureManagerAndroid.cpp (100%) rename filament/{src/driver => backend/src}/android/ExternalTextureManagerAndroid.h (95%) rename filament/{src/driver => backend/src}/android/VirtualMachineEnv.cpp (100%) rename filament/{src/driver => backend/src}/android/VirtualMachineEnv.h (100%) rename filament/{src/driver => backend/src}/metal/MetalContext.h (100%) rename filament/{src/driver => backend/src}/metal/MetalContext.mm (100%) rename filament/{src/driver => backend/src}/metal/MetalDriver.h (97%) rename filament/{src/driver => backend/src}/metal/MetalDriver.mm (99%) rename filament/{src/driver => backend/src}/metal/MetalEnums.h (99%) rename filament/{src/driver => backend/src}/metal/MetalHandles.h (98%) rename filament/{src/driver => backend/src}/metal/MetalHandles.mm (100%) rename filament/{src/driver => backend/src}/metal/MetalState.h (99%) rename filament/{src/driver => backend/src}/metal/MetalState.mm (100%) rename filament/{src/driver => backend/src}/metal/PlatformMetal.h (92%) rename filament/{src/driver => backend/src}/metal/PlatformMetal.mm (100%) rename filament/{src/driver => backend/src}/noop/NoopDriver.cpp (93%) rename filament/{src/driver => backend/src}/noop/NoopDriver.h (94%) rename filament/{src/driver => backend/src}/noop/PlatformNoop.cpp (92%) rename filament/{src/driver => backend/src}/noop/PlatformNoop.h (93%) rename filament/{src/driver => backend/src}/opengl/GLUtils.cpp (97%) rename filament/{src/driver => backend/src}/opengl/GLUtils.h (99%) rename filament/{src/driver => backend/src}/opengl/NullGLES.h (100%) rename filament/{src/driver => backend/src}/opengl/OpenGLBlitter.cpp (98%) rename filament/{src/driver => backend/src}/opengl/OpenGLBlitter.h (97%) rename filament/{src/driver => backend/src}/opengl/OpenGLDriver.cpp (99%) rename filament/{src/driver => backend/src}/opengl/OpenGLDriver.h (99%) rename filament/{src/driver => backend/src}/opengl/OpenGLProgram.cpp (99%) rename filament/{src/driver => backend/src}/opengl/OpenGLProgram.h (95%) rename filament/{src/driver => backend/src}/opengl/PlatformCocoaGL.h (96%) rename filament/{src/driver => backend/src}/opengl/PlatformCocoaGL.mm (96%) rename filament/{src/driver => backend/src}/opengl/PlatformCocoaTouchGL.h (97%) rename filament/{src/driver => backend/src}/opengl/PlatformCocoaTouchGL.mm (96%) rename filament/{src/driver => backend/src}/opengl/PlatformDummyGL.cpp (91%) rename filament/{src/driver => backend/src}/opengl/PlatformDummyGL.h (96%) rename filament/{src/driver => backend/src}/opengl/PlatformEGL.cpp (98%) rename filament/{src/driver => backend/src}/opengl/PlatformEGL.h (97%) rename filament/{src/driver => backend/src}/opengl/PlatformGLX.cpp (98%) rename filament/{src/driver => backend/src}/opengl/PlatformGLX.h (96%) rename filament/{src/driver => backend/src}/opengl/PlatformWGL.cpp (95%) rename filament/{src/driver => backend/src}/opengl/PlatformWGL.h (94%) rename filament/{src/driver => backend/src}/opengl/PlatformWebGL.cpp (95%) rename filament/{src/driver => backend/src}/opengl/PlatformWebGL.h (96%) rename filament/{src/driver => backend/src}/opengl/gl_headers.cpp (100%) rename filament/{src/driver => backend/src}/opengl/gl_headers.h (98%) rename filament/{src/driver => backend/src}/vulkan/PlatformVkAndroid.cpp (97%) rename filament/{src/driver => backend/src}/vulkan/PlatformVkAndroid.h (93%) rename filament/{src/driver => backend/src}/vulkan/PlatformVkCocoa.h (93%) rename filament/{src/driver => backend/src}/vulkan/PlatformVkCocoa.mm (98%) rename filament/{src/driver => backend/src}/vulkan/PlatformVkCocoaTouch.h (97%) rename filament/{src/driver => backend/src}/vulkan/PlatformVkCocoaTouch.mm (98%) rename filament/{src/driver => backend/src}/vulkan/PlatformVkLinux.cpp (98%) rename filament/{src/driver => backend/src}/vulkan/PlatformVkLinux.h (94%) rename filament/{src/driver => backend/src}/vulkan/PlatformVkWindows.cpp (97%) rename filament/{src/driver => backend/src}/vulkan/PlatformVkWindows.h (93%) rename filament/{src/driver => backend/src}/vulkan/VulkanBinder.cpp (99%) rename filament/{src/driver => backend/src}/vulkan/VulkanBinder.h (100%) rename filament/{src/driver => backend/src}/vulkan/VulkanBuffer.cpp (98%) rename filament/{src/driver => backend/src}/vulkan/VulkanBuffer.h (100%) rename filament/{src/driver => backend/src}/vulkan/VulkanContext.cpp (100%) rename filament/{src/driver => backend/src}/vulkan/VulkanContext.h (99%) rename filament/{src/driver => backend/src}/vulkan/VulkanDisposer.cpp (97%) rename filament/{src/driver => backend/src}/vulkan/VulkanDisposer.h (100%) rename filament/{src/driver => backend/src}/vulkan/VulkanDriver.cpp (99%) rename filament/{src/driver => backend/src}/vulkan/VulkanDriver.h (97%) rename filament/{src/driver => backend/src}/vulkan/VulkanFboCache.cpp (99%) rename filament/{src/driver => backend/src}/vulkan/VulkanFboCache.h (100%) rename filament/{src/driver => backend/src}/vulkan/VulkanHandles.cpp (99%) rename filament/{src/driver => backend/src}/vulkan/VulkanHandles.h (100%) rename filament/{src/driver => backend/src}/vulkan/VulkanSamplerCache.cpp (99%) rename filament/{src/driver => backend/src}/vulkan/VulkanSamplerCache.h (100%) rename filament/{src/driver => backend/src}/vulkan/VulkanStagePool.cpp (98%) rename filament/{src/driver => backend/src}/vulkan/VulkanStagePool.h (100%) rename filament/{src/driver => backend/src}/vulkan/VulkanUtility.cpp (100%) rename filament/{src/driver => backend/src}/vulkan/VulkanUtility.h (96%) rename libs/filabridge/include/filament/{driver => backend}/DriverEnums.h (100%) diff --git a/android/filament-android/CMakeLists.txt b/android/filament-android/CMakeLists.txt index e923aac8bf..fafef186b6 100644 --- a/android/filament-android/CMakeLists.txt +++ b/android/filament-android/CMakeLists.txt @@ -6,6 +6,10 @@ add_library(filament STATIC IMPORTED) set_target_properties(filament PROPERTIES IMPORTED_LOCATION ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libfilament.a) +add_library(backend STATIC IMPORTED) +set_target_properties(backend PROPERTIES IMPORTED_LOCATION + ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libbackend.a) + add_library(utils STATIC IMPORTED) set_target_properties(utils PROPERTIES IMPORTED_LOCATION ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libutils.a) @@ -76,6 +80,7 @@ add_library(filament-jni SHARED target_link_libraries(filament-jni filament + backend filaflat filabridge geometry diff --git a/android/filament-android/src/main/cpp/Renderer.cpp b/android/filament-android/src/main/cpp/Renderer.cpp index 1b0646a2cb..43498e3078 100644 --- a/android/filament-android/src/main/cpp/Renderer.cpp +++ b/android/filament-android/src/main/cpp/Renderer.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "CallbackUtils.h" #include "NioUtils.h" diff --git a/android/filament-android/src/main/cpp/Stream.cpp b/android/filament-android/src/main/cpp/Stream.cpp index 3a8796042d..143cffd8e5 100644 --- a/android/filament-android/src/main/cpp/Stream.cpp +++ b/android/filament-android/src/main/cpp/Stream.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include "NioUtils.h" #include "CallbackUtils.h" diff --git a/android/filament-android/src/main/cpp/Texture.cpp b/android/filament-android/src/main/cpp/Texture.cpp index 65c8d4b7e5..c22ce2feeb 100644 --- a/android/filament-android/src/main/cpp/Texture.cpp +++ b/android/filament-android/src/main/cpp/Texture.cpp @@ -23,7 +23,7 @@ #include #endif -#include +#include #include #include #include diff --git a/filament/CMakeLists.txt b/filament/CMakeLists.txt index da2ca99aba..a02d0075e1 100644 --- a/filament/CMakeLists.txt +++ b/filament/CMakeLists.txt @@ -11,9 +11,6 @@ set(MATERIAL_DIR "${GENERATION_ROOT}/generated/material") # Sources and headers # ================================================================================================== set(PUBLIC_HDRS - include/filament/driver/BufferDescriptor.h - include/filament/driver/Platform.h - include/filament/driver/PixelBufferDescriptor.h include/filament/Box.h include/filament/Camera.h include/filament/Color.h @@ -47,24 +44,6 @@ set(SRCS src/components/RenderableManager.cpp src/components/TransformManager.cpp src/fg/FrameGraph.cpp - src/driver/noop/NoopDriver.cpp - src/driver/noop/PlatformNoop.cpp - src/driver/opengl/gl_headers.cpp - src/driver/opengl/OpenGLBlitter.cpp - src/driver/opengl/GLUtils.cpp - src/driver/opengl/OpenGLDriver.cpp - src/driver/opengl/OpenGLProgram.cpp - src/driver/CommandStream.cpp - src/driver/CommandBufferQueue.cpp - src/driver/CircularBuffer.cpp - src/driver/Driver.cpp - src/driver/DriverAPI.inc - src/driver/Platform.cpp - src/driver/GPUBuffer.cpp - src/driver/Handle.cpp - src/driver/Program.cpp - src/driver/SamplerGroup.cpp - src/driver/TextureReshaper.cpp src/Box.cpp src/Camera.cpp src/Color.cpp @@ -132,21 +111,6 @@ set(PRIVATE_HDRS src/details/Texture.h src/details/VertexBuffer.h src/details/View.h - src/driver/CircularBuffer.h - src/driver/CommandBufferQueue.h - src/driver/CommandStream.h - src/driver/CommandStreamDispatcher.h - src/driver/DataReshaper.h - src/driver/TextureReshaper.h - src/driver/Driver.h - src/driver/DriverAPI.inc - src/driver/DriverApi.h - src/driver/DriverApiForward.h - src/driver/DriverBase.h - src/driver/GPUBuffer.h - src/driver/Handle.h - src/driver/Program.h - src/driver/SamplerGroup.h src/FilamentAPI-impl.h src/FrameInfo.h src/Intersections.h @@ -167,93 +131,12 @@ get_resgen_vars(${RESOURCE_DIR} materials) list(APPEND PRIVATE_HDRS ${RESGEN_HEADER}) list(APPEND SRCS ${RESGEN_SOURCE}) -# ================================================================================================== -# OS specific -# ================================================================================================== - -# Here set the architecture specific sources -if (USE_EXTERNAL_GLES3) - # Experimental feature; clients provide their own Context Manager. -elseif (ANDROID) - list(APPEND SRCS src/driver/android/ExternalStreamManagerAndroid.cpp) - list(APPEND SRCS src/driver/android/ExternalTextureManagerAndroid.cpp) - list(APPEND SRCS src/driver/android/VirtualMachineEnv.cpp) - list(APPEND SRCS src/driver/opengl/PlatformEGL.cpp) -elseif (IOS) - list(APPEND SRCS src/driver/opengl/PlatformCocoaTouchGL.mm) -elseif (APPLE) - list(APPEND SRCS src/driver/opengl/PlatformCocoaGL.mm) -elseif (WEBGL) - list(APPEND SRCS src/driver/opengl/PlatformWebGL.cpp) -elseif (LINUX) - list(APPEND SRCS src/driver/opengl/PlatformGLX.cpp) -elseif (WIN32) - list(APPEND SRCS src/driver/opengl/PlatformWGL.cpp) -else() - list(APPEND SRCS src/driver/opengl/PlatformDummyGL.cpp) -endif() - # ================================================================================================== # Definitions # ================================================================================================== # "2" corresponds to SYSTRACE_TAG_FILEMENT (See: utils/Systrace.h) add_definitions(-DSYSTRACE_TAG=2 ) -# ================================================================================================== -# Metal Sources -# ================================================================================================== - -if (FILAMENT_SUPPORTS_METAL) - list(APPEND SRCS - src/driver/metal/MetalContext.mm - src/driver/metal/MetalDriver.mm - src/driver/metal/MetalHandles.mm - src/driver/metal/MetalState.mm - src/driver/metal/PlatformMetal.mm - ) -endif() - -# ================================================================================================== -# Vulkan Sources -# ================================================================================================== - -# See root CMakeLists.txt for platforms that support Vulkan -if (FILAMENT_SUPPORTS_VULKAN) - list(APPEND SRCS - src/driver/vulkan/VulkanBinder.cpp - src/driver/vulkan/VulkanBinder.h - src/driver/vulkan/VulkanBuffer.cpp - src/driver/vulkan/VulkanBuffer.h - src/driver/vulkan/VulkanContext.cpp - src/driver/vulkan/VulkanContext.h - src/driver/vulkan/VulkanDisposer.cpp - src/driver/vulkan/VulkanDisposer.h - src/driver/vulkan/VulkanDriver.cpp - src/driver/vulkan/VulkanDriver.h - src/driver/vulkan/VulkanFboCache.cpp - src/driver/vulkan/VulkanFboCache.h - src/driver/vulkan/VulkanHandles.cpp - src/driver/vulkan/VulkanHandles.h - src/driver/vulkan/VulkanSamplerCache.cpp - src/driver/vulkan/VulkanSamplerCache.h - src/driver/vulkan/VulkanStagePool.cpp - src/driver/vulkan/VulkanStagePool.h - src/driver/vulkan/VulkanUtility.cpp - src/driver/vulkan/VulkanUtility.h - ) - if (LINUX) - list(APPEND SRCS src/driver/vulkan/PlatformVkLinux.cpp) - elseif (APPLE AND NOT IOS) - list(APPEND SRCS src/driver/vulkan/PlatformVkCocoa.mm) - elseif (IOS) - list(APPEND SRCS src/driver/vulkan/PlatformVkCocoaTouch.mm) - elseif (ANDROID) - list(APPEND SRCS src/driver/vulkan/PlatformVkAndroid.cpp) - elseif (WIN32) - list(APPEND SRCS src/driver/vulkan/PlatformVkWindows.cpp) - endif() -endif() - # ================================================================================================== # Generate all .filamat: default material, skyboxes, and post-process # ================================================================================================== @@ -358,6 +241,7 @@ if (APPLE AND NOT IOS) target_link_libraries(${TARGET} PRIVATE "-framework Cocoa") endif() +target_link_libraries(${TARGET} PUBLIC backend) target_link_libraries(${TARGET} PUBLIC math) target_link_libraries(${TARGET} PUBLIC utils) target_link_libraries(${TARGET} PUBLIC geometry) # TODO: remove this dependency after deprecating VertexBuffer::populateTangentQuaternions @@ -450,5 +334,6 @@ install(FILES "README.md" DESTINATION .) # ================================================================================================== # Sub-projects # ================================================================================================== +add_subdirectory(backend) add_subdirectory(test) add_subdirectory(benchmark) diff --git a/filament/backend/CMakeLists.txt b/filament/backend/CMakeLists.txt new file mode 100644 index 0000000000..e4c7c6c51b --- /dev/null +++ b/filament/backend/CMakeLists.txt @@ -0,0 +1,252 @@ +cmake_minimum_required(VERSION 3.1) +project(filament C ASM) + +set(TARGET backend) +set(PUBLIC_HDR_DIR include) +set(GENERATION_ROOT ${CMAKE_CURRENT_BINARY_DIR}) + +# ================================================================================================== +# Sources and headers +# ================================================================================================== +set(PUBLIC_HDRS + include/backend/BufferDescriptor.h + include/backend/Platform.h + include/backend/PixelBufferDescriptor.h +) + +set(SRCS + src/noop/NoopDriver.cpp + src/noop/PlatformNoop.cpp + src/opengl/gl_headers.cpp + src/opengl/OpenGLBlitter.cpp + src/opengl/GLUtils.cpp + src/opengl/OpenGLDriver.cpp + src/opengl/OpenGLProgram.cpp + src/CommandStream.cpp + src/CommandBufferQueue.cpp + src/CircularBuffer.cpp + src/Driver.cpp + include/private/backend/DriverAPI.inc + src/Platform.cpp + src/GPUBuffer.cpp + src/Handle.cpp + src/Program.cpp + src/SamplerGroup.cpp + src/TextureReshaper.cpp +) + +set(PRIVATE_HDRS + include/private/backend/CircularBuffer.h + include/private/backend/CommandBufferQueue.h + include/private/backend/CommandStream.h + src/CommandStreamDispatcher.h + src/DataReshaper.h + src/TextureReshaper.h + include/private/backend/Driver.h + include/private/backend/DriverAPI.inc + include/private/backend/DriverApi.h + include/private/backend/DriverApiForward.h + include/private/backend/DriverBase.h + include/private/backend/GPUBuffer.h + include/private/backend/Handle.h + include/private/backend/Program.h + include/private/backend/SamplerGroup.h +) + +# ================================================================================================== +# OS specific +# ================================================================================================== + +# Here set the architecture specific sources +if (USE_EXTERNAL_GLES3) + # Experimental feature; clients provide their own Context Manager. +elseif (ANDROID) + list(APPEND SRCS src/android/ExternalStreamManagerAndroid.cpp) + list(APPEND SRCS src/android/ExternalTextureManagerAndroid.cpp) + list(APPEND SRCS src/android/VirtualMachineEnv.cpp) + list(APPEND SRCS src/opengl/PlatformEGL.cpp) +elseif (IOS) + list(APPEND SRCS src/opengl/PlatformCocoaTouchGL.mm) +elseif (APPLE) + list(APPEND SRCS src/opengl/PlatformCocoaGL.mm) +elseif (WEBGL) + list(APPEND SRCS src/opengl/PlatformWebGL.cpp) +elseif (LINUX) + list(APPEND SRCS src/opengl/PlatformGLX.cpp) +elseif (WIN32) + list(APPEND SRCS src/opengl/PlatformWGL.cpp) +else() + list(APPEND SRCS src/opengl/PlatformDummyGL.cpp) +endif() + +# ================================================================================================== +# Metal Sources +# ================================================================================================== + +if (FILAMENT_SUPPORTS_METAL) + list(APPEND SRCS + src/metal/MetalContext.mm + src/metal/MetalDriver.mm + src/metal/MetalHandles.mm + src/metal/MetalState.mm + src/metal/PlatformMetal.mm + ) +endif() + +# ================================================================================================== +# Vulkan Sources +# ================================================================================================== + +# See root CMakeLists.txt for platforms that support Vulkan +if (FILAMENT_SUPPORTS_VULKAN) + list(APPEND SRCS + src/vulkan/VulkanBinder.cpp + src/vulkan/VulkanBinder.h + src/vulkan/VulkanBuffer.cpp + src/vulkan/VulkanBuffer.h + src/vulkan/VulkanContext.cpp + src/vulkan/VulkanContext.h + src/vulkan/VulkanDisposer.cpp + src/vulkan/VulkanDisposer.h + src/vulkan/VulkanDriver.cpp + src/vulkan/VulkanDriver.h + src/vulkan/VulkanFboCache.cpp + src/vulkan/VulkanFboCache.h + src/vulkan/VulkanHandles.cpp + src/vulkan/VulkanHandles.h + src/vulkan/VulkanSamplerCache.cpp + src/vulkan/VulkanSamplerCache.h + src/vulkan/VulkanStagePool.cpp + src/vulkan/VulkanStagePool.h + src/vulkan/VulkanUtility.cpp + src/vulkan/VulkanUtility.h + ) + if (LINUX) + list(APPEND SRCS src/vulkan/PlatformVkLinux.cpp) + elseif (APPLE AND NOT IOS) + list(APPEND SRCS src/vulkan/PlatformVkCocoa.mm) + elseif (IOS) + list(APPEND SRCS src/vulkan/PlatformVkCocoaTouch.mm) + elseif (ANDROID) + list(APPEND SRCS src/vulkan/PlatformVkAndroid.cpp) + elseif (WIN32) + list(APPEND SRCS src/vulkan/PlatformVkWindows.cpp) + endif() +endif() + +# ================================================================================================== +# Definitions +# ================================================================================================== +# "2" corresponds to SYSTRACE_TAG_FILEMENT (See: utils/Systrace.h) +add_definitions(-DSYSTRACE_TAG=2 ) + + +# ================================================================================================== +# Includes & target definition +# ================================================================================================== +# specify where our headers are +include_directories(${PUBLIC_HDR_DIR}) +include_directories(src) + +# we're building a library +add_library(${TARGET} STATIC ${PRIVATE_HDRS} ${PUBLIC_HDRS} ${SRCS}) + +# specify where the public headers of this library are +target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR}) + +# ================================================================================================== +# Dependencies +# ================================================================================================== + +if (ANDROID) + target_link_libraries(${TARGET} PUBLIC GLESv3 EGL android) +endif() + +if (APPLE AND NOT IOS) + target_link_libraries(${TARGET} PRIVATE "-framework Cocoa") +endif() + +target_link_libraries(${TARGET} PUBLIC math) +target_link_libraries(${TARGET} PUBLIC utils) +target_link_libraries(${TARGET} PUBLIC filabridge) + +# Android, iOS, and WebGL do not use bluegl. +if(NOT IOS AND NOT ANDROID AND NOT WEBGL) + target_link_libraries(${TARGET} PRIVATE bluegl) +endif() + +if (FILAMENT_SUPPORTS_VULKAN) + target_link_libraries(${TARGET} PUBLIC bluevk vkmemalloc) +endif() + +if (FILAMENT_SUPPORTS_METAL) + target_link_libraries(${TARGET} PUBLIC "-framework Metal") +endif() + +if (LINUX) + target_link_libraries(${TARGET} PRIVATE dl) +endif() + +# ================================================================================================== +# Compiler flags +# ================================================================================================== +if (MSVC OR CLANG_CL) + set(OPTIMIZATION_FLAGS + /fp:fast + ) +elseif(WEBGL) + # Avoid strict-vtable-pointers here, it is broken in WebAssembly. + set(OPTIMIZATION_FLAGS -fvisibility=hidden -fvisibility-inlines-hidden) +else() + set(OPTIMIZATION_FLAGS + -ffast-math + -ffp-contract=fast + # TODO: aggressive vectorization is currently broken on Android + # -fslp-vectorize-aggressive + -fvisibility=hidden + -fvisibility-inlines-hidden + -fstrict-vtable-pointers + ) +endif() + +set(LINUX_LINKER_OPTIMIZATION_FLAGS + -Wl,--exclude-libs,bluegl +) + +set(LINUX_COMPILER_FLAGS + -fPIC +) + +set(FILAMENT_WARNINGS + -Wextra -Wno-unused-parameter + -Wextra-semi -Wnewline-eof -Wdeprecated -Wundef + -Wgnu-conditional-omitted-operand + -Wweak-vtables -Wnon-virtual-dtor -Wclass-varargs -Wimplicit-fallthrough + -Wover-aligned +) + +# clang-cl maps -Wall to -Weverything, which clutters logs with benign -Wc++98-compat warnings +# Use /W4 instead for clang-cl builds +if (CLANG_CL) + set(FILAMENT_WARNINGS /W4 ${FILAMENT_WARNINGS}) +else() + set(FILAMENT_WARNINGS -Wall ${FILAMENT_WARNINGS}) +endif() + +target_compile_options(${TARGET} PRIVATE + ${FILAMENT_WARNINGS} + $<$:${OPTIMIZATION_FLAGS}> + $<$,$>:${DARWIN_OPTIMIZATION_FLAGS}> + $<$:${LINUX_COMPILER_FLAGS}> +) + +target_link_libraries(${TARGET} PRIVATE + $<$,$>:${LINUX_LINKER_OPTIMIZATION_FLAGS}> +) + +# ================================================================================================== +# Installation +# ================================================================================================== +set(INSTALL_TYPE ARCHIVE) +install(TARGETS ${TARGET} ${INSTALL_TYPE} DESTINATION lib/${DIST_DIR}) +install(DIRECTORY ${PUBLIC_HDR_DIR}/backend DESTINATION include) diff --git a/filament/include/filament/driver/BufferDescriptor.h b/filament/backend/include/backend/BufferDescriptor.h similarity index 100% rename from filament/include/filament/driver/BufferDescriptor.h rename to filament/backend/include/backend/BufferDescriptor.h diff --git a/filament/include/filament/driver/PixelBufferDescriptor.h b/filament/backend/include/backend/PixelBufferDescriptor.h similarity index 98% rename from filament/include/filament/driver/PixelBufferDescriptor.h rename to filament/backend/include/backend/PixelBufferDescriptor.h index f222009c7d..0f79168060 100644 --- a/filament/include/filament/driver/PixelBufferDescriptor.h +++ b/filament/backend/include/backend/PixelBufferDescriptor.h @@ -21,8 +21,9 @@ #include #include -#include -#include +#include + +#include #include diff --git a/filament/include/filament/driver/Platform.h b/filament/backend/include/backend/Platform.h similarity index 99% rename from filament/include/filament/driver/Platform.h rename to filament/backend/include/backend/Platform.h index d3da08a29f..00cac60943 100644 --- a/filament/include/filament/driver/Platform.h +++ b/filament/backend/include/backend/Platform.h @@ -17,7 +17,7 @@ #ifndef TNT_FILAMENT_DRIVER_PLATFORM_H #define TNT_FILAMENT_DRIVER_PLATFORM_H -#include +#include #include diff --git a/filament/src/driver/CircularBuffer.h b/filament/backend/include/private/backend/CircularBuffer.h similarity index 100% rename from filament/src/driver/CircularBuffer.h rename to filament/backend/include/private/backend/CircularBuffer.h diff --git a/filament/src/driver/CommandBufferQueue.h b/filament/backend/include/private/backend/CommandBufferQueue.h similarity index 98% rename from filament/src/driver/CommandBufferQueue.h rename to filament/backend/include/private/backend/CommandBufferQueue.h index 092d927890..a0586129e9 100644 --- a/filament/src/driver/CommandBufferQueue.h +++ b/filament/backend/include/private/backend/CommandBufferQueue.h @@ -17,7 +17,7 @@ #ifndef TNT_FILAMENT_DRIVER_COMMANDBUFFERQUEUE_H #define TNT_FILAMENT_DRIVER_COMMANDBUFFERQUEUE_H -#include "driver/CircularBuffer.h" +#include "private/backend/CircularBuffer.h" #include #include diff --git a/filament/src/driver/CommandStream.h b/filament/backend/include/private/backend/CommandStream.h similarity index 98% rename from filament/src/driver/CommandStream.h rename to filament/backend/include/private/backend/CommandStream.h index 4613b14aeb..81fc754d9f 100644 --- a/filament/src/driver/CommandStream.h +++ b/filament/backend/include/private/backend/CommandStream.h @@ -19,8 +19,8 @@ #ifndef TNT_FILAMENT_DRIVER_COMMANDSTREAM_H #define TNT_FILAMENT_DRIVER_COMMANDSTREAM_H -#include "driver/CircularBuffer.h" -#include "driver/Driver.h" +#include "private/backend/CircularBuffer.h" +#include "private/backend/Driver.h" #include @@ -57,7 +57,7 @@ public: #define DECL_DRIVER_API_SYNCHRONOUS(RetType, methodName, paramsDecl, params) #define DECL_DRIVER_API(methodName, paramsDecl, params) Execute methodName##_; #define DECL_DRIVER_API_RETURN(RetType, methodName, paramsDecl, params) Execute methodName##_; -#include "driver/DriverAPI.inc" +#include "DriverAPI.inc" }; // ------------------------------------------------------------------------------------------------ @@ -222,7 +222,7 @@ public: return result; \ } -#include "driver/DriverAPI.inc" +#include "DriverAPI.inc" public: CommandStream() noexcept = default; diff --git a/filament/src/driver/Driver.h b/filament/backend/include/private/backend/Driver.h similarity index 97% rename from filament/src/driver/Driver.h rename to filament/backend/include/private/backend/Driver.h index bd779bc5e7..5fcd1cb06c 100644 --- a/filament/src/driver/Driver.h +++ b/filament/backend/include/private/backend/Driver.h @@ -26,15 +26,16 @@ #include #include -#include -#include -#include -#include +#include +#include +#include -#include "driver/Handle.h" -#include "driver/DriverApiForward.h" -#include "driver/Program.h" -#include "driver/SamplerGroup.h" +#include + +#include "private/backend/Handle.h" +#include "private/backend/DriverApiForward.h" +#include "private/backend/Program.h" +#include "private/backend/SamplerGroup.h" namespace filament { @@ -254,7 +255,7 @@ public: virtual RetType methodName##S() noexcept = 0; \ void methodName##R(RetType, paramsDecl) {} -#include "driver/DriverAPI.inc" +#include "private/backend/DriverAPI.inc" }; } // namespace filament diff --git a/filament/src/driver/DriverAPI.inc b/filament/backend/include/private/backend/DriverAPI.inc similarity index 99% rename from filament/src/driver/DriverAPI.inc rename to filament/backend/include/private/backend/DriverAPI.inc index 354944ab95..a629ee1a68 100644 --- a/filament/src/driver/DriverAPI.inc +++ b/filament/backend/include/private/backend/DriverAPI.inc @@ -33,7 +33,7 @@ * public: * #define DRIVER_API(method_name, params_decl, params) \ * virtual void method_name(params_decl) override - * #include "driver/DriverAPI.h" + * #include "DriverAPI.h" * }; * * DECL_DRIVER_API is automatically undefined. diff --git a/filament/src/driver/DriverApi.h b/filament/backend/include/private/backend/DriverApi.h similarity index 89% rename from filament/src/driver/DriverApi.h rename to filament/backend/include/private/backend/DriverApi.h index cf5b9a8522..7d6ea80609 100644 --- a/filament/src/driver/DriverApi.h +++ b/filament/backend/include/private/backend/DriverApi.h @@ -17,7 +17,7 @@ #ifndef TNT_FILAMENT_DRIVER_DRIVERAPI_H #define TNT_FILAMENT_DRIVER_DRIVERAPI_H -#include "driver/DriverApiForward.h" -#include "driver/CommandStream.h" +#include "private/backend/DriverApiForward.h" +#include "private/backend/CommandStream.h" #endif // TNT_FILAMENT_DRIVER_DRIVERAPI_H diff --git a/filament/src/driver/DriverApiForward.h b/filament/backend/include/private/backend/DriverApiForward.h similarity index 100% rename from filament/src/driver/DriverApiForward.h rename to filament/backend/include/private/backend/DriverApiForward.h diff --git a/filament/src/driver/DriverBase.h b/filament/backend/include/private/backend/DriverBase.h similarity index 97% rename from filament/src/driver/DriverBase.h rename to filament/backend/include/private/backend/DriverBase.h index 29a8713786..b5be673a9d 100644 --- a/filament/src/driver/DriverBase.h +++ b/filament/backend/include/private/backend/DriverBase.h @@ -27,10 +27,10 @@ #include #include -#include +#include -#include "driver/Driver.h" -#include "driver/SamplerGroup.h" +#include "private/backend/Driver.h" +#include "SamplerGroup.h" namespace filament { diff --git a/filament/src/driver/GPUBuffer.h b/filament/backend/include/private/backend/GPUBuffer.h similarity index 95% rename from filament/src/driver/GPUBuffer.h rename to filament/backend/include/private/backend/GPUBuffer.h index 2abc24426a..f9bc993e60 100644 --- a/filament/src/driver/GPUBuffer.h +++ b/filament/backend/include/private/backend/GPUBuffer.h @@ -17,10 +17,10 @@ #ifndef TNT_FILAMENT_DETAILS_GPUBUFFER_H #define TNT_FILAMENT_DETAILS_GPUBUFFER_H -#include +#include -#include "driver/DriverApiForward.h" -#include "driver/Handle.h" +#include "private/backend/DriverApiForward.h" +#include "private/backend/Handle.h" #include diff --git a/filament/src/driver/Handle.h b/filament/backend/include/private/backend/Handle.h similarity index 100% rename from filament/src/driver/Handle.h rename to filament/backend/include/private/backend/Handle.h diff --git a/filament/src/driver/Program.h b/filament/backend/include/private/backend/Program.h similarity index 100% rename from filament/src/driver/Program.h rename to filament/backend/include/private/backend/Program.h diff --git a/filament/src/driver/SamplerGroup.h b/filament/backend/include/private/backend/SamplerGroup.h similarity index 97% rename from filament/src/driver/SamplerGroup.h rename to filament/backend/include/private/backend/SamplerGroup.h index 971f61edad..61205dc0c5 100644 --- a/filament/src/driver/SamplerGroup.h +++ b/filament/backend/include/private/backend/SamplerGroup.h @@ -24,9 +24,9 @@ #include #include -#include +#include -#include "driver/Handle.h" +#include "private/backend/Handle.h" namespace filament { diff --git a/filament/src/driver/CircularBuffer.cpp b/filament/backend/src/CircularBuffer.cpp similarity index 99% rename from filament/src/driver/CircularBuffer.cpp rename to filament/backend/src/CircularBuffer.cpp index cff9df6be3..48a321a891 100644 --- a/filament/src/driver/CircularBuffer.cpp +++ b/filament/backend/src/CircularBuffer.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/CircularBuffer.h" +#include "private/backend/CircularBuffer.h" #if !defined(WIN32) && !defined(__EMSCRIPTEN__) && !defined(IOS) # include diff --git a/filament/src/driver/CommandBufferQueue.cpp b/filament/backend/src/CommandBufferQueue.cpp similarity index 97% rename from filament/src/driver/CommandBufferQueue.cpp rename to filament/backend/src/CommandBufferQueue.cpp index b3b1e16fea..23e20640f5 100644 --- a/filament/src/driver/CommandBufferQueue.cpp +++ b/filament/backend/src/CommandBufferQueue.cpp @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "driver/CommandBufferQueue.h" +#include "private/backend/CommandBufferQueue.h" #include #include #include -#include "driver/CommandStream.h" +#include "private/backend/CommandStream.h" using namespace utils; diff --git a/filament/src/driver/CommandStream.cpp b/filament/backend/src/CommandStream.cpp similarity index 99% rename from filament/src/driver/CommandStream.cpp rename to filament/backend/src/CommandStream.cpp index 37e7c815ca..9ddf62c5fb 100644 --- a/filament/src/driver/CommandStream.cpp +++ b/filament/backend/src/CommandStream.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/CommandStream.h" +#include "private/backend/CommandStream.h" #include #include @@ -127,7 +127,7 @@ void CommandType::Command::log() noexcept { template void CommandType::Command<&Driver::methodName>::log(); #define DECL_DRIVER_API_RETURN(RetType, methodName, paramsDecl, params) \ template void CommandType::Command<&Driver::methodName##R>::log(); -#include "driver/DriverAPI.inc" +#include "DriverAPI.inc" #endif // ------------------------------------------------------------------------------------------------ diff --git a/filament/src/driver/CommandStreamDispatcher.h b/filament/backend/src/CommandStreamDispatcher.h similarity index 95% rename from filament/src/driver/CommandStreamDispatcher.h rename to filament/backend/src/CommandStreamDispatcher.h index 788b47a7b9..58e686af4e 100644 --- a/filament/src/driver/CommandStreamDispatcher.h +++ b/filament/backend/src/CommandStreamDispatcher.h @@ -19,8 +19,8 @@ #ifndef TNT_FILAMENT_DRIVER_COMMANDSTREAM_DISPATCHER_H #define TNT_FILAMENT_DRIVER_COMMANDSTREAM_DISPATCHER_H -#include "driver/Driver.h" -#include "driver/CommandStream.h" +#include "private/backend/Driver.h" +#include "private/backend/CommandStream.h" #include #include @@ -54,7 +54,7 @@ public: #define DECL_DRIVER_API_SYNCHRONOUS(RetType, methodName, paramsDecl, params) #define DECL_DRIVER_API(methodName, paramsDecl, params) methodName##_ = &ConcreteDispatcher::methodName; #define DECL_DRIVER_API_RETURN(RetType, methodName, paramsDecl, params) methodName##_ = &ConcreteDispatcher::methodName; -#include "driver/DriverAPI.inc" +#include "private/backend/DriverAPI.inc" } private: #define DECL_DRIVER_API_SYNCHRONOUS(RetType, methodName, paramsDecl, params) @@ -72,7 +72,7 @@ private: ConcreteDriver& concreteDriver = static_cast(driver); \ Cmd::execute(&ConcreteDriver::methodName##R, concreteDriver, base, next); \ } -#include "driver/DriverAPI.inc" +#include "private/backend/DriverAPI.inc" }; } // namespace filament diff --git a/filament/src/driver/DataReshaper.h b/filament/backend/src/DataReshaper.h similarity index 100% rename from filament/src/driver/DataReshaper.h rename to filament/backend/src/DataReshaper.h diff --git a/filament/src/driver/Driver.cpp b/filament/backend/src/Driver.cpp similarity index 94% rename from filament/src/driver/Driver.cpp rename to filament/backend/src/Driver.cpp index 6f6049dfb0..e342be3a5a 100644 --- a/filament/src/driver/Driver.cpp +++ b/filament/backend/src/Driver.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "driver/DriverBase.h" -#include "driver/Driver.h" -#include "driver/CommandStream.h" +#include "private/backend/DriverBase.h" +#include "private/backend/Driver.h" +#include "private/backend/CommandStream.h" #include #include @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include using namespace utils; diff --git a/filament/src/driver/GPUBuffer.cpp b/filament/backend/src/GPUBuffer.cpp similarity index 97% rename from filament/src/driver/GPUBuffer.cpp rename to filament/backend/src/GPUBuffer.cpp index f0df6aa3ed..b41e2122b7 100644 --- a/filament/src/driver/GPUBuffer.cpp +++ b/filament/backend/src/GPUBuffer.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "driver/GPUBuffer.h" -#include "driver/DriverApi.h" -#include "driver/Driver.h" -#include "driver/DriverBase.h" +#include "private/backend/GPUBuffer.h" +#include "private/backend/DriverApi.h" +#include "private/backend/Driver.h" +#include "private/backend/DriverBase.h" #include diff --git a/filament/src/driver/Handle.cpp b/filament/backend/src/Handle.cpp similarity index 98% rename from filament/src/driver/Handle.cpp rename to filament/backend/src/Handle.cpp index 9873f6df0a..7c6caece4a 100644 --- a/filament/src/driver/Handle.cpp +++ b/filament/backend/src/Handle.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/Handle.h" +#include "private/backend/Handle.h" #include diff --git a/filament/src/driver/Platform.cpp b/filament/backend/src/Platform.cpp similarity index 83% rename from filament/src/driver/Platform.cpp rename to filament/backend/src/Platform.cpp index c95b2f6ad0..730d51ffe1 100644 --- a/filament/src/driver/Platform.cpp +++ b/filament/backend/src/Platform.cpp @@ -14,57 +14,57 @@ * limitations under the License. */ -#include +#include #if defined(ANDROID) #ifndef USE_EXTERNAL_GLES3 - #include "driver/opengl/PlatformEGL.h" + #include "opengl/PlatformEGL.h" #endif #if defined (FILAMENT_DRIVER_SUPPORTS_VULKAN) - #include "driver/vulkan/PlatformVkAndroid.h" + #include "vulkan/PlatformVkAndroid.h" #endif #elif defined(IOS) #ifndef USE_EXTERNAL_GLES3 - #include "driver/opengl/PlatformCocoaTouchGL.h" + #include "opengl/PlatformCocoaTouchGL.h" #endif #if defined (FILAMENT_DRIVER_SUPPORTS_VULKAN) - #include "driver/vulkan/PlatformVkCocoaTouch.h" + #include "vulkan/PlatformVkCocoaTouch.h" #endif #elif defined(__APPLE__) #ifndef USE_EXTERNAL_GLES3 - #include "driver/opengl/PlatformCocoaGL.h" + #include "opengl/PlatformCocoaGL.h" #endif #if defined (FILAMENT_DRIVER_SUPPORTS_VULKAN) - #include "driver/vulkan/PlatformVkCocoa.h" + #include "vulkan/PlatformVkCocoa.h" #endif #elif defined(__linux__) #ifndef USE_EXTERNAL_GLES3 - #include "driver/opengl/PlatformGLX.h" + #include "opengl/PlatformGLX.h" #endif #if defined (FILAMENT_DRIVER_SUPPORTS_VULKAN) - #include "driver/vulkan/PlatformVkLinux.h" + #include "vulkan/PlatformVkLinux.h" #endif #elif defined(WIN32) #ifndef USE_EXTERNAL_GLES3 - #include "driver/opengl/PlatformWGL.h" + #include "opengl/PlatformWGL.h" #endif #if defined (FILAMENT_DRIVER_SUPPORTS_VULKAN) - #include "driver/vulkan/PlatformVkWindows.h" + #include "vulkan/PlatformVkWindows.h" #endif #elif defined(__EMSCRIPTEN__) - #include "driver/opengl/PlatformWebGL.h" + #include "opengl/PlatformWebGL.h" #else #ifndef USE_EXTERNAL_GLES3 - #include "driver/opengl/PlatformDummyGL.h" + #include "opengl/PlatformDummyGL.h" #endif #endif #if defined (FILAMENT_SUPPORTS_METAL) - #include "driver/metal/PlatformMetal.h" + #include "metal/PlatformMetal.h" #endif #ifndef NDEBUG - #include "driver/noop/PlatformNoop.h" + #include "noop/PlatformNoop.h" #endif namespace filament { diff --git a/filament/src/driver/Program.cpp b/filament/backend/src/Program.cpp similarity index 98% rename from filament/src/driver/Program.cpp rename to filament/backend/src/Program.cpp index 6535ebabbf..22a2441458 100644 --- a/filament/src/driver/Program.cpp +++ b/filament/backend/src/Program.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/Program.h" +#include "private/backend/Program.h" using namespace utils; diff --git a/filament/src/driver/SamplerGroup.cpp b/filament/backend/src/SamplerGroup.cpp similarity index 97% rename from filament/src/driver/SamplerGroup.cpp rename to filament/backend/src/SamplerGroup.cpp index a87e253eab..65a7c4dce6 100644 --- a/filament/src/driver/SamplerGroup.cpp +++ b/filament/backend/src/SamplerGroup.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "driver/SamplerGroup.h" -#include "driver/GPUBuffer.h" +#include "private/backend/SamplerGroup.h" +#include "private/backend/GPUBuffer.h" namespace filament { diff --git a/filament/src/driver/TextureReshaper.cpp b/filament/backend/src/TextureReshaper.cpp similarity index 100% rename from filament/src/driver/TextureReshaper.cpp rename to filament/backend/src/TextureReshaper.cpp diff --git a/filament/src/driver/TextureReshaper.h b/filament/backend/src/TextureReshaper.h similarity index 98% rename from filament/src/driver/TextureReshaper.h rename to filament/backend/src/TextureReshaper.h index 8261505c4d..46c94f95a3 100644 --- a/filament/src/driver/TextureReshaper.h +++ b/filament/backend/src/TextureReshaper.h @@ -17,7 +17,7 @@ #ifndef TNT_TEXTURERESHAPER_H #define TNT_TEXTURERESHAPER_H -#include +#include namespace filament { namespace driver { diff --git a/filament/src/driver/android/ExternalStreamManagerAndroid.cpp b/filament/backend/src/android/ExternalStreamManagerAndroid.cpp similarity index 100% rename from filament/src/driver/android/ExternalStreamManagerAndroid.cpp rename to filament/backend/src/android/ExternalStreamManagerAndroid.cpp diff --git a/filament/src/driver/android/ExternalStreamManagerAndroid.h b/filament/backend/src/android/ExternalStreamManagerAndroid.h similarity index 96% rename from filament/src/driver/android/ExternalStreamManagerAndroid.h rename to filament/backend/src/android/ExternalStreamManagerAndroid.h index ff282e6557..214877d5ab 100644 --- a/filament/src/driver/android/ExternalStreamManagerAndroid.h +++ b/filament/backend/src/android/ExternalStreamManagerAndroid.h @@ -17,9 +17,9 @@ #ifndef TNT_FILAMENT_DRIVER_ANDROID_EXTERNAL_STREAM_MANAGER_ANDROID_H #define TNT_FILAMENT_DRIVER_ANDROID_EXTERNAL_STREAM_MANAGER_ANDROID_H -#include "driver/android/VirtualMachineEnv.h" +#include "android/VirtualMachineEnv.h" -#include +#include #if __has_include() # include diff --git a/filament/src/driver/android/ExternalTextureManagerAndroid.cpp b/filament/backend/src/android/ExternalTextureManagerAndroid.cpp similarity index 100% rename from filament/src/driver/android/ExternalTextureManagerAndroid.cpp rename to filament/backend/src/android/ExternalTextureManagerAndroid.cpp diff --git a/filament/src/driver/android/ExternalTextureManagerAndroid.h b/filament/backend/src/android/ExternalTextureManagerAndroid.h similarity index 95% rename from filament/src/driver/android/ExternalTextureManagerAndroid.h rename to filament/backend/src/android/ExternalTextureManagerAndroid.h index 76b846a1bc..a74806e59c 100644 --- a/filament/src/driver/android/ExternalTextureManagerAndroid.h +++ b/filament/backend/src/android/ExternalTextureManagerAndroid.h @@ -17,10 +17,10 @@ #ifndef TNT_FILAMENT_DRIVER_ANDROID_EXTERNAL_TEXTURE_MANAGER_ANDROID_H #define TNT_FILAMENT_DRIVER_ANDROID_EXTERNAL_TEXTURE_MANAGER_ANDROID_H -#include "driver/android/VirtualMachineEnv.h" +#include "android/VirtualMachineEnv.h" -#include -#include +#include +#include #include #include diff --git a/filament/src/driver/android/VirtualMachineEnv.cpp b/filament/backend/src/android/VirtualMachineEnv.cpp similarity index 100% rename from filament/src/driver/android/VirtualMachineEnv.cpp rename to filament/backend/src/android/VirtualMachineEnv.cpp diff --git a/filament/src/driver/android/VirtualMachineEnv.h b/filament/backend/src/android/VirtualMachineEnv.h similarity index 100% rename from filament/src/driver/android/VirtualMachineEnv.h rename to filament/backend/src/android/VirtualMachineEnv.h diff --git a/filament/src/driver/metal/MetalContext.h b/filament/backend/src/metal/MetalContext.h similarity index 100% rename from filament/src/driver/metal/MetalContext.h rename to filament/backend/src/metal/MetalContext.h diff --git a/filament/src/driver/metal/MetalContext.mm b/filament/backend/src/metal/MetalContext.mm similarity index 100% rename from filament/src/driver/metal/MetalContext.mm rename to filament/backend/src/metal/MetalContext.mm diff --git a/filament/src/driver/metal/MetalDriver.h b/filament/backend/src/metal/MetalDriver.h similarity index 97% rename from filament/src/driver/metal/MetalDriver.h rename to filament/backend/src/metal/MetalDriver.h index f1ae2e84fc..6159112f9e 100644 --- a/filament/src/driver/metal/MetalDriver.h +++ b/filament/backend/src/metal/MetalDriver.h @@ -17,8 +17,8 @@ #ifndef TNT_FILAMENT_DRIVER_METALDRIVER_H #define TNT_FILAMENT_DRIVER_METALDRIVER_H -#include "driver/Driver.h" -#include "driver/DriverBase.h" +#include "private/backend/Driver.h" +#include "private/backend/DriverBase.h" #include #include @@ -71,7 +71,7 @@ private: RetType methodName##S() noexcept override; \ UTILS_ALWAYS_INLINE void methodName##R(RetType, paramsDecl); -#include "driver/DriverAPI.inc" +#include "private/backend/DriverAPI.inc" /* * Memory management diff --git a/filament/src/driver/metal/MetalDriver.mm b/filament/backend/src/metal/MetalDriver.mm similarity index 99% rename from filament/src/driver/metal/MetalDriver.mm rename to filament/backend/src/metal/MetalDriver.mm index 989a06e1cc..3680641c90 100644 --- a/filament/src/driver/metal/MetalDriver.mm +++ b/filament/backend/src/metal/MetalDriver.mm @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "driver/CommandStream.h" -#include "driver/CommandStreamDispatcher.h" -#include "driver/metal/MetalDriver.h" +#include "private/backend/CommandStream.h" +#include "CommandStreamDispatcher.h" +#include "metal/MetalDriver.h" #include "MetalContext.h" #include "MetalEnums.h" diff --git a/filament/src/driver/metal/MetalEnums.h b/filament/backend/src/metal/MetalEnums.h similarity index 99% rename from filament/src/driver/metal/MetalEnums.h rename to filament/backend/src/metal/MetalEnums.h index a95d2f8c7e..ac13547b85 100644 --- a/filament/src/driver/metal/MetalEnums.h +++ b/filament/backend/src/metal/MetalEnums.h @@ -17,7 +17,7 @@ #ifndef TNT_FILAMENT_DRIVER_METALENUMS_H #define TNT_FILAMENT_DRIVER_METALENUMS_H -#include "driver/Driver.h" +#include "private/backend/Driver.h" #include diff --git a/filament/src/driver/metal/MetalHandles.h b/filament/backend/src/metal/MetalHandles.h similarity index 98% rename from filament/src/driver/metal/MetalHandles.h rename to filament/backend/src/metal/MetalHandles.h index f45f3132f7..b4edee729d 100644 --- a/filament/src/driver/metal/MetalHandles.h +++ b/filament/backend/src/metal/MetalHandles.h @@ -17,7 +17,7 @@ #ifndef TNT_FILAMENT_DRIVER_METALHANDLES_H #define TNT_FILAMENT_DRIVER_METALHANDLES_H -#include "driver/metal/MetalDriver.h" +#include "metal/MetalDriver.h" #include #include // for CAMetalLayer @@ -25,7 +25,7 @@ #include "MetalContext.h" #include "MetalEnums.h" #include "MetalState.h" // for MetalState::VertexDescription -#include "driver/TextureReshaper.h" +#include "TextureReshaper.h" #include diff --git a/filament/src/driver/metal/MetalHandles.mm b/filament/backend/src/metal/MetalHandles.mm similarity index 100% rename from filament/src/driver/metal/MetalHandles.mm rename to filament/backend/src/metal/MetalHandles.mm diff --git a/filament/src/driver/metal/MetalState.h b/filament/backend/src/metal/MetalState.h similarity index 99% rename from filament/src/driver/metal/MetalState.h rename to filament/backend/src/metal/MetalState.h index 8d4f615982..0f6a70fb1c 100644 --- a/filament/src/driver/metal/MetalState.h +++ b/filament/backend/src/metal/MetalState.h @@ -19,7 +19,7 @@ #include -#include "driver/Driver.h" +#include "private/backend/Driver.h" #include diff --git a/filament/src/driver/metal/MetalState.mm b/filament/backend/src/metal/MetalState.mm similarity index 100% rename from filament/src/driver/metal/MetalState.mm rename to filament/backend/src/metal/MetalState.mm diff --git a/filament/src/driver/metal/PlatformMetal.h b/filament/backend/src/metal/PlatformMetal.h similarity index 92% rename from filament/src/driver/metal/PlatformMetal.h rename to filament/backend/src/metal/PlatformMetal.h index 6d68cf29ea..d8cc27e955 100644 --- a/filament/src/driver/metal/PlatformMetal.h +++ b/filament/backend/src/metal/PlatformMetal.h @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include namespace filament { diff --git a/filament/src/driver/metal/PlatformMetal.mm b/filament/backend/src/metal/PlatformMetal.mm similarity index 100% rename from filament/src/driver/metal/PlatformMetal.mm rename to filament/backend/src/metal/PlatformMetal.mm diff --git a/filament/src/driver/noop/NoopDriver.cpp b/filament/backend/src/noop/NoopDriver.cpp similarity index 93% rename from filament/src/driver/noop/NoopDriver.cpp rename to filament/backend/src/noop/NoopDriver.cpp index 659a7d39db..3b26caab80 100644 --- a/filament/src/driver/noop/NoopDriver.cpp +++ b/filament/backend/src/noop/NoopDriver.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "driver/noop/NoopDriver.h" -#include "driver/CommandStreamDispatcher.h" +#include "noop/NoopDriver.h" +#include "CommandStreamDispatcher.h" namespace filament { diff --git a/filament/src/driver/noop/NoopDriver.h b/filament/backend/src/noop/NoopDriver.h similarity index 94% rename from filament/src/driver/noop/NoopDriver.h rename to filament/backend/src/noop/NoopDriver.h index 6c78d32945..2c79fcb81d 100644 --- a/filament/src/driver/noop/NoopDriver.h +++ b/filament/backend/src/noop/NoopDriver.h @@ -17,8 +17,8 @@ #ifndef TNT_FILAMENT_DRIVER_NOOPDRIVER_H #define TNT_FILAMENT_DRIVER_NOOPDRIVER_H -#include "driver/Driver.h" -#include "driver/DriverBase.h" +#include "private/backend/Driver.h" +#include "private/backend/DriverBase.h" #include @@ -55,7 +55,7 @@ private: return RetType((RetType::HandleId)0xDEAD0000); } \ UTILS_ALWAYS_INLINE void methodName##R(RetType, paramsDecl) { } -#include "driver/DriverAPI.inc" +#include "private/backend/DriverAPI.inc" }; } // namespace filament diff --git a/filament/src/driver/noop/PlatformNoop.cpp b/filament/backend/src/noop/PlatformNoop.cpp similarity index 92% rename from filament/src/driver/noop/PlatformNoop.cpp rename to filament/backend/src/noop/PlatformNoop.cpp index 04f26bf2ed..ecb117e3c2 100644 --- a/filament/src/driver/noop/PlatformNoop.cpp +++ b/filament/backend/src/noop/PlatformNoop.cpp @@ -18,9 +18,9 @@ // Remove it from release builds, since it uses some space needlessly. #ifndef NDEBUG -#include "driver/noop/PlatformNoop.h" +#include "noop/PlatformNoop.h" -#include "driver/noop/NoopDriver.h" +#include "noop/NoopDriver.h" namespace filament { diff --git a/filament/src/driver/noop/PlatformNoop.h b/filament/backend/src/noop/PlatformNoop.h similarity index 93% rename from filament/src/driver/noop/PlatformNoop.h rename to filament/backend/src/noop/PlatformNoop.h index 47590c7105..ea331a3732 100644 --- a/filament/src/driver/noop/PlatformNoop.h +++ b/filament/backend/src/noop/PlatformNoop.h @@ -17,8 +17,8 @@ #ifndef TNT_FILAMENT_DRIVER_NOOP_PLATFORM_NOOP_H #define TNT_FILAMENT_DRIVER_NOOP_PLATFORM_NOOP_H -#include -#include +#include +#include namespace filament { diff --git a/filament/src/driver/opengl/GLUtils.cpp b/filament/backend/src/opengl/GLUtils.cpp similarity index 97% rename from filament/src/driver/opengl/GLUtils.cpp rename to filament/backend/src/opengl/GLUtils.cpp index 2bd2a3017c..a56837770a 100644 --- a/filament/src/driver/opengl/GLUtils.cpp +++ b/filament/backend/src/opengl/GLUtils.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "driver/opengl/GLUtils.h" +#include "opengl/GLUtils.h" #include -#include +#include "private/backend/Driver.h" namespace filament { diff --git a/filament/src/driver/opengl/GLUtils.h b/filament/backend/src/opengl/GLUtils.h similarity index 99% rename from filament/src/driver/opengl/GLUtils.h rename to filament/backend/src/opengl/GLUtils.h index 92a8ca2e7e..4dc71c6bb9 100644 --- a/filament/src/driver/opengl/GLUtils.h +++ b/filament/backend/src/opengl/GLUtils.h @@ -20,9 +20,9 @@ #include #include -#include +#include -#include "driver/opengl/gl_headers.h" +#include "opengl/gl_headers.h" namespace filament { namespace GLUtils { diff --git a/filament/src/driver/opengl/NullGLES.h b/filament/backend/src/opengl/NullGLES.h similarity index 100% rename from filament/src/driver/opengl/NullGLES.h rename to filament/backend/src/opengl/NullGLES.h diff --git a/filament/src/driver/opengl/OpenGLBlitter.cpp b/filament/backend/src/opengl/OpenGLBlitter.cpp similarity index 98% rename from filament/src/driver/opengl/OpenGLBlitter.cpp rename to filament/backend/src/opengl/OpenGLBlitter.cpp index 95fecc2b28..400f57a948 100644 --- a/filament/src/driver/opengl/OpenGLBlitter.cpp +++ b/filament/backend/src/opengl/OpenGLBlitter.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/opengl/OpenGLBlitter.h" +#include "opengl/OpenGLBlitter.h" #include @@ -23,8 +23,8 @@ #include #include -#include "driver/opengl/OpenGLDriver.h" -#include "driver/opengl/GLUtils.h" +#include "opengl/OpenGLDriver.h" +#include "opengl/GLUtils.h" using namespace filament::math; using namespace utils; diff --git a/filament/src/driver/opengl/OpenGLBlitter.h b/filament/backend/src/opengl/OpenGLBlitter.h similarity index 97% rename from filament/src/driver/opengl/OpenGLBlitter.h rename to filament/backend/src/opengl/OpenGLBlitter.h index 50720996bf..76ad2264ff 100644 --- a/filament/src/driver/opengl/OpenGLBlitter.h +++ b/filament/backend/src/opengl/OpenGLBlitter.h @@ -18,7 +18,7 @@ #define TNT_FILAMENT_DRIVER_OPENGLBLITTER_H #include -#include "driver/opengl/gl_headers.h" +#include "opengl/gl_headers.h" namespace filament { diff --git a/filament/src/driver/opengl/OpenGLDriver.cpp b/filament/backend/src/opengl/OpenGLDriver.cpp similarity index 99% rename from filament/src/driver/opengl/OpenGLDriver.cpp rename to filament/backend/src/opengl/OpenGLDriver.cpp index ea7b127c52..d0fd602333 100644 --- a/filament/src/driver/opengl/OpenGLDriver.cpp +++ b/filament/backend/src/opengl/OpenGLDriver.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/opengl/OpenGLDriver.h" +#include "opengl/OpenGLDriver.h" #include @@ -23,12 +23,12 @@ #include #include -#include "driver/DriverApi.h" -#include "driver/CommandStreamDispatcher.h" -#include "driver/opengl/OpenGLProgram.h" -#include "driver/opengl/OpenGLBlitter.h" +#include "private/backend/DriverApi.h" +#include "CommandStreamDispatcher.h" +#include "opengl/OpenGLProgram.h" +#include "opengl/OpenGLBlitter.h" -#include +#include // change to true to display all GL extensions in the console on start-up #define DEBUG_PRINT_EXTENSIONS false diff --git a/filament/src/driver/opengl/OpenGLDriver.h b/filament/backend/src/opengl/OpenGLDriver.h similarity index 99% rename from filament/src/driver/opengl/OpenGLDriver.h rename to filament/backend/src/opengl/OpenGLDriver.h index a9cc4aa9c1..bdb87eb7ce 100644 --- a/filament/src/driver/opengl/OpenGLDriver.h +++ b/filament/backend/src/opengl/OpenGLDriver.h @@ -17,9 +17,9 @@ #ifndef TNT_FILAMENT_DRIVER_OPENGLDRIVER_H #define TNT_FILAMENT_DRIVER_OPENGLDRIVER_H -#include "driver/Driver.h" -#include "driver/DriverBase.h" -#include "driver/opengl/GLUtils.h" +#include "private/backend/Driver.h" +#include "private/backend/DriverBase.h" +#include "opengl/GLUtils.h" #include #include @@ -209,7 +209,7 @@ private: RetType methodName##S() noexcept override; \ UTILS_ALWAYS_INLINE void methodName##R(RetType, paramsDecl); -#include "driver/DriverAPI.inc" +#include "private/backend/DriverAPI.inc" // Memory management... diff --git a/filament/src/driver/opengl/OpenGLProgram.cpp b/filament/backend/src/opengl/OpenGLProgram.cpp similarity index 99% rename from filament/src/driver/opengl/OpenGLProgram.cpp rename to filament/backend/src/opengl/OpenGLProgram.cpp index cf632ba4ed..74d9cb7383 100644 --- a/filament/src/driver/opengl/OpenGLProgram.cpp +++ b/filament/backend/src/opengl/OpenGLProgram.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "driver/opengl/OpenGLProgram.h" +#include "opengl/OpenGLProgram.h" -#include "driver/opengl/OpenGLDriver.h" +#include "opengl/OpenGLDriver.h" #include #include diff --git a/filament/src/driver/opengl/OpenGLProgram.h b/filament/backend/src/opengl/OpenGLProgram.h similarity index 95% rename from filament/src/driver/opengl/OpenGLProgram.h rename to filament/backend/src/opengl/OpenGLProgram.h index aac0fd3d93..4d43080ba0 100644 --- a/filament/src/driver/opengl/OpenGLProgram.h +++ b/filament/backend/src/opengl/OpenGLProgram.h @@ -25,11 +25,11 @@ #include #include -#include "driver/opengl/gl_headers.h" -#include "driver/Driver.h" -#include "driver/DriverBase.h" -#include "driver/Program.h" -#include "driver/opengl/OpenGLDriver.h" +#include "opengl/gl_headers.h" +#include "private/backend/Driver.h" +#include "private/backend/DriverBase.h" +#include "private/backend/Program.h" +#include "opengl/OpenGLDriver.h" namespace filament { diff --git a/filament/src/driver/opengl/PlatformCocoaGL.h b/filament/backend/src/opengl/PlatformCocoaGL.h similarity index 96% rename from filament/src/driver/opengl/PlatformCocoaGL.h rename to filament/backend/src/opengl/PlatformCocoaGL.h index ff91536ea1..cb8316aaf1 100644 --- a/filament/src/driver/opengl/PlatformCocoaGL.h +++ b/filament/backend/src/opengl/PlatformCocoaGL.h @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include namespace filament { diff --git a/filament/src/driver/opengl/PlatformCocoaGL.mm b/filament/backend/src/opengl/PlatformCocoaGL.mm similarity index 96% rename from filament/src/driver/opengl/PlatformCocoaGL.mm rename to filament/backend/src/opengl/PlatformCocoaGL.mm index 3a6af432e1..dda5e103f0 100644 --- a/filament/src/driver/opengl/PlatformCocoaGL.mm +++ b/filament/backend/src/opengl/PlatformCocoaGL.mm @@ -17,18 +17,18 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" -#include "driver/opengl/PlatformCocoaGL.h" +#include "opengl/PlatformCocoaGL.h" #include #include -#include "driver/DriverBase.h" +#include "private/backend/DriverBase.h" -#include +#include #include -#include "driver/opengl/OpenGLDriver.h" +#include "opengl/OpenGLDriver.h" namespace filament { diff --git a/filament/src/driver/opengl/PlatformCocoaTouchGL.h b/filament/backend/src/opengl/PlatformCocoaTouchGL.h similarity index 97% rename from filament/src/driver/opengl/PlatformCocoaTouchGL.h rename to filament/backend/src/opengl/PlatformCocoaTouchGL.h index dfd1ff716d..c50a60b3d9 100644 --- a/filament/src/driver/opengl/PlatformCocoaTouchGL.h +++ b/filament/backend/src/opengl/PlatformCocoaTouchGL.h @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include namespace filament { diff --git a/filament/src/driver/opengl/PlatformCocoaTouchGL.mm b/filament/backend/src/opengl/PlatformCocoaTouchGL.mm similarity index 96% rename from filament/src/driver/opengl/PlatformCocoaTouchGL.mm rename to filament/backend/src/opengl/PlatformCocoaTouchGL.mm index 06ef398d50..0bc9ef7a37 100644 --- a/filament/src/driver/opengl/PlatformCocoaTouchGL.mm +++ b/filament/backend/src/opengl/PlatformCocoaTouchGL.mm @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/opengl/PlatformCocoaTouchGL.h" +#include "opengl/PlatformCocoaTouchGL.h" #include #include @@ -22,13 +22,13 @@ #include -#include "driver/DriverBase.h" +#include "private/backend/DriverBase.h" -#include +#include #include -#include "driver/opengl/OpenGLDriver.h" +#include "opengl/OpenGLDriver.h" namespace filament { diff --git a/filament/src/driver/opengl/PlatformDummyGL.cpp b/filament/backend/src/opengl/PlatformDummyGL.cpp similarity index 91% rename from filament/src/driver/opengl/PlatformDummyGL.cpp rename to filament/backend/src/opengl/PlatformDummyGL.cpp index 2b9f18fe2b..2882300b85 100644 --- a/filament/src/driver/opengl/PlatformDummyGL.cpp +++ b/filament/backend/src/opengl/PlatformDummyGL.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "driver/opengl/PlatformDummyGL.h" +#include "opengl/PlatformDummyGL.h" -#include "driver/opengl/OpenGLDriver.h" +#include "opengl/OpenGLDriver.h" namespace filament { diff --git a/filament/src/driver/opengl/PlatformDummyGL.h b/filament/backend/src/opengl/PlatformDummyGL.h similarity index 96% rename from filament/src/driver/opengl/PlatformDummyGL.h rename to filament/backend/src/opengl/PlatformDummyGL.h index b991dc33c4..879d77139c 100644 --- a/filament/src/driver/opengl/PlatformDummyGL.h +++ b/filament/backend/src/opengl/PlatformDummyGL.h @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include namespace filament { diff --git a/filament/src/driver/opengl/PlatformEGL.cpp b/filament/backend/src/opengl/PlatformEGL.cpp similarity index 98% rename from filament/src/driver/opengl/PlatformEGL.cpp rename to filament/backend/src/opengl/PlatformEGL.cpp index 4e1eac87af..81a29129b6 100644 --- a/filament/src/driver/opengl/PlatformEGL.cpp +++ b/filament/backend/src/opengl/PlatformEGL.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/opengl/PlatformEGL.h" +#include "opengl/PlatformEGL.h" #include @@ -29,11 +29,11 @@ #include #include -#include "driver/android/ExternalTextureManagerAndroid.h" -#include "driver/android/ExternalStreamManagerAndroid.h" -#include "driver/android/VirtualMachineEnv.h" +#include "android/ExternalTextureManagerAndroid.h" +#include "android/ExternalStreamManagerAndroid.h" +#include "android/VirtualMachineEnv.h" -#include "driver/opengl/OpenGLDriver.h" +#include "opengl/OpenGLDriver.h" #include #include diff --git a/filament/src/driver/opengl/PlatformEGL.h b/filament/backend/src/opengl/PlatformEGL.h similarity index 97% rename from filament/src/driver/opengl/PlatformEGL.h rename to filament/backend/src/opengl/PlatformEGL.h index e090c4aa25..de117c686b 100644 --- a/filament/src/driver/opengl/PlatformEGL.h +++ b/filament/backend/src/opengl/PlatformEGL.h @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include struct AHardwareBuffer; diff --git a/filament/src/driver/opengl/PlatformGLX.cpp b/filament/backend/src/opengl/PlatformGLX.cpp similarity index 98% rename from filament/src/driver/opengl/PlatformGLX.cpp rename to filament/backend/src/opengl/PlatformGLX.cpp index 6bc7391d72..e6bc66d11b 100644 --- a/filament/src/driver/opengl/PlatformGLX.cpp +++ b/filament/backend/src/opengl/PlatformGLX.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/opengl/PlatformGLX.h" +#include "opengl/PlatformGLX.h" #include #include @@ -23,7 +23,7 @@ #include #include -#include "driver/opengl/OpenGLDriver.h" +#include "opengl/OpenGLDriver.h" #include diff --git a/filament/src/driver/opengl/PlatformGLX.h b/filament/backend/src/opengl/PlatformGLX.h similarity index 96% rename from filament/src/driver/opengl/PlatformGLX.h rename to filament/backend/src/opengl/PlatformGLX.h index 8eecfcc9b5..c4eb8c6328 100644 --- a/filament/src/driver/opengl/PlatformGLX.h +++ b/filament/backend/src/opengl/PlatformGLX.h @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include namespace filament { diff --git a/filament/src/driver/opengl/PlatformWGL.cpp b/filament/backend/src/opengl/PlatformWGL.cpp similarity index 95% rename from filament/src/driver/opengl/PlatformWGL.cpp rename to filament/backend/src/opengl/PlatformWGL.cpp index 87573b333b..6ab35ca5e5 100644 --- a/filament/src/driver/opengl/PlatformWGL.cpp +++ b/filament/backend/src/opengl/PlatformWGL.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "driver/opengl/PlatformWGL.h" +#include "opengl/PlatformWGL.h" #include -#include "driver/opengl/OpenGLDriver.h" +#include "opengl/OpenGLDriver.h" #include "Windows.h" #include diff --git a/filament/src/driver/opengl/PlatformWGL.h b/filament/backend/src/opengl/PlatformWGL.h similarity index 94% rename from filament/src/driver/opengl/PlatformWGL.h rename to filament/backend/src/opengl/PlatformWGL.h index a56cc97292..c03a3b4fa4 100644 --- a/filament/src/driver/opengl/PlatformWGL.h +++ b/filament/backend/src/opengl/PlatformWGL.h @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include namespace filament { diff --git a/filament/src/driver/opengl/PlatformWebGL.cpp b/filament/backend/src/opengl/PlatformWebGL.cpp similarity index 95% rename from filament/src/driver/opengl/PlatformWebGL.cpp rename to filament/backend/src/opengl/PlatformWebGL.cpp index eb8e19b834..46bf40cb1b 100644 --- a/filament/src/driver/opengl/PlatformWebGL.cpp +++ b/filament/backend/src/opengl/PlatformWebGL.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "driver/opengl/PlatformWebGL.h" -#include "driver/opengl/OpenGLDriver.h" +#include "opengl/PlatformWebGL.h" +#include "opengl/OpenGLDriver.h" namespace filament { diff --git a/filament/src/driver/opengl/PlatformWebGL.h b/filament/backend/src/opengl/PlatformWebGL.h similarity index 96% rename from filament/src/driver/opengl/PlatformWebGL.h rename to filament/backend/src/opengl/PlatformWebGL.h index c7963ebd9b..6809e88ab7 100644 --- a/filament/src/driver/opengl/PlatformWebGL.h +++ b/filament/backend/src/opengl/PlatformWebGL.h @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/filament/src/driver/opengl/gl_headers.cpp b/filament/backend/src/opengl/gl_headers.cpp similarity index 100% rename from filament/src/driver/opengl/gl_headers.cpp rename to filament/backend/src/opengl/gl_headers.cpp diff --git a/filament/src/driver/opengl/gl_headers.h b/filament/backend/src/opengl/gl_headers.h similarity index 98% rename from filament/src/driver/opengl/gl_headers.h rename to filament/backend/src/opengl/gl_headers.h index 151ec29184..f8496805e3 100644 --- a/filament/src/driver/opengl/gl_headers.h +++ b/filament/backend/src/opengl/gl_headers.h @@ -80,7 +80,7 @@ #define GL_TEXTURE_EXTERNAL_OES 0x8D65 #endif -#include "driver/opengl/NullGLES.h" +#include "opengl/NullGLES.h" #if (!defined(GL_ES_VERSION_3_1) && !defined(GL_VERSION_4_1)) #error "Minimum header version must be OpenGL ES 3.1 or OpenGL 4.1" diff --git a/filament/src/driver/vulkan/PlatformVkAndroid.cpp b/filament/backend/src/vulkan/PlatformVkAndroid.cpp similarity index 97% rename from filament/src/driver/vulkan/PlatformVkAndroid.cpp rename to filament/backend/src/vulkan/PlatformVkAndroid.cpp index 00efcb7725..130a5330fa 100644 --- a/filament/src/driver/vulkan/PlatformVkAndroid.cpp +++ b/filament/backend/src/vulkan/PlatformVkAndroid.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/vulkan/PlatformVkAndroid.h" +#include "vulkan/PlatformVkAndroid.h" #include "VulkanDriver.h" diff --git a/filament/src/driver/vulkan/PlatformVkAndroid.h b/filament/backend/src/vulkan/PlatformVkAndroid.h similarity index 93% rename from filament/src/driver/vulkan/PlatformVkAndroid.h rename to filament/backend/src/vulkan/PlatformVkAndroid.h index 90e4976a2f..fead09c493 100644 --- a/filament/src/driver/vulkan/PlatformVkAndroid.h +++ b/filament/backend/src/vulkan/PlatformVkAndroid.h @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include namespace filament { diff --git a/filament/src/driver/vulkan/PlatformVkCocoa.h b/filament/backend/src/vulkan/PlatformVkCocoa.h similarity index 93% rename from filament/src/driver/vulkan/PlatformVkCocoa.h rename to filament/backend/src/vulkan/PlatformVkCocoa.h index 57e78eb6b0..1e2144b73d 100644 --- a/filament/src/driver/vulkan/PlatformVkCocoa.h +++ b/filament/backend/src/vulkan/PlatformVkCocoa.h @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include namespace filament { diff --git a/filament/src/driver/vulkan/PlatformVkCocoa.mm b/filament/backend/src/vulkan/PlatformVkCocoa.mm similarity index 98% rename from filament/src/driver/vulkan/PlatformVkCocoa.mm rename to filament/backend/src/vulkan/PlatformVkCocoa.mm index 002be8ac82..4f15e61334 100644 --- a/filament/src/driver/vulkan/PlatformVkCocoa.mm +++ b/filament/backend/src/vulkan/PlatformVkCocoa.mm @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/vulkan/PlatformVkCocoa.h" +#include "vulkan/PlatformVkCocoa.h" #include "VulkanDriver.h" diff --git a/filament/src/driver/vulkan/PlatformVkCocoaTouch.h b/filament/backend/src/vulkan/PlatformVkCocoaTouch.h similarity index 97% rename from filament/src/driver/vulkan/PlatformVkCocoaTouch.h rename to filament/backend/src/vulkan/PlatformVkCocoaTouch.h index 577ac9f13a..2107e33302 100644 --- a/filament/src/driver/vulkan/PlatformVkCocoaTouch.h +++ b/filament/backend/src/vulkan/PlatformVkCocoaTouch.h @@ -20,7 +20,7 @@ #include #include -#include +#include namespace filament { diff --git a/filament/src/driver/vulkan/PlatformVkCocoaTouch.mm b/filament/backend/src/vulkan/PlatformVkCocoaTouch.mm similarity index 98% rename from filament/src/driver/vulkan/PlatformVkCocoaTouch.mm rename to filament/backend/src/vulkan/PlatformVkCocoaTouch.mm index b61fac5500..eb3e2a2198 100644 --- a/filament/src/driver/vulkan/PlatformVkCocoaTouch.mm +++ b/filament/backend/src/vulkan/PlatformVkCocoaTouch.mm @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/vulkan/PlatformVkCocoaTouch.h" +#include "vulkan/PlatformVkCocoaTouch.h" #include "VulkanDriver.h" diff --git a/filament/src/driver/vulkan/PlatformVkLinux.cpp b/filament/backend/src/vulkan/PlatformVkLinux.cpp similarity index 98% rename from filament/src/driver/vulkan/PlatformVkLinux.cpp rename to filament/backend/src/vulkan/PlatformVkLinux.cpp index 50d2440da5..90fb364846 100644 --- a/filament/src/driver/vulkan/PlatformVkLinux.cpp +++ b/filament/backend/src/vulkan/PlatformVkLinux.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/vulkan/PlatformVkLinux.h" +#include "vulkan/PlatformVkLinux.h" #include "VulkanDriver.h" diff --git a/filament/src/driver/vulkan/PlatformVkLinux.h b/filament/backend/src/vulkan/PlatformVkLinux.h similarity index 94% rename from filament/src/driver/vulkan/PlatformVkLinux.h rename to filament/backend/src/vulkan/PlatformVkLinux.h index 8b21432545..97b0047645 100644 --- a/filament/src/driver/vulkan/PlatformVkLinux.h +++ b/filament/backend/src/vulkan/PlatformVkLinux.h @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include #include diff --git a/filament/src/driver/vulkan/PlatformVkWindows.cpp b/filament/backend/src/vulkan/PlatformVkWindows.cpp similarity index 97% rename from filament/src/driver/vulkan/PlatformVkWindows.cpp rename to filament/backend/src/vulkan/PlatformVkWindows.cpp index d53cea814f..e7a418ba8c 100644 --- a/filament/src/driver/vulkan/PlatformVkWindows.cpp +++ b/filament/backend/src/vulkan/PlatformVkWindows.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/vulkan/PlatformVkWindows.h" +#include "vulkan/PlatformVkWindows.h" #include "VulkanDriver.h" diff --git a/filament/src/driver/vulkan/PlatformVkWindows.h b/filament/backend/src/vulkan/PlatformVkWindows.h similarity index 93% rename from filament/src/driver/vulkan/PlatformVkWindows.h rename to filament/backend/src/vulkan/PlatformVkWindows.h index 3d63c9262c..4de125e462 100644 --- a/filament/src/driver/vulkan/PlatformVkWindows.h +++ b/filament/backend/src/vulkan/PlatformVkWindows.h @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include namespace filament { diff --git a/filament/src/driver/vulkan/VulkanBinder.cpp b/filament/backend/src/vulkan/VulkanBinder.cpp similarity index 99% rename from filament/src/driver/vulkan/VulkanBinder.cpp rename to filament/backend/src/vulkan/VulkanBinder.cpp index 4683d22750..db0c828d80 100644 --- a/filament/src/driver/vulkan/VulkanBinder.cpp +++ b/filament/backend/src/vulkan/VulkanBinder.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/vulkan/VulkanBinder.h" +#include "vulkan/VulkanBinder.h" #include #include diff --git a/filament/src/driver/vulkan/VulkanBinder.h b/filament/backend/src/vulkan/VulkanBinder.h similarity index 100% rename from filament/src/driver/vulkan/VulkanBinder.h rename to filament/backend/src/vulkan/VulkanBinder.h diff --git a/filament/src/driver/vulkan/VulkanBuffer.cpp b/filament/backend/src/vulkan/VulkanBuffer.cpp similarity index 98% rename from filament/src/driver/vulkan/VulkanBuffer.cpp rename to filament/backend/src/vulkan/VulkanBuffer.cpp index 0f3c6c91d0..b3c54f4630 100644 --- a/filament/src/driver/vulkan/VulkanBuffer.cpp +++ b/filament/backend/src/vulkan/VulkanBuffer.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/vulkan/VulkanBuffer.h" +#include "vulkan/VulkanBuffer.h" #include diff --git a/filament/src/driver/vulkan/VulkanBuffer.h b/filament/backend/src/vulkan/VulkanBuffer.h similarity index 100% rename from filament/src/driver/vulkan/VulkanBuffer.h rename to filament/backend/src/vulkan/VulkanBuffer.h diff --git a/filament/src/driver/vulkan/VulkanContext.cpp b/filament/backend/src/vulkan/VulkanContext.cpp similarity index 100% rename from filament/src/driver/vulkan/VulkanContext.cpp rename to filament/backend/src/vulkan/VulkanContext.cpp diff --git a/filament/src/driver/vulkan/VulkanContext.h b/filament/backend/src/vulkan/VulkanContext.h similarity index 99% rename from filament/src/driver/vulkan/VulkanContext.h rename to filament/backend/src/vulkan/VulkanContext.h index 793b0264de..1ba757bfe6 100644 --- a/filament/src/driver/vulkan/VulkanContext.h +++ b/filament/backend/src/vulkan/VulkanContext.h @@ -20,7 +20,7 @@ #include "VulkanBinder.h" #include "VulkanDisposer.h" -#include +#include #include diff --git a/filament/src/driver/vulkan/VulkanDisposer.cpp b/filament/backend/src/vulkan/VulkanDisposer.cpp similarity index 97% rename from filament/src/driver/vulkan/VulkanDisposer.cpp rename to filament/backend/src/vulkan/VulkanDisposer.cpp index 5b70c79c1a..67fc4d8258 100644 --- a/filament/src/driver/vulkan/VulkanDisposer.cpp +++ b/filament/backend/src/vulkan/VulkanDisposer.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/vulkan/VulkanDisposer.h" +#include "vulkan/VulkanDisposer.h" namespace filament { namespace driver { diff --git a/filament/src/driver/vulkan/VulkanDisposer.h b/filament/backend/src/vulkan/VulkanDisposer.h similarity index 100% rename from filament/src/driver/vulkan/VulkanDisposer.h rename to filament/backend/src/vulkan/VulkanDisposer.h diff --git a/filament/src/driver/vulkan/VulkanDriver.cpp b/filament/backend/src/vulkan/VulkanDriver.cpp similarity index 99% rename from filament/src/driver/vulkan/VulkanDriver.cpp rename to filament/backend/src/vulkan/VulkanDriver.cpp index f449eb8e51..8e71f66f06 100644 --- a/filament/src/driver/vulkan/VulkanDriver.cpp +++ b/filament/backend/src/vulkan/VulkanDriver.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "driver/vulkan/VulkanDriver.h" +#include "vulkan/VulkanDriver.h" -#include "driver/CommandStreamDispatcher.h" +#include "CommandStreamDispatcher.h" #include "VulkanBuffer.h" #include "VulkanHandles.h" diff --git a/filament/src/driver/vulkan/VulkanDriver.h b/filament/backend/src/vulkan/VulkanDriver.h similarity index 97% rename from filament/src/driver/vulkan/VulkanDriver.h rename to filament/backend/src/vulkan/VulkanDriver.h index 52d410ad21..b8ed47192f 100644 --- a/filament/src/driver/vulkan/VulkanDriver.h +++ b/filament/backend/src/vulkan/VulkanDriver.h @@ -25,8 +25,8 @@ #include "VulkanStagePool.h" #include "VulkanUtility.h" -#include "driver/Driver.h" -#include "driver/DriverBase.h" +#include "private/backend/Driver.h" +#include "private/backend/DriverBase.h" #include #include @@ -71,7 +71,7 @@ private: RetType methodName##S() noexcept override; \ UTILS_ALWAYS_INLINE void methodName##R(RetType, paramsDecl); -#include "driver/DriverAPI.inc" +#include "private/backend/DriverAPI.inc" VulkanDriver(VulkanDriver const&) = delete; VulkanDriver& operator = (VulkanDriver const&) = delete; diff --git a/filament/src/driver/vulkan/VulkanFboCache.cpp b/filament/backend/src/vulkan/VulkanFboCache.cpp similarity index 99% rename from filament/src/driver/vulkan/VulkanFboCache.cpp rename to filament/backend/src/vulkan/VulkanFboCache.cpp index 350db37590..e10a51692f 100644 --- a/filament/src/driver/vulkan/VulkanFboCache.cpp +++ b/filament/backend/src/vulkan/VulkanFboCache.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/vulkan/VulkanFboCache.h" +#include "vulkan/VulkanFboCache.h" #include diff --git a/filament/src/driver/vulkan/VulkanFboCache.h b/filament/backend/src/vulkan/VulkanFboCache.h similarity index 100% rename from filament/src/driver/vulkan/VulkanFboCache.h rename to filament/backend/src/vulkan/VulkanFboCache.h diff --git a/filament/src/driver/vulkan/VulkanHandles.cpp b/filament/backend/src/vulkan/VulkanHandles.cpp similarity index 99% rename from filament/src/driver/vulkan/VulkanHandles.cpp rename to filament/backend/src/vulkan/VulkanHandles.cpp index 6fe855b944..07f8f7b216 100644 --- a/filament/src/driver/vulkan/VulkanHandles.cpp +++ b/filament/backend/src/vulkan/VulkanHandles.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "driver/vulkan/VulkanHandles.h" +#include "vulkan/VulkanHandles.h" #include -#include "driver/DataReshaper.h" +#include "DataReshaper.h" #include diff --git a/filament/src/driver/vulkan/VulkanHandles.h b/filament/backend/src/vulkan/VulkanHandles.h similarity index 100% rename from filament/src/driver/vulkan/VulkanHandles.h rename to filament/backend/src/vulkan/VulkanHandles.h diff --git a/filament/src/driver/vulkan/VulkanSamplerCache.cpp b/filament/backend/src/vulkan/VulkanSamplerCache.cpp similarity index 99% rename from filament/src/driver/vulkan/VulkanSamplerCache.cpp rename to filament/backend/src/vulkan/VulkanSamplerCache.cpp index 051f00f001..753d8addca 100644 --- a/filament/src/driver/vulkan/VulkanSamplerCache.cpp +++ b/filament/backend/src/vulkan/VulkanSamplerCache.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/vulkan/VulkanSamplerCache.h" +#include "vulkan/VulkanSamplerCache.h" #include diff --git a/filament/src/driver/vulkan/VulkanSamplerCache.h b/filament/backend/src/vulkan/VulkanSamplerCache.h similarity index 100% rename from filament/src/driver/vulkan/VulkanSamplerCache.h rename to filament/backend/src/vulkan/VulkanSamplerCache.h diff --git a/filament/src/driver/vulkan/VulkanStagePool.cpp b/filament/backend/src/vulkan/VulkanStagePool.cpp similarity index 98% rename from filament/src/driver/vulkan/VulkanStagePool.cpp rename to filament/backend/src/vulkan/VulkanStagePool.cpp index 4ced5ec218..ccce093b19 100644 --- a/filament/src/driver/vulkan/VulkanStagePool.cpp +++ b/filament/backend/src/vulkan/VulkanStagePool.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "driver/vulkan/VulkanStagePool.h" +#include "vulkan/VulkanStagePool.h" #include diff --git a/filament/src/driver/vulkan/VulkanStagePool.h b/filament/backend/src/vulkan/VulkanStagePool.h similarity index 100% rename from filament/src/driver/vulkan/VulkanStagePool.h rename to filament/backend/src/vulkan/VulkanStagePool.h diff --git a/filament/src/driver/vulkan/VulkanUtility.cpp b/filament/backend/src/vulkan/VulkanUtility.cpp similarity index 100% rename from filament/src/driver/vulkan/VulkanUtility.cpp rename to filament/backend/src/vulkan/VulkanUtility.cpp diff --git a/filament/src/driver/vulkan/VulkanUtility.h b/filament/backend/src/vulkan/VulkanUtility.h similarity index 96% rename from filament/src/driver/vulkan/VulkanUtility.h rename to filament/backend/src/vulkan/VulkanUtility.h index 4d79813fb1..60de985481 100644 --- a/filament/src/driver/vulkan/VulkanUtility.h +++ b/filament/backend/src/vulkan/VulkanUtility.h @@ -17,7 +17,7 @@ #ifndef TNT_FILAMENT_DRIVER_VULKANUTILITY_H #define TNT_FILAMENT_DRIVER_VULKANUTILITY_H -#include +#include #include diff --git a/filament/include/filament/Engine.h b/filament/include/filament/Engine.h index f662e1d861..6d4844c0fd 100644 --- a/filament/include/filament/Engine.h +++ b/filament/include/filament/Engine.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/filament/include/filament/Fence.h b/filament/include/filament/Fence.h index f908a97278..ba84ed2c04 100644 --- a/filament/include/filament/Fence.h +++ b/filament/include/filament/Fence.h @@ -21,7 +21,7 @@ #include -#include +#include #include diff --git a/filament/include/filament/IndexBuffer.h b/filament/include/filament/IndexBuffer.h index 9d99cb96ff..7162d66347 100644 --- a/filament/include/filament/IndexBuffer.h +++ b/filament/include/filament/IndexBuffer.h @@ -21,8 +21,9 @@ #include -#include -#include +#include + +#include #include diff --git a/filament/include/filament/Material.h b/filament/include/filament/Material.h index 2decd1c31f..d1c573fe7d 100644 --- a/filament/include/filament/Material.h +++ b/filament/include/filament/Material.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/filament/include/filament/Stream.h b/filament/include/filament/Stream.h index d4650c77a4..cbcce8743b 100644 --- a/filament/include/filament/Stream.h +++ b/filament/include/filament/Stream.h @@ -19,8 +19,9 @@ #include -#include -#include +#include + +#include #include diff --git a/filament/include/filament/SwapChain.h b/filament/include/filament/SwapChain.h index d03ae9f011..b12d6c8574 100644 --- a/filament/include/filament/SwapChain.h +++ b/filament/include/filament/SwapChain.h @@ -18,7 +18,7 @@ #define TNT_FILAMENT_SWAPCHAIN_H #include -#include +#include #include diff --git a/filament/include/filament/Texture.h b/filament/include/filament/Texture.h index da30a3d6c9..6a00b2b13d 100644 --- a/filament/include/filament/Texture.h +++ b/filament/include/filament/Texture.h @@ -20,8 +20,8 @@ #define TNT_FILAMENT_TEXTURE_H #include -#include -#include +#include +#include #include diff --git a/filament/include/filament/TextureSampler.h b/filament/include/filament/TextureSampler.h index 24c91d3283..371022dfc8 100644 --- a/filament/include/filament/TextureSampler.h +++ b/filament/include/filament/TextureSampler.h @@ -19,7 +19,7 @@ #ifndef TNT_FILAMENT_TEXTURESAMPLER_H #define TNT_FILAMENT_TEXTURESAMPLER_H -#include +#include #include diff --git a/filament/include/filament/VertexBuffer.h b/filament/include/filament/VertexBuffer.h index bf2ba6c054..7e8cf2cd80 100644 --- a/filament/include/filament/VertexBuffer.h +++ b/filament/include/filament/VertexBuffer.h @@ -22,8 +22,9 @@ #include #include -#include -#include +#include + +#include #include diff --git a/filament/include/filament/View.h b/filament/include/filament/View.h index ab71057647..bb726558b4 100644 --- a/filament/include/filament/View.h +++ b/filament/include/filament/View.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include diff --git a/filament/include/filament/Viewport.h b/filament/include/filament/Viewport.h index 7b3a7b3460..f4046fde52 100644 --- a/filament/include/filament/Viewport.h +++ b/filament/include/filament/Viewport.h @@ -19,7 +19,7 @@ #ifndef TNT_FILAMENT_VIEWPORT_H #define TNT_FILAMENT_VIEWPORT_H -#include +#include #include diff --git a/filament/src/Engine.cpp b/filament/src/Engine.cpp index a075fc505f..352d215707 100644 --- a/filament/src/Engine.cpp +++ b/filament/src/Engine.cpp @@ -31,7 +31,8 @@ #include "details/SwapChain.h" #include "details/Texture.h" #include "details/View.h" -#include "driver/Program.h" + +#include "private/backend/Program.h" #include @@ -39,6 +40,7 @@ #include #include + #include #include diff --git a/filament/src/Material.cpp b/filament/src/Material.cpp index 03b418227d..4875e3d96e 100644 --- a/filament/src/Material.cpp +++ b/filament/src/Material.cpp @@ -18,11 +18,12 @@ #include "details/Engine.h" #include "details/DFG.h" -#include "driver/Program.h" + +#include "private/backend/Program.h" #include "FilamentAPI-impl.h" -#include +#include #include #include diff --git a/filament/src/MaterialParser.h b/filament/src/MaterialParser.h index 9019b55572..573bb14f88 100644 --- a/filament/src/MaterialParser.h +++ b/filament/src/MaterialParser.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/filament/src/PostProcessManager.h b/filament/src/PostProcessManager.h index a6e1821db1..51a6d9a45e 100644 --- a/filament/src/PostProcessManager.h +++ b/filament/src/PostProcessManager.h @@ -19,11 +19,11 @@ #include "UniformBuffer.h" -#include "driver/DriverApiForward.h" +#include "private/backend/DriverApiForward.h" #include "fg/FrameGraphResource.h" -#include +#include namespace filament { diff --git a/filament/src/RenderPass.h b/filament/src/RenderPass.h index d12aabaafe..f6b3aafddc 100644 --- a/filament/src/RenderPass.h +++ b/filament/src/RenderPass.h @@ -23,7 +23,7 @@ #include "details/Material.h" #include "details/Scene.h" -#include "driver/DriverApiForward.h" +#include "private/backend/DriverApiForward.h" #include diff --git a/filament/src/Renderer.cpp b/filament/src/Renderer.cpp index f55885be09..6fdeb5684a 100644 --- a/filament/src/Renderer.cpp +++ b/filament/src/Renderer.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include "fg/FrameGraph.h" #include "fg/FrameGraphResource.h" diff --git a/filament/src/ShadowMap.cpp b/filament/src/ShadowMap.cpp index 96adbf7dad..dbbe30fb58 100644 --- a/filament/src/ShadowMap.cpp +++ b/filament/src/ShadowMap.cpp @@ -24,7 +24,7 @@ #include -#include +#include #include diff --git a/filament/src/Skybox.cpp b/filament/src/Skybox.cpp index 0b5ca6a75a..db66d2a8d1 100644 --- a/filament/src/Skybox.cpp +++ b/filament/src/Skybox.cpp @@ -26,7 +26,7 @@ #include "FilamentAPI-impl.h" #include -#include +#include #include diff --git a/filament/src/Stream.cpp b/filament/src/Stream.cpp index 82b59655a5..78adb9d751 100644 --- a/filament/src/Stream.cpp +++ b/filament/src/Stream.cpp @@ -21,7 +21,7 @@ #include "FilamentAPI-impl.h" -#include +#include #include #include diff --git a/filament/src/UniformBuffer.h b/filament/src/UniformBuffer.h index 3444383b92..5ae30857fd 100644 --- a/filament/src/UniformBuffer.h +++ b/filament/src/UniformBuffer.h @@ -19,12 +19,12 @@ #include -#include "driver/DriverApi.h" +#include "private/backend/DriverApi.h" #include #include -#include +#include #include #include diff --git a/filament/src/components/LightManager.h b/filament/src/components/LightManager.h index b8202b7737..4dc8df05db 100644 --- a/filament/src/components/LightManager.h +++ b/filament/src/components/LightManager.h @@ -19,7 +19,7 @@ #include "upcast.h" -#include "driver/DriverApiForward.h" +#include "private/backend/DriverApiForward.h" #include diff --git a/filament/src/components/RenderableManager.cpp b/filament/src/components/RenderableManager.cpp index 0263e18561..d920ff1290 100644 --- a/filament/src/components/RenderableManager.cpp +++ b/filament/src/components/RenderableManager.cpp @@ -24,7 +24,7 @@ #include "details/Material.h" #include "details/RenderPrimitive.h" -#include +#include #include #include diff --git a/filament/src/components/RenderableManager.h b/filament/src/components/RenderableManager.h index a2f6e7b0c5..efdbdcf2bc 100644 --- a/filament/src/components/RenderableManager.h +++ b/filament/src/components/RenderableManager.h @@ -21,8 +21,8 @@ #include "UniformBuffer.h" -#include "driver/DriverApiForward.h" -#include "driver/Handle.h" +#include "private/backend/DriverApiForward.h" +#include "private/backend/Handle.h" #include #include diff --git a/filament/src/details/DFG.h b/filament/src/details/DFG.h index 8f10f056e2..e31ede6ac5 100644 --- a/filament/src/details/DFG.h +++ b/filament/src/details/DFG.h @@ -19,7 +19,7 @@ #include "details/Texture.h" -#include "driver/Handle.h" +#include "private/backend/Handle.h" #include diff --git a/filament/src/details/Engine.h b/filament/src/details/Engine.h index 744e3cf2d2..997cb7db92 100644 --- a/filament/src/details/Engine.h +++ b/filament/src/details/Engine.h @@ -31,9 +31,9 @@ #include "details/ResourceList.h" #include "details/Skybox.h" -#include "driver/CommandStream.h" -#include "driver/CommandBufferQueue.h" -#include "driver/DriverApi.h" +#include "private/backend/CommandStream.h" +#include "private/backend/CommandBufferQueue.h" +#include "private/backend/DriverApi.h" #include #include diff --git a/filament/src/details/Fence.h b/filament/src/details/Fence.h index dccca37bcc..4ca8d8bd23 100644 --- a/filament/src/details/Fence.h +++ b/filament/src/details/Fence.h @@ -19,7 +19,7 @@ #include "upcast.h" -#include "driver/DriverBase.h" +#include "private/backend/DriverBase.h" #include diff --git a/filament/src/details/Froxelizer.h b/filament/src/details/Froxelizer.h index 005323f0b4..3592c6fa8f 100644 --- a/filament/src/details/Froxelizer.h +++ b/filament/src/details/Froxelizer.h @@ -23,8 +23,8 @@ #include "details/Scene.h" #include "details/Engine.h" -#include "driver/Handle.h" -#include "driver/GPUBuffer.h" +#include "private/backend/Handle.h" +#include "private/backend/GPUBuffer.h" #include diff --git a/filament/src/details/IndexBuffer.h b/filament/src/details/IndexBuffer.h index a67ce85d93..e500d1eb6a 100644 --- a/filament/src/details/IndexBuffer.h +++ b/filament/src/details/IndexBuffer.h @@ -19,7 +19,7 @@ #include "upcast.h" -#include "driver/Handle.h" +#include "private/backend/Handle.h" #include diff --git a/filament/src/details/IndirectLight.h b/filament/src/details/IndirectLight.h index 56f917aa76..8e5b683c4d 100644 --- a/filament/src/details/IndirectLight.h +++ b/filament/src/details/IndirectLight.h @@ -19,7 +19,7 @@ #include "upcast.h" -#include "driver/Handle.h" +#include "private/backend/Handle.h" #include diff --git a/filament/src/details/MaterialInstance.h b/filament/src/details/MaterialInstance.h index c0dd40a156..2c6cc6c39e 100644 --- a/filament/src/details/MaterialInstance.h +++ b/filament/src/details/MaterialInstance.h @@ -20,8 +20,9 @@ #include "upcast.h" #include "UniformBuffer.h" #include "details/Engine.h" -#include "driver/DriverApi.h" -#include "driver/Handle.h" + +#include "private/backend/DriverApi.h" +#include "private/backend/Handle.h" #include diff --git a/filament/src/details/RenderPrimitive.h b/filament/src/details/RenderPrimitive.h index 4f9b168814..508a3346f4 100644 --- a/filament/src/details/RenderPrimitive.h +++ b/filament/src/details/RenderPrimitive.h @@ -21,7 +21,7 @@ #include "details/MaterialInstance.h" -#include "driver/Handle.h" +#include "private/backend/Handle.h" #include diff --git a/filament/src/details/Renderer.h b/filament/src/details/Renderer.h index f9d36ef809..b912d4b7b1 100644 --- a/filament/src/details/Renderer.h +++ b/filament/src/details/Renderer.h @@ -26,11 +26,11 @@ #include "details/FrameSkipper.h" #include "details/SwapChain.h" -#include "driver/DriverApiForward.h" -#include "driver/Handle.h" +#include "private/backend/DriverApiForward.h" +#include "private/backend/Handle.h" #include -#include +#include #include #include diff --git a/filament/src/details/ShadowMap.h b/filament/src/details/ShadowMap.h index 1c942598fe..501561297d 100644 --- a/filament/src/details/ShadowMap.h +++ b/filament/src/details/ShadowMap.h @@ -22,8 +22,8 @@ #include "details/Camera.h" #include "details/Scene.h" -#include "driver/DriverApiForward.h" -#include "driver/SamplerGroup.h" +#include "private/backend/DriverApiForward.h" +#include "private/backend/SamplerGroup.h" #include diff --git a/filament/src/details/Skybox.h b/filament/src/details/Skybox.h index 62db032b13..f9107f4711 100644 --- a/filament/src/details/Skybox.h +++ b/filament/src/details/Skybox.h @@ -16,13 +16,13 @@ #include "upcast.h" -#include "driver/Handle.h" +#include "private/backend/Handle.h" #include #include -#include +#include #include #include diff --git a/filament/src/details/Stream.h b/filament/src/details/Stream.h index bf84f18648..eb0099c0be 100644 --- a/filament/src/details/Stream.h +++ b/filament/src/details/Stream.h @@ -19,7 +19,7 @@ #include "upcast.h" -#include "driver/DriverBase.h" +#include "private/backend/DriverBase.h" #include diff --git a/filament/src/details/SwapChain.h b/filament/src/details/SwapChain.h index 9fbdd359e4..a54b2314bc 100644 --- a/filament/src/details/SwapChain.h +++ b/filament/src/details/SwapChain.h @@ -19,7 +19,7 @@ #include "upcast.h" -#include "driver/DriverApi.h" +#include "private/backend/DriverApi.h" #include diff --git a/filament/src/details/Texture.h b/filament/src/details/Texture.h index dc9fc80fab..3bec951aa6 100644 --- a/filament/src/details/Texture.h +++ b/filament/src/details/Texture.h @@ -19,7 +19,7 @@ #include "upcast.h" -#include "driver/Handle.h" +#include "private/backend/Handle.h" #include diff --git a/filament/src/details/VertexBuffer.h b/filament/src/details/VertexBuffer.h index 7af806a22d..8cb040ded1 100644 --- a/filament/src/details/VertexBuffer.h +++ b/filament/src/details/VertexBuffer.h @@ -19,8 +19,8 @@ #include "upcast.h" -#include "driver/Driver.h" -#include "driver/Handle.h" +#include "private/backend/Driver.h" +#include "private/backend/Handle.h" #include #include diff --git a/filament/src/details/View.h b/filament/src/details/View.h index e8768fae26..55048c219c 100644 --- a/filament/src/details/View.h +++ b/filament/src/details/View.h @@ -29,8 +29,8 @@ #include "details/ShadowMap.h" #include "details/Scene.h" -#include "driver/DriverApi.h" -#include "driver/Handle.h" +#include "private/backend/DriverApi.h" +#include "private/backend/Handle.h" #include #include diff --git a/filament/src/fg/FrameGraph.cpp b/filament/src/fg/FrameGraph.cpp index 68c6a2aaa6..d7a29b64d3 100644 --- a/filament/src/fg/FrameGraph.cpp +++ b/filament/src/fg/FrameGraph.cpp @@ -18,12 +18,13 @@ #include "FrameGraphPassResources.h" -#include "driver/Driver.h" -#include "driver/Handle.h" -#include "driver/CommandStream.h" +#include "private/backend/Driver.h" +#include "private/backend/Handle.h" +#include "private/backend/CommandStream.h" + #include "FrameGraphResource.h" -#include +#include #include #include diff --git a/filament/src/fg/FrameGraph.h b/filament/src/fg/FrameGraph.h index 1df8b83b5a..a9c407ffa0 100644 --- a/filament/src/fg/FrameGraph.h +++ b/filament/src/fg/FrameGraph.h @@ -24,9 +24,9 @@ #include "details/Allocators.h" -#include "driver/DriverApiForward.h" +#include "private/backend/DriverApiForward.h" -#include +#include #include diff --git a/filament/src/fg/FrameGraphPass.h b/filament/src/fg/FrameGraphPass.h index 0e2aba5d9b..ad60e80649 100644 --- a/filament/src/fg/FrameGraphPass.h +++ b/filament/src/fg/FrameGraphPass.h @@ -17,7 +17,7 @@ #ifndef TNT_FILAMENT_FRAMEGRAPHPASS_H #define TNT_FILAMENT_FRAMEGRAPHPASS_H -#include "driver/DriverApiForward.h" +#include "private/backend/DriverApiForward.h" #include diff --git a/filament/src/fg/FrameGraphPassResources.h b/filament/src/fg/FrameGraphPassResources.h index b36ffb666b..b90d9a3fbd 100644 --- a/filament/src/fg/FrameGraphPassResources.h +++ b/filament/src/fg/FrameGraphPassResources.h @@ -19,9 +19,9 @@ #include "FrameGraphResource.h" -#include +#include -#include "driver/Handle.h" +#include "private/backend//Handle.h" namespace filament { diff --git a/filament/src/fg/FrameGraphResource.h b/filament/src/fg/FrameGraphResource.h index 7475a9f8fa..c0d04b96ad 100644 --- a/filament/src/fg/FrameGraphResource.h +++ b/filament/src/fg/FrameGraphResource.h @@ -17,7 +17,7 @@ #ifndef TNT_FILAMENT_FRAMEGRAPHRESOURCE_H #define TNT_FILAMENT_FRAMEGRAPHRESOURCE_H -#include +#include #include #include diff --git a/filament/test/filament_framegraph_test.cpp b/filament/test/filament_framegraph_test.cpp index 8e667957e0..7ca13c6cd4 100644 --- a/filament/test/filament_framegraph_test.cpp +++ b/filament/test/filament_framegraph_test.cpp @@ -19,8 +19,8 @@ #include "fg/FrameGraph.h" #include "fg/FrameGraphPassResources.h" -#include "driver/CommandStream.h" -#include "driver/noop/NoopDriver.h" +#include "private/backend/CommandStream.h" +#include "../backend/src/noop/NoopDriver.h" using namespace filament; using namespace driver; diff --git a/libs/filabridge/include/filament/driver/DriverEnums.h b/libs/filabridge/include/filament/backend/DriverEnums.h similarity index 100% rename from libs/filabridge/include/filament/driver/DriverEnums.h rename to libs/filabridge/include/filament/backend/DriverEnums.h diff --git a/libs/filabridge/include/private/filament/SamplerInterfaceBlock.h b/libs/filabridge/include/private/filament/SamplerInterfaceBlock.h index 5da62f8ebd..20f7e376c7 100644 --- a/libs/filabridge/include/private/filament/SamplerInterfaceBlock.h +++ b/libs/filabridge/include/private/filament/SamplerInterfaceBlock.h @@ -18,7 +18,7 @@ #define TNT_FILAMENT_SAMPLERINTERFACEBLOCK_H -#include +#include #include #include diff --git a/libs/filabridge/include/private/filament/SibGenerator.h b/libs/filabridge/include/private/filament/SibGenerator.h index 9c729c5954..798c2e3729 100644 --- a/libs/filabridge/include/private/filament/SibGenerator.h +++ b/libs/filabridge/include/private/filament/SibGenerator.h @@ -18,7 +18,7 @@ #define TNT_FILABRIDGE_SIBGENERATOR_H #include -#include +#include #include #include diff --git a/libs/filabridge/include/private/filament/UniformInterfaceBlock.h b/libs/filabridge/include/private/filament/UniformInterfaceBlock.h index 4c759abfb6..26227a6ac7 100644 --- a/libs/filabridge/include/private/filament/UniformInterfaceBlock.h +++ b/libs/filabridge/include/private/filament/UniformInterfaceBlock.h @@ -17,7 +17,7 @@ #ifndef TNT_FILAMENT_DRIVER_UNIFORMINTERFACEBLOCK_H #define TNT_FILAMENT_DRIVER_UNIFORMINTERFACEBLOCK_H -#include +#include #include #include diff --git a/libs/filabridge/src/SibGenerator.cpp b/libs/filabridge/src/SibGenerator.cpp index c30b980695..9b02fcabaf 100644 --- a/libs/filabridge/src/SibGenerator.cpp +++ b/libs/filabridge/src/SibGenerator.cpp @@ -16,7 +16,7 @@ #include "private/filament/SibGenerator.h" -#include +#include #include #include diff --git a/libs/filabridge/src/UibGenerator.cpp b/libs/filabridge/src/UibGenerator.cpp index ce8e6db1b1..9f3e1f9491 100644 --- a/libs/filabridge/src/UibGenerator.cpp +++ b/libs/filabridge/src/UibGenerator.cpp @@ -19,7 +19,7 @@ #include "private/filament/UniformInterfaceBlock.h" #include -#include +#include namespace filament { diff --git a/libs/filamat/include/filamat/MaterialBuilder.h b/libs/filamat/include/filamat/MaterialBuilder.h index 7eef96a763..6547799315 100644 --- a/libs/filamat/include/filamat/MaterialBuilder.h +++ b/libs/filamat/include/filamat/MaterialBuilder.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/libs/filamat/include/filamat/PostprocessMaterialBuilder.h b/libs/filamat/include/filamat/PostprocessMaterialBuilder.h index 0af195c528..e588c91e12 100644 --- a/libs/filamat/include/filamat/PostprocessMaterialBuilder.h +++ b/libs/filamat/include/filamat/PostprocessMaterialBuilder.h @@ -20,7 +20,7 @@ #include #include -#include +#include #include diff --git a/libs/filamat/src/GLSLPostProcessor.h b/libs/filamat/src/GLSLPostProcessor.h index 0802dd6eec..787b6ac91b 100644 --- a/libs/filamat/src/GLSLPostProcessor.h +++ b/libs/filamat/src/GLSLPostProcessor.h @@ -20,7 +20,7 @@ #include #include -#include +#include #include "filamat/MaterialBuilder.h" // for MaterialBuilder:: enums diff --git a/libs/filamat/src/shaders/CodeGenerator.h b/libs/filamat/src/shaders/CodeGenerator.h index 4a60c4370c..6c8734b3c6 100644 --- a/libs/filamat/src/shaders/CodeGenerator.h +++ b/libs/filamat/src/shaders/CodeGenerator.h @@ -25,7 +25,7 @@ #include -#include +#include #include #include #include diff --git a/libs/filamat/src/shaders/MaterialInfo.h b/libs/filamat/src/shaders/MaterialInfo.h index 96af602148..198af56c7a 100644 --- a/libs/filamat/src/shaders/MaterialInfo.h +++ b/libs/filamat/src/shaders/MaterialInfo.h @@ -17,7 +17,7 @@ #ifndef TNT_FILAMAT_MATERIALINFO_H #define TNT_FILAMAT_MATERIALINFO_H -#include +#include #include #include #include diff --git a/samples/app/MeshAssimp.cpp b/samples/app/MeshAssimp.cpp index cd32c0c3c8..5472d5ee98 100644 --- a/samples/app/MeshAssimp.cpp +++ b/samples/app/MeshAssimp.cpp @@ -54,7 +54,7 @@ #include -#include +#include #include "generated/resources/resources.h" diff --git a/samples/frame_generator.cpp b/samples/frame_generator.cpp index 03e7656916..37b0b17748 100644 --- a/samples/frame_generator.cpp +++ b/samples/frame_generator.cpp @@ -27,7 +27,8 @@ #include -#include +#include + #include #include #include diff --git a/tools/matc/src/matc/Config.h b/tools/matc/src/matc/Config.h index d71ce6d44c..e32c49fef3 100644 --- a/tools/matc/src/matc/Config.h +++ b/tools/matc/src/matc/Config.h @@ -18,7 +18,7 @@ #define TNT_CONFIG_H #include -#include +#include #include diff --git a/tools/matinfo/src/main.cpp b/tools/matinfo/src/main.cpp index 441426760e..9ad3b3f766 100644 --- a/tools/matinfo/src/main.cpp +++ b/tools/matinfo/src/main.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include