Merge pull request #454 from pollend/add-missing-includes-for-non-pcf-builds

devshgraphicsprogramming · web-flow · commit d88e7e2c4bbb · 2023-02-20T00:38:28.000+01:00
add missing includes for non PCH build
diff --git a/include/matrix4SIMD_impl.h b/include/matrix4SIMD_impl.h
@@ -7,6 +7,7 @@
 
 #include "matrix4SIMD.h"
 #include "nbl/core/math/glslFunctions.tcc"
+#include "aabbox3d.h"
 
 namespace nbl
 {
diff --git a/include/nbl/asset/IBuffer.h b/include/nbl/asset/IBuffer.h
@@ -6,6 +6,7 @@
 
 #include "nbl/core/decl/smart_refctd_ptr.h"
 #include "nbl/core/IBuffer.h"
+#include "nbl/core/util/bitflag.h"
 
 #include "nbl/asset/IDescriptor.h"
 
diff --git a/include/nbl/asset/IDescriptorSetLayout.h b/include/nbl/asset/IDescriptorSetLayout.h
@@ -8,6 +8,7 @@
 #include "nbl/core/declarations.h"
 #include "nbl/core/SRange.h"
 #include "nbl/asset/ISpecializedShader.h"
+#include "nbl/asset/IShader.h"
 
 namespace nbl
 {
diff --git a/include/nbl/asset/IRenderpassIndependentPipeline.h b/include/nbl/asset/IRenderpassIndependentPipeline.h
@@ -17,6 +17,7 @@
 #include "nbl/asset/ISpecializedShader.h"
 #include "nbl/asset/IPipeline.h"
 #include "nbl/asset/IImage.h"
+#include "nbl/asset/IShader.h"
 
 #define VK_NO_PROTOTYPES
 #include <vulkan/vulkan.h>
diff --git a/include/nbl/asset/ISkeleton.h b/include/nbl/asset/ISkeleton.h
@@ -5,6 +5,7 @@
 #ifndef _NBL_ASSET_I_SKELETON_H_INCLUDED_
 #define _NBL_ASSET_I_SKELETON_H_INCLUDED_
 
+#include "nbl/asset/IBuffer.h"
 #include "nbl/macros.h"
 
 #include "nbl/core/declarations.h"
diff --git a/include/nbl/asset/metadata/CGLTFMetadata.h b/include/nbl/asset/metadata/CGLTFMetadata.h
@@ -5,6 +5,7 @@
 #ifndef _NBL_ASSET_C_GLTF_METADATA_H_INCLUDED_
 #define _NBL_ASSET_C_GLTF_METADATA_H_INCLUDED_
 
+#include "nbl/asset/ICPUSkeleton.h"
 #include "nbl/asset/metadata/IAssetMetadata.h"
 #include "nbl/asset/metadata/CGLTFPipelineMetadata.h"
 
diff --git a/include/nbl/asset/utils/CGLSLCompiler.h b/include/nbl/asset/utils/CGLSLCompiler.h
@@ -7,6 +7,7 @@
 
 #include "nbl/asset/utils/ISPIRVOptimizer.h"
 #include "nbl/asset/utils/IShaderCompiler.h"
+#include "nbl/asset/format/EFormat.h"
 
 namespace nbl::asset
 {
diff --git a/include/nbl/core/containers/refctd_dynamic_array.h b/include/nbl/core/containers/refctd_dynamic_array.h
@@ -5,6 +5,7 @@
 #ifndef __NBL_CORE_REFCTD_DYNAMIC_ARRAY_H_INCLUDED__
 #define __NBL_CORE_REFCTD_DYNAMIC_ARRAY_H_INCLUDED__
 
+#include "nbl/core/decl/Types.h"
 #include "nbl/core/decl/smart_refctd_ptr.h"
 #include "nbl/core/alloc/AlignedBase.h"
 #include "nbl/core/containers/dynamic_array.h"
diff --git a/include/nbl/core/util/bitflag.h b/include/nbl/core/util/bitflag.h
@@ -5,6 +5,8 @@
 #ifndef _NBL_CORE_C_BITFLAG_H_INCLUDED_
 #define _NBL_CORE_C_BITFLAG_H_INCLUDED_
 
+#include "BuildConfigOptions.h"
+
 namespace nbl::core
 {
 
diff --git a/include/nbl/system/IFileArchive.h b/include/nbl/system/IFileArchive.h
@@ -6,6 +6,8 @@
 #ifndef _NBL_SYSTEM_I_FILE_ARCHIVE_H_INCLUDED_
 #define _NBL_SYSTEM_I_FILE_ARCHIVE_H_INCLUDED_
 
+#include "nbl/core/SRange.h"
+
 #include "nbl/system/path.h"
 #include "nbl/system/ILogger.h"
 #include "nbl/system/IFileBase.h"
diff --git a/include/nbl/system/ISystem.h b/include/nbl/system/ISystem.h
@@ -7,11 +7,10 @@
 #include "nbl/core/declarations.h"
 #include "nbl/core/util/bitflag.h"
 
-#include <variant>
-
 #include "nbl/system/ICancellableAsyncQueueDispatcher.h"
 #include "nbl/system/IFileArchive.h"
 
+#include <variant>
 
 namespace nbl::system
 {
@@ -26,31 +25,22 @@ class NBL_API2 ISystem : public core::IReferenceCounted
     protected:
         class ICaller;
     private:
-        // add more request types if needed
-        enum E_REQUEST_TYPE
-        {
-            ERT_CREATE_FILE,
-            ERT_READ,
-            ERT_WRITE
-        };
-        template <E_REQUEST_TYPE RT>
-        struct SRequestParamsBase
+        struct SRequestParams_NOOP
         {
-            static inline constexpr E_REQUEST_TYPE type = RT;
         };
-        struct SRequestParams_CREATE_FILE : SRequestParamsBase<ERT_CREATE_FILE>
+        struct SRequestParams_CREATE_FILE
         {
             char filename[MAX_FILENAME_LENGTH] {};
             IFileBase::E_CREATE_FLAGS flags;
         };
-        struct SRequestParams_READ : SRequestParamsBase<ERT_READ>
+        struct SRequestParams_READ
         {
             ISystemFile* file;
             void* buffer;
             size_t offset;
             size_t size;
         };
-        struct SRequestParams_WRITE : SRequestParamsBase<ERT_WRITE>
+        struct SRequestParams_WRITE
         {
             ISystemFile* file;
             const void* buffer;
@@ -59,12 +49,12 @@ class NBL_API2 ISystem : public core::IReferenceCounted
         };
         struct SRequestType : impl::ICancellableAsyncQueueDispatcherBase::request_base_t
         {
-            E_REQUEST_TYPE type;
             std::variant<
+                SRequestParams_NOOP,
                 SRequestParams_CREATE_FILE,
                 SRequestParams_READ,
                 SRequestParams_WRITE
-            > params;
+            > params = SRequestParams_NOOP();
         };
         static inline constexpr uint32_t CircularBufferSize = 256u;
         class CAsyncQueue : public ICancellableAsyncQueueDispatcher<CAsyncQueue,SRequestType,CircularBufferSize>
@@ -78,7 +68,6 @@ class NBL_API2 ISystem : public core::IReferenceCounted
                 template <typename FutureType, typename RequestParams>
                 void request_impl(SRequestType& req, FutureType& future, RequestParams&& params)
                 {
-                    req.type = params.type;
                     req.params = std::move(params);
                     base_t::associate_request_with_future(req, future);
                 }
@@ -88,6 +77,10 @@ class NBL_API2 ISystem : public core::IReferenceCounted
                 void init() {}
 
             private:
+                void handle_request(SRequestType& req, SRequestParams_NOOP& param);
+                void handle_request(SRequestType& req, SRequestParams_CREATE_FILE& param);
+                void handle_request(SRequestType& req, SRequestParams_READ& param);
+                void handle_request(SRequestType& req, SRequestParams_WRITE& param);
                 core::smart_refctd_ptr<ICaller> m_caller;
         };
         friend class ISystemFile;
diff --git a/include/nbl/system/ISystemPOSIX.h b/include/nbl/system/ISystemPOSIX.h
@@ -1,7 +1,10 @@
 #ifndef _NBL_SYSTEM_C_SYSTEM_CALLER_POSIX_INCLUDED_
 #define _NBL_SYSTEM_C_SYSTEM_CALLER_POSIX_INCLUDED_
 
+#include "nbl/core/util/bitflag.h"
+
 #include "nbl/system/ISystem.h"
+#include "nbl/system/IFile.h"
 
 namespace nbl::system
 {
diff --git a/include/nbl/type_traits.h b/include/nbl/type_traits.h
@@ -19,7 +19,7 @@ template <bool... Vals>
 using bool_sequence = std::integer_sequence<bool, Vals...>;
 
 template <typename T, typename... Us>
-_INLINE_VAR constexpr bool is_any_of_v = (... || std::is_same<T, Us>::value);
+inline constexpr bool is_any_of_v = (... || std::is_same<T, Us>::value);
 
 template<typename T, typename... Us>
 struct NBL_API is_any_of : std::integral_constant<bool, is_any_of_v<T, Us...>> {};
diff --git a/include/nbl/video/IDeviceMemoryAllocation.h b/include/nbl/video/IDeviceMemoryAllocation.h
@@ -6,6 +6,8 @@
 #define __NBL_I_DRIVER_MEMORY_ALLOCATION_H_INCLUDED__
 
 #include "nbl/core/IReferenceCounted.h"
+#include "nbl/core/util/bitflag.h"
+#include "nbl/video/EApiType.h"
 
 namespace nbl::video
 {
diff --git a/include/nbl/video/IGPUShader.h b/include/nbl/video/IGPUShader.h
@@ -5,11 +5,12 @@
 #ifndef __NBL_VIDEO_I_GPU_SHADER_H_INCLUDED__
 #define __NBL_VIDEO_I_GPU_SHADER_H_INCLUDED__
 
-
 #include "nbl/core/IReferenceCounted.h"
 
-#include "nbl/video/decl/IBackendObject.h"
+#include "nbl/asset/IShader.h"
 
+#include "nbl/video/decl/IBackendObject.h"
+#include "nbl/video/decl/IBackendObject.h"
 
 namespace nbl::video
 {
diff --git a/include/nbl/video/IPhysicalDevice.h b/include/nbl/video/IPhysicalDevice.h
@@ -1,15 +1,15 @@
 #ifndef __NBL_VIDEO_I_PHYSICAL_DEVICE_H_INCLUDED__
 #define __NBL_VIDEO_I_PHYSICAL_DEVICE_H_INCLUDED__
 
-#include "nbl/system/declarations.h"
 
-#include <type_traits>
+#include "nbl/core/util/bitflag.h"
+
+#include "nbl/system/declarations.h"
+#include "nbl/system/ISystem.h"
 
 #include "nbl/asset/IImage.h" //for VkExtent3D only
 #include "nbl/asset/ISpecializedShader.h"
 
-#include "nbl/system/ISystem.h"
-
 #include "nbl/video/EApiType.h"
 #include "nbl/video/debug/IDebugCallback.h"
 #include "nbl/video/ILogicalDevice.h"
@@ -20,6 +20,8 @@
 #include "SPhysicalDeviceLimits.h"
 #include "SPhysicalDeviceFeatures.h"
 
+#include <type_traits>
+
 namespace nbl::video
 {
 
@@ -74,9 +76,9 @@ class NBL_API2 IPhysicalDevice : public core::Interface, public core::Unmovable
             inline auto operator <=> (uint32_t vkApiVersion) const { return vkApiVersion - VK_MAKE_API_VERSION(0, major, minor, patch); }
             inline auto operator <=> (const APIVersion& other) const 
             {
-                if(major != other.major) return other.major - major;
-                if(minor != other.minor) return other.minor - minor;
-                if(patch != other.patch) return other.patch - patch;
+                if(major != other.major) return static_cast<uint32_t>(other.major - major);
+                if(minor != other.minor) return static_cast<uint32_t>(other.minor - minor);
+                if(patch != other.patch) return static_cast<uint32_t>(other.patch - patch);
                 return 0u;
             }
         };
@@ -720,7 +722,7 @@ class NBL_API2 IPhysicalDevice : public core::Interface, public core::Unmovable
 namespace std
 {
     template<>
-    struct std::hash<nbl::video::IPhysicalDevice::SFormatImageUsages::SUsage>
+    struct hash<nbl::video::IPhysicalDevice::SFormatImageUsages::SUsage>
     {
         inline uint32_t operator()(const nbl::video::IPhysicalDevice::SFormatImageUsages::SUsage& i) const
         {
@@ -739,7 +741,7 @@ namespace std
     };
 
     template<>
-    struct std::hash<nbl::video::IPhysicalDevice::SFormatBufferUsages::SUsage>
+    struct hash<nbl::video::IPhysicalDevice::SFormatBufferUsages::SUsage>
     {
         inline uint32_t operator()(const nbl::video::IPhysicalDevice::SFormatBufferUsages::SUsage& b) const
         {
diff --git a/include/nbl/video/utilities/IPropertyPool.h b/include/nbl/video/utilities/IPropertyPool.h
@@ -9,7 +9,8 @@
 #include "nbl/asset/asset.h"
 
 #include "nbl/video/IGPUBuffer.h"
-
+#include "nbl/video/ILogicalDevice.h"
+#include "nbl/video/IGPUDescriptorSetLayout.h"
 
 namespace nbl::video
 {
diff --git a/src/nbl/asset/interchange/CGLTFLoader.cpp b/src/nbl/asset/interchange/CGLTFLoader.cpp
@@ -6,7 +6,9 @@
 
 #ifdef _NBL_COMPILE_WITH_GLTF_LOADER_
 
+#include "nbl/asset/IAssetManager.h"
 #include "nbl/asset/utils/CDerivativeMapCreator.h"
+#include "nbl/asset/utils/IMeshManipulator.h"
 
 #include "simdjson/singleheader/simdjson.h"
 #include <algorithm>
diff --git a/src/nbl/asset/interchange/CGLTFLoader.h b/src/nbl/asset/interchange/CGLTFLoader.h
@@ -12,6 +12,7 @@
 #include "nbl/core/declarations.h"
 #include "nbl/asset/ICPUImageView.h"
 #include "nbl/asset/interchange/IAssetLoader.h"
+#include "nbl/asset/interchange/IRenderpassIndependentPipelineLoader.h"
 #include "nbl/asset/metadata/CGLTFMetadata.h"
 
 namespace nbl::asset
diff --git a/src/nbl/asset/interchange/COBJMeshFileLoader.cpp b/src/nbl/asset/interchange/COBJMeshFileLoader.cpp
@@ -13,12 +13,13 @@
 #include "nbl/system/ISystem.h"
 #include "nbl/system/IFile.h"
 
+#include "nbl/asset/metadata/COBJMetadata.h"
 #include "nbl/asset/utils/CQuantNormalCache.h"
+
 #include "COBJMeshFileLoader.h"
 
 #include <filesystem>
 
-
 namespace nbl
 {
 namespace asset
diff --git a/src/nbl/asset/interchange/CSPVLoader.cpp b/src/nbl/asset/interchange/CSPVLoader.cpp
@@ -5,6 +5,8 @@
 #include "nbl/core/declarations.h"
 
 #include "nbl/asset/ICPUShader.h"
+#include "nbl_spirv_cross/spirv.hpp"
+#include "nbl_spirv_cross/spirv_parser.hpp"
 
 #include "CSPVLoader.h"
 
diff --git a/src/nbl/asset/interchange/CSTLMeshWriter.cpp b/src/nbl/asset/interchange/CSTLMeshWriter.cpp
@@ -6,7 +6,7 @@
 #include "nbl/system/IFile.h"
 
 #include "CSTLMeshWriter.h"
-
+#include "SColor.h"
 
 using namespace nbl;
 using namespace nbl::asset;
diff --git a/src/nbl/asset/utils/CMeshManipulator.cpp b/src/nbl/asset/utils/CMeshManipulator.cpp
@@ -11,6 +11,7 @@
 
 
 #include "nbl/asset/asset.h"
+#include "nbl/asset/IRenderpassIndependentPipeline.h"
 #include "nbl/asset/utils/CMeshManipulator.h"
 #include "nbl/asset/utils/CSmoothNormalGenerator.h"
 #include "nbl/asset/utils/CForsythVertexCacheOptimizer.h"
@@ -275,7 +276,9 @@ core::smart_refctd_ptr<ICPUMeshBuffer> IMeshManipulator::createMeshBufferUniqueP
     constexpr uint32_t NEW_VTX_BUF_BINDING = 0u;
 
     auto pipeline = core::smart_refctd_ptr_static_cast<asset::ICPURenderpassIndependentPipeline>(oldPipeline->clone(0u));
-    auto& vtxParams = pipeline->getVertexInputParams() = {};
+    auto& vtxParams = pipeline->getVertexInputParams();
+    vtxParams = SVertexInputParams();
+
     vtxParams.enabledBindingFlags = (1u<<NEW_VTX_BUF_BINDING);
     vtxParams.enabledAttribFlags = oldVtxParams.enabledAttribFlags;
 
diff --git a/src/nbl/system/IFileArchive.cpp b/src/nbl/system/IFileArchive.cpp
@@ -1,5 +1,6 @@
 #include "nbl/system/IFileArchive.h"
 
+#include "nbl/system/IFile.h"
 
 using namespace nbl;
 using namespace nbl::system;
diff --git a/src/nbl/system/ISystem.cpp b/src/nbl/system/ISystem.cpp
diff --git a/src/nbl/video/CVulkanPhysicalDevice.h b/src/nbl/video/CVulkanPhysicalDevice.h

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`#include "matrix4SIMD.h"`
`9`	`9`	`#include "nbl/core/math/glslFunctions.tcc"`
	`10`	`+#include "aabbox3d.h"`
`10`	`11`
`11`	`12`	`namespace nbl`
`12`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`#include "nbl/core/declarations.h"`
`9`	`9`	`#include "nbl/core/SRange.h"`
`10`	`10`	`#include "nbl/asset/ISpecializedShader.h"`
	`11`	`+#include "nbl/asset/IShader.h"`
`11`	`12`
`12`	`13`	`namespace nbl`
`13`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`#include "nbl/asset/utils/ISPIRVOptimizer.h"`
`9`	`9`	`#include "nbl/asset/utils/IShaderCompiler.h"`
	`10`	`+#include "nbl/asset/format/EFormat.h"`
`10`	`11`
`11`	`12`	`namespace nbl::asset`
`12`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`#ifndef _NBL_CORE_C_BITFLAG_H_INCLUDED_`
`6`	`6`	`#define _NBL_CORE_C_BITFLAG_H_INCLUDED_`
`7`	`7`
	`8`	`+#include "BuildConfigOptions.h"`
	`9`	`+`
`8`	`10`	`namespace nbl::core`
`9`	`11`	`{`
`10`	`12`