Merge pull request #638 from Devsh-Graphics-Programming/vulkan_1_3_examples_fix

Fix some bad comparators of image feature reqs and default cmake vars

Author: devshgraphicsprogramming

examples_tests

@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in nabla.h
 #ifndef _NBL_ASSET_C_SPIRV_INTROSPECTOR_H_INCLUDED_
 #define _NBL_ASSET_C_SPIRV_INTROSPECTOR_H_INCLUDED_
-
+#if 0
 #include "nbl/core/declarations.h"
 
 #include <cstdint>
@@ -27,6 +27,20 @@ namespace spirv_cross
     struct SPIRType;
 }
 
+// podzielic CIntrospectionData na dwie klasy
+// jedna bez inputOutput i bez push constant blocka `CIntrospectionData`
+// druga dziedziczy z pierwszej i dodaje te 2 rzeczy `CStageIntrospectionData`
+
+// wszystkie struktury w CIntrospecionData powininny u¿ywaæ bit flagi, ozaczaj¹cej shader stage (core::unordered_map)
+// CStageIntrospecionData nie powinien u¿ywaæ bit flagi, ozaczaj¹cej shader stage (core::vector)
+
+// hashowane s¹ tylko set i binding
+// dla spec constant tylko specConstantID
+// validacja kolizji (dla SSpecConstants mo¿e siê jedynie ró¿niæ name)
+// ogarn¹æ sytuacje gdy jeden descriptor binding ma wiêcej arrayElementCount ni¿ w SPIR-V
+// w `CStageIntrospectionData` powinien byæ trzymana struktura `SIntrospectionParams`
+
+// 
 namespace nbl::asset
 {
 class NBL_API2 CSPIRVIntrospector : public core::Uncopyable
@@ -88,6 +102,7 @@ class NBL_API2 CSPIRVIntrospector : public core::Uncopyable
 			//! Sorted by `location`
 			core::vector<SShaderInfoVariant> inputOutput;
 
+			//! Push constants uniform block
 			struct {
 				bool present;
 				core::string name;
@@ -123,7 +138,7 @@ class NBL_API2 CSPIRVIntrospector : public core::Uncopyable
 					return false;
 				if (cpuShader->getContent()->getSize() != rhs.cpuShader->getContent()->getSize())
 					return false;
-				return memcmp(cpuShader->getContent()->getPointer(), rhs.cpuShader->getContent()->getPointer(), cpuShader->getContent()->getSize()) == 0;;
+				return memcmp(cpuShader->getContent()->getPointer(), rhs.cpuShader->getContent()->getPointer(), cpuShader->getContent()->getSize()) == 0;
 			}
 		};
 
@@ -132,43 +147,26 @@ class NBL_API2 CSPIRVIntrospector : public core::Uncopyable
 
 		//! params.cpuShader.contentType should be ECT_SPIRV
 		//! the compiled SPIRV must be compiled with IShaderCompiler::SCompilerOptions::debugInfoFlags enabling EDIF_SOURCE_BIT implicitly or explicitly, with no `spirvOptimizer` used in order to include names in introspection data
+		// powinna zwracac CStageIntrospectionData
 		core::smart_refctd_ptr<const CIntrospectionData> introspect(const SIntrospectionParams& params, bool insertToCache = true);
 
+		// 
+		//core::smart_refctd_ptr<const CIntrospectionData> merge(const std::span<const CStageIntrospectionData>& asdf, const ICPUShader::SSPecInfo::spec_constant_map_t& = {});
+
 		// When the methods take a span of shaders, they are computing things for an imaginary pipeline that includes **all** of them
+		// przeniesc do CIntrospectionData
 		std::pair<bool/*is shadow sampler*/, IImageView<ICPUImage>::E_TYPE> getImageInfoFromIntrospection(uint32_t set, uint32_t binding, const std::span<const ICPUShader::SSpecInfo> _infos);
-		
-		inline core::smart_refctd_dynamic_array<SPushConstantRange> createPushConstantRangesFromIntrospection(const std::span<const ICPUShader::SSpecInfo> _infos)
-		{
-			core::vector<core::smart_refctd_ptr<const CIntrospectionData>> introspections(_infos.size());
-			if (!introspectAllShaders(introspections.data(),_infos))
-				return nullptr;
-
-			return createPushConstantRangesFromIntrospection_impl(introspections.data(),_infos);
-		}
-		inline core::smart_refctd_ptr<ICPUDescriptorSetLayout> createApproximateDescriptorSetLayoutFromIntrospection(uint32_t set, const std::span<const ICPUShader::SSpecInfo> _infos)
-		{
-			core::vector<core::smart_refctd_ptr<const CIntrospectionData>> introspections(_infos.size());
-			if (!introspectAllShaders(introspections.data(),_infos))
-				return nullptr;
-
-			return createApproximateDescriptorSetLayoutFromIntrospection_impl(set,introspections.data(), _infos);
-		}
-		inline core::smart_refctd_ptr<ICPUPipelineLayout> createApproximatePipelineLayoutFromIntrospection(const std::span<const ICPUShader::SSpecInfo> _infos)
-		{
-			core::vector<core::smart_refctd_ptr<const CIntrospectionData>> introspections(_infos.size());
-			if (!introspectAllShaders(introspections.data(),_infos))
-				return nullptr;
-
-			return createApproximatePipelineLayoutFromIntrospection_impl(introspections.data(),_infos);
-		}
 
 		//
 		inline core::smart_refctd_ptr<ICPUComputePipeline> createApproximateComputePipelineFromIntrospection(const ICPUShader::SSpecInfo& info)
