From f5e5686853bb2f5688240ec8c6116adadfe0f76e Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Thu, 8 Jul 2021 00:27:34 +0200 Subject: [PATCH] Optimize includes in `ThreadLocal.h` --- Source/Editor/Managed/ManagedEditor.Internal.cpp | 1 + Source/Engine/Animations/SceneAnimations/SceneAnimation.cpp | 3 +++ Source/Engine/Audio/AudioClip.cpp | 1 + Source/Engine/Content/Assets/Animation.cpp | 1 + Source/Engine/Content/Assets/AnimationGraph.cpp | 1 + Source/Engine/Content/Assets/AnimationGraphFunction.cpp | 1 + Source/Engine/Content/Assets/Material.cpp | 1 + Source/Engine/Content/Assets/MaterialFunction.cpp | 1 + Source/Engine/Content/Assets/MaterialInstance.cpp | 1 + Source/Engine/Content/Assets/Model.cpp | 1 + Source/Engine/Content/Assets/RawDataAsset.cpp | 3 +++ Source/Engine/Content/Assets/SkinnedModel.cpp | 1 + Source/Engine/Content/BinaryAsset.cpp | 1 + Source/Engine/Content/Cache/AssetsCache.cpp | 1 + Source/Engine/Content/Storage/ContentStorageManager.cpp | 1 + Source/Engine/Content/Storage/FlaxStorage.cpp | 1 + Source/Engine/Content/Storage/FlaxStorage.h | 1 + Source/Engine/Content/Upgraders/SkeletonMaskUpgrader.h | 1 + Source/Engine/Core/Collections/Sorting.cpp | 1 + Source/Engine/Engine/GameplayGlobals.cpp | 1 + Source/Engine/Graphics/Async/GPUTasksContext.cpp | 2 +- Source/Engine/Graphics/Models/Mesh.cpp | 1 + Source/Engine/Graphics/Models/SkinnedMesh.cpp | 1 + Source/Engine/Graphics/RenderTask.cpp | 1 + Source/Engine/GraphicsDevice/Vulkan/GPUBufferVulkan.cpp | 4 ++-- Source/Engine/Level/Actors/AnimatedModel.cpp | 1 + Source/Engine/Particles/ParticleEmitter.cpp | 1 + Source/Engine/Particles/ParticleEmitterFunction.cpp | 1 + Source/Engine/Particles/ParticleSystem.cpp | 1 + Source/Engine/Particles/Particles.cpp | 1 + Source/Engine/Physics/CollisionCooking.cpp | 1 + Source/Engine/Physics/CollisionData.cpp | 1 + Source/Engine/Render2D/Font.cpp | 1 + Source/Engine/Render2D/FontAsset.cpp | 1 + Source/Engine/Render2D/FontManager.cpp | 1 + Source/Engine/Scripting/Script.cpp | 2 +- Source/Engine/ShadowsOfMordor/Builder.Entries.cpp | 1 + Source/Engine/Terrain/TerrainPatch.cpp | 1 + Source/Engine/Threading/MainThreadTask.h | 1 + Source/Engine/Threading/ThreadLocal.h | 2 -- Source/Engine/Tools/MaterialGenerator/MaterialGenerator.cpp | 1 + 41 files changed, 45 insertions(+), 6 deletions(-) diff --git a/Source/Editor/Managed/ManagedEditor.Internal.cpp b/Source/Editor/Managed/ManagedEditor.Internal.cpp index 4f0370b44..fc160f217 100644 --- a/Source/Editor/Managed/ManagedEditor.Internal.cpp +++ b/Source/Editor/Managed/ManagedEditor.Internal.cpp @@ -41,6 +41,7 @@ #include "Engine/Input/Input.h" #include "Engine/Input/Mouse.h" #include "Engine/Input/Keyboard.h" +#include "Engine/Threading/Threading.h" #include "FlaxEngine.Gen.h" #include diff --git a/Source/Engine/Animations/SceneAnimations/SceneAnimation.cpp b/Source/Engine/Animations/SceneAnimations/SceneAnimation.cpp index e3246705a..9518bef8e 100644 --- a/Source/Engine/Animations/SceneAnimations/SceneAnimation.cpp +++ b/Source/Engine/Animations/SceneAnimations/SceneAnimation.cpp @@ -8,6 +8,9 @@ #include "Engine/Serialization/MemoryReadStream.h" #include "Engine/Audio/AudioClip.h" #include "Engine/Graphics/PostProcessSettings.h" +#if USE_EDITOR +#include "Engine/Threading/Threading.h" +#endif REGISTER_BINARY_ASSET(SceneAnimation, "FlaxEngine.SceneAnimation", false); diff --git a/Source/Engine/Audio/AudioClip.cpp b/Source/Engine/Audio/AudioClip.cpp index babe12af4..d045380df 100644 --- a/Source/Engine/Audio/AudioClip.cpp +++ b/Source/Engine/Audio/AudioClip.cpp @@ -12,6 +12,7 @@ #include "Engine/Serialization/MemoryReadStream.h" #include "Engine/Tools/AudioTool/OggVorbisDecoder.h" #include "Engine/Tools/AudioTool/AudioTool.h" +#include "Engine/Threading/Threading.h" REGISTER_BINARY_ASSET_WITH_UPGRADER(AudioClip, "FlaxEngine.AudioClip", AudioClipUpgrader, false); diff --git a/Source/Engine/Content/Assets/Animation.cpp b/Source/Engine/Content/Assets/Animation.cpp index d768eabf0..f45bceae3 100644 --- a/Source/Engine/Content/Assets/Animation.cpp +++ b/Source/Engine/Content/Assets/Animation.cpp @@ -6,6 +6,7 @@ #include "Engine/Profiler/ProfilerCPU.h" #include "Engine/Content/Factories/BinaryAssetFactory.h" #include "Engine/Animations/CurveSerialization.h" +#include "Engine/Threading/Threading.h" #include "Engine/Serialization/MemoryReadStream.h" #if USE_EDITOR #include "Engine/Serialization/MemoryWriteStream.h" diff --git a/Source/Engine/Content/Assets/AnimationGraph.cpp b/Source/Engine/Content/Assets/AnimationGraph.cpp index 7106fb0e0..649b4f19a 100644 --- a/Source/Engine/Content/Assets/AnimationGraph.cpp +++ b/Source/Engine/Content/Assets/AnimationGraph.cpp @@ -8,6 +8,7 @@ #include "Engine/Core/Types/DataContainer.h" #include "Engine/Serialization/MemoryReadStream.h" #include "Engine/Content/Factories/BinaryAssetFactory.h" +#include "Engine/Threading/Threading.h" REGISTER_BINARY_ASSET(AnimationGraph, "FlaxEngine.AnimationGraph", false); diff --git a/Source/Engine/Content/Assets/AnimationGraphFunction.cpp b/Source/Engine/Content/Assets/AnimationGraphFunction.cpp index 69e611cd4..63d3dbfdf 100644 --- a/Source/Engine/Content/Assets/AnimationGraphFunction.cpp +++ b/Source/Engine/Content/Assets/AnimationGraphFunction.cpp @@ -5,6 +5,7 @@ #include "Engine/Core/Types/DataContainer.h" #include "Engine/Serialization/MemoryReadStream.h" #include "Engine/Content/Factories/BinaryAssetFactory.h" +#include "Engine/Threading/Threading.h" REGISTER_BINARY_ASSET(AnimationGraphFunction, "FlaxEngine.AnimationGraphFunction", false); diff --git a/Source/Engine/Content/Assets/Material.cpp b/Source/Engine/Content/Assets/Material.cpp index 2be5a6b61..a78274f9f 100644 --- a/Source/Engine/Content/Assets/Material.cpp +++ b/Source/Engine/Content/Assets/Material.cpp @@ -10,6 +10,7 @@ #include "Engine/Graphics/Shaders/Cache/ShaderCacheManager.h" #include "Engine/Graphics/Shaders/Cache/ShaderStorage.h" #include "Engine/Serialization/MemoryReadStream.h" +#include "Engine/Threading/Threading.h" #if COMPILE_WITH_SHADER_COMPILER #include "MaterialFunction.h" #include "Engine/Serialization/MemoryWriteStream.h" diff --git a/Source/Engine/Content/Assets/MaterialFunction.cpp b/Source/Engine/Content/Assets/MaterialFunction.cpp index ca3cc58fb..af69a5285 100644 --- a/Source/Engine/Content/Assets/MaterialFunction.cpp +++ b/Source/Engine/Content/Assets/MaterialFunction.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2012-2021 Wojciech Figat. All rights reserved. #include "MaterialFunction.h" +#include "Engine/Threading/Threading.h" #if COMPILE_WITH_MATERIAL_GRAPH #include "Engine/Core/Log.h" #include "Engine/Core/Types/DataContainer.h" diff --git a/Source/Engine/Content/Assets/MaterialInstance.cpp b/Source/Engine/Content/Assets/MaterialInstance.cpp index c0d2137f1..d5e154eca 100644 --- a/Source/Engine/Content/Assets/MaterialInstance.cpp +++ b/Source/Engine/Content/Assets/MaterialInstance.cpp @@ -7,6 +7,7 @@ #include "Engine/Content/Upgraders/MaterialInstanceUpgrader.h" #include "Engine/Content/Factories/BinaryAssetFactory.h" #include "Engine/Serialization/MemoryReadStream.h" +#include "Engine/Threading/Threading.h" REGISTER_BINARY_ASSET_WITH_UPGRADER(MaterialInstance, "FlaxEngine.MaterialInstance", MaterialInstanceUpgrader, true); diff --git a/Source/Engine/Content/Assets/Model.cpp b/Source/Engine/Content/Assets/Model.cpp index d337c62a2..b61b05a23 100644 --- a/Source/Engine/Content/Assets/Model.cpp +++ b/Source/Engine/Content/Assets/Model.cpp @@ -13,6 +13,7 @@ #include "Engine/Streaming/StreamingGroup.h" #include "Engine/Debug/Exceptions/ArgumentOutOfRangeException.h" #include "Engine/Renderer/DrawCall.h" +#include "Engine/Threading/Threading.h" #if GPU_ENABLE_ASYNC_RESOURCES_CREATION #include "Engine/Threading/ThreadPoolTask.h" #define STREAM_TASK_BASE ThreadPoolTask diff --git a/Source/Engine/Content/Assets/RawDataAsset.cpp b/Source/Engine/Content/Assets/RawDataAsset.cpp index 98b9e3251..108fe2523 100644 --- a/Source/Engine/Content/Assets/RawDataAsset.cpp +++ b/Source/Engine/Content/Assets/RawDataAsset.cpp @@ -3,6 +3,9 @@ #include "RawDataAsset.h" #include "Engine/Content/Factories/BinaryAssetFactory.h" #include "Engine/Platform/FileSystem.h" +#if USE_EDITOR +#include "Engine/Threading/Threading.h" +#endif REGISTER_BINARY_ASSET(RawDataAsset, "FlaxEngine.RawDataAsset", true); diff --git a/Source/Engine/Content/Assets/SkinnedModel.cpp b/Source/Engine/Content/Assets/SkinnedModel.cpp index 3860aeda8..27c22995d 100644 --- a/Source/Engine/Content/Assets/SkinnedModel.cpp +++ b/Source/Engine/Content/Assets/SkinnedModel.cpp @@ -6,6 +6,7 @@ #include "Engine/Serialization/MemoryReadStream.h" #include "Engine/Streaming/StreamingGroup.h" #include "Engine/Threading/ThreadPoolTask.h" +#include "Engine/Threading/Threading.h" #include "Engine/Graphics/RenderTools.h" #include "Engine/Graphics/RenderTask.h" #include "Engine/Graphics/Models/ModelInstanceEntry.h" diff --git a/Source/Engine/Content/BinaryAsset.cpp b/Source/Engine/Content/BinaryAsset.cpp index ef22bd3c9..f5e71886c 100644 --- a/Source/Engine/Content/BinaryAsset.cpp +++ b/Source/Engine/Content/BinaryAsset.cpp @@ -12,6 +12,7 @@ #include "Engine/Threading/ThreadPoolTask.h" #if USE_EDITOR #include "Engine/Platform/FileSystem.h" +#include "Engine/Threading/Threading.h" #endif REGISTER_BINARY_ASSET_ABSTRACT(BinaryAsset, "FlaxEngine.BinaryAsset"); diff --git a/Source/Engine/Content/Cache/AssetsCache.cpp b/Source/Engine/Content/Cache/AssetsCache.cpp index 35863be60..bd416fc8e 100644 --- a/Source/Engine/Content/Cache/AssetsCache.cpp +++ b/Source/Engine/Content/Cache/AssetsCache.cpp @@ -11,6 +11,7 @@ #include "Engine/Content/Storage/ContentStorageManager.h" #include "Engine/Content/Storage/JsonStorageProxy.h" #include "Engine/Profiler/ProfilerCPU.h" +#include "Engine/Threading/Threading.h" #include "Engine/Engine/Globals.h" #include "FlaxEngine.Gen.h" diff --git a/Source/Engine/Content/Storage/ContentStorageManager.cpp b/Source/Engine/Content/Storage/ContentStorageManager.cpp index 13c2dcf1d..458355ab5 100644 --- a/Source/Engine/Content/Storage/ContentStorageManager.cpp +++ b/Source/Engine/Content/Storage/ContentStorageManager.cpp @@ -9,6 +9,7 @@ #include "Engine/Platform/FileSystem.h" #include "Engine/Profiler/ProfilerCPU.h" #include "Engine/Threading/TaskGraph.h" +#include "Engine/Threading/Threading.h" namespace { diff --git a/Source/Engine/Content/Storage/FlaxStorage.cpp b/Source/Engine/Content/Storage/FlaxStorage.cpp index 7c65dc6e1..8c6bce0ad 100644 --- a/Source/Engine/Content/Storage/FlaxStorage.cpp +++ b/Source/Engine/Content/Storage/FlaxStorage.cpp @@ -9,6 +9,7 @@ #include "Engine/Platform/File.h" #include "Engine/Profiler/ProfilerCPU.h" #include "Engine/Serialization/FileWriteStream.h" +#include "Engine/Threading/Threading.h" #if USE_EDITOR #include "Engine/Serialization/JsonWriter.h" #include "Engine/Serialization/JsonWriters.h" diff --git a/Source/Engine/Content/Storage/FlaxStorage.h b/Source/Engine/Content/Storage/FlaxStorage.h index f1b4d62eb..85a88fee0 100644 --- a/Source/Engine/Content/Storage/FlaxStorage.h +++ b/Source/Engine/Content/Storage/FlaxStorage.h @@ -6,6 +6,7 @@ #include "Engine/Core/Delegate.h" #include "Engine/Core/Types/String.h" #include "Engine/Core/Types/DateTime.h" +#include "Engine/Platform/CriticalSection.h" #include "Engine/Serialization/FileReadStream.h" #include "Engine/Threading/ThreadLocal.h" #include "FlaxChunk.h" diff --git a/Source/Engine/Content/Upgraders/SkeletonMaskUpgrader.h b/Source/Engine/Content/Upgraders/SkeletonMaskUpgrader.h index 431c71014..44daac2bc 100644 --- a/Source/Engine/Content/Upgraders/SkeletonMaskUpgrader.h +++ b/Source/Engine/Content/Upgraders/SkeletonMaskUpgrader.h @@ -8,6 +8,7 @@ #include "Engine/Content/Assets/SkinnedModel.h" #include "Engine/Serialization/MemoryReadStream.h" #include "Engine/Serialization/MemoryWriteStream.h" +#include "Engine/Threading/Threading.h" /// /// Skeleton Mask asset upgrader. diff --git a/Source/Engine/Core/Collections/Sorting.cpp b/Source/Engine/Core/Collections/Sorting.cpp index 4ee1d8658..9dc0070b6 100644 --- a/Source/Engine/Core/Collections/Sorting.cpp +++ b/Source/Engine/Core/Collections/Sorting.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2012-2021 Wojciech Figat. All rights reserved. #include "Sorting.h" +#include "Engine/Core/Memory/Memory.h" #include "Engine/Threading/ThreadLocal.h" // Use a cached storage for the sorting (one per thread to reduce locking) diff --git a/Source/Engine/Engine/GameplayGlobals.cpp b/Source/Engine/Engine/GameplayGlobals.cpp index 0525f3169..8ac26543f 100644 --- a/Source/Engine/Engine/GameplayGlobals.cpp +++ b/Source/Engine/Engine/GameplayGlobals.cpp @@ -7,6 +7,7 @@ #include "Engine/Serialization/MemoryWriteStream.h" #include "Engine/Content/Factories/BinaryAssetFactory.h" #include "Engine/Content/Upgraders/BinaryAssetUpgrader.h" +#include "Engine/Threading/Threading.h" #if USE_EDITOR diff --git a/Source/Engine/Graphics/Async/GPUTasksContext.cpp b/Source/Engine/Graphics/Async/GPUTasksContext.cpp index 87ba04ae6..0ee9de3ed 100644 --- a/Source/Engine/Graphics/Async/GPUTasksContext.cpp +++ b/Source/Engine/Graphics/Async/GPUTasksContext.cpp @@ -3,7 +3,7 @@ #include "GPUTasksContext.h" #include "GPUTask.h" #include "Engine/Graphics/GPUDevice.h" -#include "Engine/Threading/ThreadLocal.h" +#include "Engine/Threading/Threading.h" #define GPU_TASKS_USE_DEDICATED_CONTEXT 0 diff --git a/Source/Engine/Graphics/Models/Mesh.cpp b/Source/Engine/Graphics/Models/Mesh.cpp index 35b5fe5fb..3e0a47f4e 100644 --- a/Source/Engine/Graphics/Models/Mesh.cpp +++ b/Source/Engine/Graphics/Models/Mesh.cpp @@ -10,6 +10,7 @@ #include "Engine/Level/Scene/Scene.h" #include "Engine/Renderer/RenderList.h" #include "Engine/Serialization/MemoryReadStream.h" +#include "Engine/Threading/Threading.h" #include namespace diff --git a/Source/Engine/Graphics/Models/SkinnedMesh.cpp b/Source/Engine/Graphics/Models/SkinnedMesh.cpp index f2d1134d9..b11ceb544 100644 --- a/Source/Engine/Graphics/Models/SkinnedMesh.cpp +++ b/Source/Engine/Graphics/Models/SkinnedMesh.cpp @@ -10,6 +10,7 @@ #include "Engine/Renderer/RenderList.h" #include "Engine/Serialization/MemoryReadStream.h" #include "Engine/Profiler/ProfilerCPU.h" +#include "Engine/Threading/Threading.h" #include void SkinnedMesh::Init(SkinnedModel* model, int32 lodIndex, int32 index, int32 materialSlotIndex, const BoundingBox& box, const BoundingSphere& sphere) diff --git a/Source/Engine/Graphics/RenderTask.cpp b/Source/Engine/Graphics/RenderTask.cpp index f3e73c220..f3edb4892 100644 --- a/Source/Engine/Graphics/RenderTask.cpp +++ b/Source/Engine/Graphics/RenderTask.cpp @@ -19,6 +19,7 @@ #include "Engine/Scripting/ManagedCLR/MMethod.h" #include "Engine/Scripting/Script.h" #include "Engine/Scripting/BinaryModule.h" +#include "Engine/Threading/Threading.h" #include #if USE_EDITOR #include "Engine/Renderer/Lightmaps.h" diff --git a/Source/Engine/GraphicsDevice/Vulkan/GPUBufferVulkan.cpp b/Source/Engine/GraphicsDevice/Vulkan/GPUBufferVulkan.cpp index ad16fbdbc..b2feea790 100644 --- a/Source/Engine/GraphicsDevice/Vulkan/GPUBufferVulkan.cpp +++ b/Source/Engine/GraphicsDevice/Vulkan/GPUBufferVulkan.cpp @@ -3,9 +3,9 @@ #if GRAPHICS_API_VULKAN #include "GPUBufferVulkan.h" -#include "RenderToolsVulkan.h" -#include "Engine/Threading/ThreadLocal.h" #include "GPUContextVulkan.h" +#include "RenderToolsVulkan.h" +#include "Engine/Threading/Threading.h" #include "Engine/Graphics/Async/Tasks/GPUUploadBufferTask.h" void GPUBufferViewVulkan::Init(GPUDeviceVulkan* device, GPUBufferVulkan* owner, VkBuffer buffer, VkDeviceSize size, PixelFormat format) diff --git a/Source/Engine/Level/Actors/AnimatedModel.cpp b/Source/Engine/Level/Actors/AnimatedModel.cpp index d4065c0b3..3c41bdb9f 100644 --- a/Source/Engine/Level/Actors/AnimatedModel.cpp +++ b/Source/Engine/Level/Actors/AnimatedModel.cpp @@ -3,6 +3,7 @@ #include "AnimatedModel.h" #include "BoneSocket.h" #include "Engine/Core/Math/Matrix3x4.h" +#include "Engine/Threading/Threading.h" #include "Engine/Animations/Animations.h" #include "Engine/Engine/Engine.h" #if USE_EDITOR diff --git a/Source/Engine/Particles/ParticleEmitter.cpp b/Source/Engine/Particles/ParticleEmitter.cpp index 75de7b697..168a6b394 100644 --- a/Source/Engine/Particles/ParticleEmitter.cpp +++ b/Source/Engine/Particles/ParticleEmitter.cpp @@ -12,6 +12,7 @@ #include "Engine/Level/Level.h" #include "Engine/Serialization/MemoryReadStream.h" #include "Engine/Serialization/MemoryWriteStream.h" +#include "Engine/Threading/Threading.h" #if USE_EDITOR #include "ParticleEmitterFunction.h" #include "Engine/ShadersCompilation/Config.h" diff --git a/Source/Engine/Particles/ParticleEmitterFunction.cpp b/Source/Engine/Particles/ParticleEmitterFunction.cpp index b02c42cbd..1100b7e7e 100644 --- a/Source/Engine/Particles/ParticleEmitterFunction.cpp +++ b/Source/Engine/Particles/ParticleEmitterFunction.cpp @@ -3,6 +3,7 @@ #include "ParticleEmitterFunction.h" #include "Engine/Core/Log.h" #include "Engine/Serialization/MemoryReadStream.h" +#include "Engine/Threading/Threading.h" #if USE_EDITOR #include "Engine/Core/Types/DataContainer.h" #endif diff --git a/Source/Engine/Particles/ParticleSystem.cpp b/Source/Engine/Particles/ParticleSystem.cpp index cb6bd4061..64b34c718 100644 --- a/Source/Engine/Particles/ParticleSystem.cpp +++ b/Source/Engine/Particles/ParticleSystem.cpp @@ -6,6 +6,7 @@ #include "Engine/Content/Factories/BinaryAssetFactory.h" #include "Engine/Serialization/MemoryReadStream.h" #include "Engine/Serialization/MemoryWriteStream.h" +#include "Engine/Threading/Threading.h" REGISTER_BINARY_ASSET(ParticleSystem, "FlaxEngine.ParticleSystem", true); diff --git a/Source/Engine/Particles/Particles.cpp b/Source/Engine/Particles/Particles.cpp index 8f281581a..2c8c5d347 100644 --- a/Source/Engine/Particles/Particles.cpp +++ b/Source/Engine/Particles/Particles.cpp @@ -18,6 +18,7 @@ #include "Engine/Renderer/RenderList.h" #include "Engine/Threading/TaskGraph.h" #if COMPILE_WITH_GPU_PARTICLES +#include "Engine/Threading/Threading.h" #include "Engine/Content/Assets/Shader.h" #include "Engine/Profiler/ProfilerGPU.h" #include "Engine/Renderer/Utils/BitonicSort.h" diff --git a/Source/Engine/Physics/CollisionCooking.cpp b/Source/Engine/Physics/CollisionCooking.cpp index 5af787c5e..052ac87d3 100644 --- a/Source/Engine/Physics/CollisionCooking.cpp +++ b/Source/Engine/Physics/CollisionCooking.cpp @@ -6,6 +6,7 @@ #include "Engine/Threading/Task.h" #include "Engine/Graphics/Async/GPUTask.h" #include "Engine/Graphics/Models/MeshBase.h" +#include "Engine/Threading/Threading.h" #include "Engine/Core/Log.h" #include "Physics.h" #include diff --git a/Source/Engine/Physics/CollisionData.cpp b/Source/Engine/Physics/CollisionData.cpp index eeb0a43c1..5fd2eaed5 100644 --- a/Source/Engine/Physics/CollisionData.cpp +++ b/Source/Engine/Physics/CollisionData.cpp @@ -8,6 +8,7 @@ #include "Engine/Physics/Physics.h" #include "Engine/Physics/Utilities.h" #include "Engine/Physics/CollisionCooking.h" +#include "Engine/Threading/Threading.h" #include #include #include diff --git a/Source/Engine/Render2D/Font.cpp b/Source/Engine/Render2D/Font.cpp index 26b652de8..8d1cb1269 100644 --- a/Source/Engine/Render2D/Font.cpp +++ b/Source/Engine/Render2D/Font.cpp @@ -4,6 +4,7 @@ #include "FontAsset.h" #include "FontManager.h" #include "Engine/Core/Log.h" +#include "Engine/Threading/Threading.h" #include "IncludeFreeType.h" Font::Font(FontAsset* parentAsset, int32 size) diff --git a/Source/Engine/Render2D/FontAsset.cpp b/Source/Engine/Render2D/FontAsset.cpp index 5210bc9e2..b0e1601ce 100644 --- a/Source/Engine/Render2D/FontAsset.cpp +++ b/Source/Engine/Render2D/FontAsset.cpp @@ -7,6 +7,7 @@ #include "Engine/Content/Factories/BinaryAssetFactory.h" #include "Engine/Content/Upgraders/FontAssetUpgrader.h" #include "Engine/Profiler/ProfilerCPU.h" +#include "Engine/Threading/Threading.h" #include "IncludeFreeType.h" #if USE_EDITOR #include "Engine/Platform/FileSystem.h" diff --git a/Source/Engine/Render2D/FontManager.cpp b/Source/Engine/Render2D/FontManager.cpp index 79ab045da..9d9e34cbd 100644 --- a/Source/Engine/Render2D/FontManager.cpp +++ b/Source/Engine/Render2D/FontManager.cpp @@ -8,6 +8,7 @@ #include "Engine/Core/Log.h" #include "Engine/Content/Content.h" #include "Engine/Engine/EngineService.h" +#include "Engine/Threading/Threading.h" #include "IncludeFreeType.h" #include #include diff --git a/Source/Engine/Scripting/Script.cpp b/Source/Engine/Scripting/Script.cpp index 98a88975b..1860626d5 100644 --- a/Source/Engine/Scripting/Script.cpp +++ b/Source/Engine/Scripting/Script.cpp @@ -13,7 +13,7 @@ #include "Engine/Level/Level.h" #include "Engine/Level/Scene/Scene.h" #include "Engine/Serialization/Serialization.h" -#include "Engine/Threading/ThreadLocal.h" +#include "Engine/Threading/Threading.h" #if USE_EDITOR #define CHECK_EXECUTE_IN_EDITOR if (Editor::IsPlayMode || _executeInEditor) diff --git a/Source/Engine/ShadowsOfMordor/Builder.Entries.cpp b/Source/Engine/ShadowsOfMordor/Builder.Entries.cpp index 445555b69..844996e6c 100644 --- a/Source/Engine/ShadowsOfMordor/Builder.Entries.cpp +++ b/Source/Engine/ShadowsOfMordor/Builder.Entries.cpp @@ -11,6 +11,7 @@ #include "Engine/Terrain/Terrain.h" #include "Engine/Terrain/TerrainPatch.h" #include "Engine/Foliage/Foliage.h" +#include "Engine/Threading/Threading.h" bool canUseMaterialWithLightmap(MaterialBase* material, ShadowsOfMordor::Builder::SceneBuildCache* scene) { diff --git a/Source/Engine/Terrain/TerrainPatch.cpp b/Source/Engine/Terrain/TerrainPatch.cpp index f96fec22d..ed1ba6866 100644 --- a/Source/Engine/Terrain/TerrainPatch.cpp +++ b/Source/Engine/Terrain/TerrainPatch.cpp @@ -10,6 +10,7 @@ #include "Engine/Physics/PhysicalMaterial.h" #include "Engine/Level/Scene/Scene.h" #include "Engine/Graphics/Async/GPUTask.h" +#include "Engine/Threading/Threading.h" #if TERRAIN_EDITING #include "Engine/Core/Math/Packed.h" #include "Engine/Graphics/PixelFormatExtensions.h" diff --git a/Source/Engine/Threading/MainThreadTask.h b/Source/Engine/Threading/MainThreadTask.h index 254733d9d..5f967df46 100644 --- a/Source/Engine/Threading/MainThreadTask.h +++ b/Source/Engine/Threading/MainThreadTask.h @@ -4,6 +4,7 @@ #include "Task.h" #include "Engine/Core/Types/String.h" +#include "Engine/Threading/Threading.h" // Invokes a target method on a main thread (using task or directly if already on main thread) // Example: INVOKE_ON_MAIN_THREAD(Collector, Collector::SyncData, this); diff --git a/Source/Engine/Threading/ThreadLocal.h b/Source/Engine/Threading/ThreadLocal.h index 1b4de4e96..a20d31930 100644 --- a/Source/Engine/Threading/ThreadLocal.h +++ b/Source/Engine/Threading/ThreadLocal.h @@ -3,8 +3,6 @@ #pragma once #include "Engine/Core/Types/BaseTypes.h" -#include "Engine/Core/Collections/Array.h" -#include "Threading.h" #include "Engine/Platform/Platform.h" /// diff --git a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.cpp b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.cpp index afe98e34a..65c38003c 100644 --- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.cpp +++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.cpp @@ -8,6 +8,7 @@ #include "Engine/Graphics/Materials/MaterialShader.h" #include "Engine/Graphics/Materials/MaterialShaderFeatures.h" #include "Engine/Engine/Globals.h" +#include "Engine/Threading/Threading.h" /// /// Material shader source code template has special marks for generated code.