+		//TODO: inline core::smart_refctd_ptr<ICPUComputePipeline> createApproximateComputePipelineFromIntrospection(CStageIntrospectionData* asdf)
 		{
 			if (info.shader->getStage()!=IShader::ESS_COMPUTE)
 				return nullptr;
 
 			core::smart_refctd_ptr<const CIntrospectionData> introspection = nullptr;
+			
+			//TODO: zamiast tego mergujemy `CStageIntrospectionData` w `CIntrospectionData` u¿ywaj¹c `merge`
 			if (!introspectAllShaders(&introspection,{&info,1}))
 				return nullptr;
 
@@ -180,15 +178,24 @@ class NBL_API2 CSPIRVIntrospector : public core::Uncopyable
 
 		//
 		core::smart_refctd_ptr<ICPURenderpassIndependentPipeline> createApproximateRenderpassIndependentPipelineFromIntrospection(const std::span<const ICPUShader::SSpecInfo> _infos);
+
+		struct CShaderStages
+		{
+			const CStageIntrospectionData* vertex = nullptr;
+			const CStageIntrospectionData* fragment = nullptr;
+			const CStageIntrospectionData* control = nullptr;
+			const CStageIntrospectionData* evaluation = nullptr;
+			const CStageIntrospectionData* geometry = nullptr;
+		}
+		core::smart_refctd_ptr<ICPUGraphicsPipeline> createApproximateGraphicsPipeline(const CShaderStages& shaderStages);
 
 	private:
-		using mapId2SpecConst_t = core::unordered_map<uint32_t, const CIntrospectionData::SSpecConstant*>;
+		//TODO: przenieϾ jako members do CIntrospectionData
+		core::smart_refctd_dynamic_array<SPushConstantRange> createPushConstantRangesFromIntrospection_impl();
+		core::smart_refctd_ptr<ICPUDescriptorSetLayout> createApproximateDescriptorSetLayoutFromIntrospection_impl(const uint32_t setID);
+		core::smart_refctd_ptr<ICPUPipelineLayout> createApproximatePipelineLayoutFromIntrospection_impl();
 
-		core::smart_refctd_dynamic_array<SPushConstantRange> createPushConstantRangesFromIntrospection_impl(core::smart_refctd_ptr<const CIntrospectionData>* const introspections, const std::span<const ICPUShader::SSpecInfo> shaders);
-		core::smart_refctd_ptr<ICPUDescriptorSetLayout> createApproximateDescriptorSetLayoutFromIntrospection_impl(uint32_t _set, core::smart_refctd_ptr<const CIntrospectionData>* const introspections, const std::span<const ICPUShader::SSpecInfo> shaders);
-		core::smart_refctd_ptr<ICPUPipelineLayout> createApproximatePipelineLayoutFromIntrospection_impl(core::smart_refctd_ptr<const CIntrospectionData>* const introspections, const std::span<const ICPUShader::SSpecInfo> shaders);
-
-		bool introspectAllShaders(core::smart_refctd_ptr<const CIntrospectionData>* introspection, const std::span<const ICPUShader::SSpecInfo> _infos);
+		core::smart_refctd_ptr<CStageIntrospectionData> introspectShader(const ICPUShader::SSpecInfo _infos);
 
 		core::smart_refctd_ptr<const CIntrospectionData> doIntrospection(spirv_cross::Compiler& _comp, const std::string& entryPoint, const IShader::E_SHADER_STAGE stage) const;
 		void shaderMemBlockIntrospection(spirv_cross::Compiler& _comp, impl::SShaderMemoryBlock& _res, uint32_t _blockBaseTypeID, uint32_t _varID, const mapId2SpecConst_t& _sortedId2sconst) const;
@@ -213,9 +220,11 @@ class NBL_API2 CSPIRVIntrospector : public core::Uncopyable
 		};
 
 		using ParamsToDataMap = core::unordered_map<SIntrospectionParams,core::smart_refctd_ptr<const CIntrospectionData>, KeyHasher>;
+		// using ParamsToDataMap = core::unordered_set<core::smart_refctd_ptr<const CStageIntrospectionData>, KeyHasher, KeyEquals>;
 		ParamsToDataMap m_introspectionCache;
 };
 
 } // nbl::asset
 
 #endif
+#endif

include/nbl/asset/utils/CSPIRVIntrospector.h

@@ -85,7 +85,7 @@ class NBL_API2 ILogicalDevice : public core::IReferenceCounted, public IDeviceMe
         bool supportsMask(const uint32_t queueFamilyIndex, core::bitflag<asset::ACCESS_FLAGS> accessMask) const;
 
         //! NOTE/TODO: this is not yet finished
-        inline bool validateMemoryBarrier(const uint32_t queueFamilyIndex, asset::SMemoryBarrier barrier) const;
+        bool validateMemoryBarrier(const uint32_t queueFamilyIndex, asset::SMemoryBarrier barrier) const;
         inline bool validateMemoryBarrier(const uint32_t queueFamilyIndex, const IGPUCommandBuffer::SOwnershipTransferBarrier& barrier, const bool concurrentSharing) const
         {
             // implicitly satisfied by our API:

include/nbl/video/ILogicalDevice.h

@@ -559,11 +559,11 @@ class NBL_API2 IPhysicalDevice : public core::Interface, public core::Unmovable
                     if (videoDecodeDPB && !other.videoDecodeDPB) return false;
                     if (videoEncodeInput && !other.videoEncodeInput) return false;
                     if (videoEncodeDPB && !other.videoEncodeDPB) return false;
-                    if (other.storageImageLoadWithoutFormat && !storageImageLoadWithoutFormat) return false;
-                    if (other.storageImageStoreWithoutFormat && !storageImageStoreWithoutFormat) return false;
-                    if (other.depthCompareSampledImage && !depthCompareSampledImage) return false;
-                    if (other.hostImageTransfer && !hostImageTransfer) return false;
-                    if (other.log2MaxSamples < log2MaxSamples) return false;
+                    if (storageImageLoadWithoutFormat && !other.storageImageLoadWithoutFormat) return false;
+                    if (storageImageStoreWithoutFormat && !other.storageImageStoreWithoutFormat) return false;
+                    if (depthCompareSampledImage && !other.depthCompareSampledImage) return false;
+                    if (hostImageTransfer && !other.hostImageTransfer) return false;
+                    if (log2MaxSamples > other.log2MaxSamples) return false;
                     return true;
                 }
 

include/nbl/video/IPhysicalDevice.h

@@ -83,15 +83,13 @@ include(common)
 
 #[[ Loaders and writers compile options available to edit by user
 	All revelant _NBL_COMPILE_WITH will be there]]
-option(_NBL_COMPILE_WITH_MTL_LOADER_ "Compile with MTL Loader" ON)
-option(_NBL_COMPILE_WITH_OBJ_LOADER_ "Compile with OBJ Loader" ON)
+option(_NBL_COMPILE_WITH_MTL_LOADER_ "Compile with MTL Loader" OFF) #default off until Material Compiler 2
+option(_NBL_COMPILE_WITH_OBJ_LOADER_ "Compile with OBJ Loader" OFF) #default off until Material Compiler 2
 #option(_NBL_COMPILE_WITH_OBJ_WRITER_ "Compile with OBJ Writer" ON) uncomment when writer exists
-option(_NBL_COMPILE_WITH_STL_LOADER_ "Compile with STL Loader" ON)
+option(_NBL_COMPILE_WITH_STL_LOADER_ "Compile with STL Loader" OFF) #default off until Material Compiler 2
 option(_NBL_COMPILE_WITH_STL_WRITER_ "Compile with STL Writer" ON)
-option(_NBL_COMPILE_WITH_PLY_LOADER_ "Compile with PLY Loader" ON)
+option(_NBL_COMPILE_WITH_PLY_LOADER_ "Compile with PLY Loader" OFF) #default off until Material Compiler 2
 option(_NBL_COMPILE_WITH_PLY_WRITER_ "Compile with PLY Writer" ON)
-option(_NBL_COMPILE_WITH_BAW_LOADER_ "Compile with BAW Loader" OFF)
-option(_NBL_COMPILE_WITH_BAW_WRITER_ "Compile with BAW Writer" OFF)
 option(_NBL_COMPILE_WITH_JPG_LOADER_ "Compile with JPG Loader" ON)
 option(_NBL_COMPILE_WITH_JPG_WRITER_ "Compile with JPG Writer" ON)
 option(_NBL_COMPILE_WITH_PNG_LOADER_ "Compile with PNG Loader" ON)

src/nbl/CMakeLists.txt

@@ -1,6 +1,7 @@
 // Copyright (C) 2018-2024 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
+#if 0
 #include "nbl/asset/utils/CSPIRVIntrospector.h"
 #include "nbl/asset/utils/spvUtils.h"
 
@@ -798,3 +799,5 @@ CSPIRVIntrospector::CIntrospectionData::~CIntrospectionData()
 
 
 } // nbl:asset
+
+#endif