make Nabla Clang build work

AnastaZIuk · AnastaZIuk · commit f44c0ebd983c · 2025-04-08T14:23:40.000+02:00
diff --git a/cmake/adjust/template/vendor/CXX_Clang.cmake b/cmake/adjust/template/vendor/CXX_Clang.cmake
@@ -15,7 +15,6 @@ set(NBL_CXX_RELWITHDEBINFO_COMPILE_OPTIONS "")
 
 # Global
 list(APPEND NBL_CXX_COMPILE_OPTIONS
-	-Wno-everything # TMP
 	-Wextra
 	-fno-strict-aliasing
 	-msse4.2
diff --git a/cmake/adjust/template/vendor/C_Clang.cmake b/cmake/adjust/template/vendor/C_Clang.cmake
@@ -14,8 +14,7 @@ set(NBL_C_RELEASE_COMPILE_OPTIONS
 set(NBL_C_RELWITHDEBINFO_COMPILE_OPTIONS "")
 
 # Global
-list(APPEND NBL_C_COMPILE_OPTIONS 
-	-Wno-everything # TMP
+list(APPEND NBL_C_COMPILE_OPTIONS
 	-Wextra
 	-fno-strict-aliasing
 	-msse4.2
diff --git a/include/nbl/asset/IRenderpass.h b/include/nbl/asset/IRenderpass.h
@@ -83,10 +83,10 @@ class NBL_API2 IRenderpass
                 };
 
                 // The arrays pointed to by this array must be terminated by `DepthStencilAttachmentsEnd` value, which implicitly satisfies a few VUIDs
-                constexpr static inline SDepthStencilAttachmentDescription DepthStencilAttachmentsEnd = {};
+                static const SDepthStencilAttachmentDescription DepthStencilAttachmentsEnd; // have to initialize out of line because of https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88165
                 const SDepthStencilAttachmentDescription* depthStencilAttachments = &DepthStencilAttachmentsEnd;
                 // The arrays pointed to by this array must be terminated by `ColorAttachmentsEnd` value, which implicitly satisfies a few VUIDs
-                constexpr static inline SColorAttachmentDescription ColorAttachmentsEnd = {};
+                static const SColorAttachmentDescription ColorAttachmentsEnd; // have to initialize out of line because of https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88165
                 const SColorAttachmentDescription* colorAttachments = &ColorAttachmentsEnd;
 
                 struct SSubpassDescription final
@@ -200,7 +200,7 @@ class NBL_API2 IRenderpass
                     SColorAttachmentsRef colorAttachments[MaxColorAttachments] = {};
 
                     // The arrays pointed to by this array must be terminated by `InputAttachmentsEnd` value
-                    constexpr static inline SInputAttachmentRef InputAttachmentsEnd = {};
+                    static const SInputAttachmentRef InputAttachmentsEnd;
                     const SInputAttachmentRef* inputAttachments = &InputAttachmentsEnd;
 
                     struct SPreserveAttachmentRef
@@ -233,7 +233,7 @@ class NBL_API2 IRenderpass
                     // https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkSubpassDescription2.html#VUID-VkSubpassDescription2-pipelineBindPoint-04953
                     //E_PIPELINE_BIND_POINT pipelineBindPoint : 2 = EPBP_GRAPHICS;
                 };
-                constexpr static inline SSubpassDescription SubpassesEnd = {};
+                static const SSubpassDescription SubpassesEnd;
                 const SSubpassDescription* subpasses = &SubpassesEnd;
 
                 struct SSubpassDependency final
@@ -259,7 +259,7 @@ class NBL_API2 IRenderpass
                     bool valid() const;
                 };
                 // The arrays pointed to by this array must be terminated by `DependenciesEnd` value
-                constexpr static inline SSubpassDependency DependenciesEnd = {};
+                static const SSubpassDependency DependenciesEnd;
                 const SSubpassDependency* dependencies = &DependenciesEnd;
 
 
@@ -380,6 +380,12 @@ class NBL_API2 IRenderpass
         uint32_t m_loadOpColorAttachmentEnd = ~0u;
 };
 
+constexpr inline IRenderpass::SCreationParams::SDepthStencilAttachmentDescription IRenderpass::SCreationParams::DepthStencilAttachmentsEnd = {};
+constexpr inline IRenderpass::SCreationParams::SColorAttachmentDescription IRenderpass::SCreationParams::ColorAttachmentsEnd = {};
+constexpr inline IRenderpass::SCreationParams::SSubpassDescription::SInputAttachmentRef IRenderpass::SCreationParams::SSubpassDescription::InputAttachmentsEnd = {};
+constexpr inline IRenderpass::SCreationParams::SSubpassDescription IRenderpass::SCreationParams::SubpassesEnd = {};
+constexpr inline IRenderpass::SCreationParams::SSubpassDependency IRenderpass::SCreationParams::DependenciesEnd = {};
+
 inline bool IRenderpass::compatible(const IRenderpass* other) const
 {
     // If you find yourself spending a lot of time here in your profile, go ahead and implement a precomputed hash and store it in the renderpass
diff --git a/include/nbl/asset/filters/CBlitImageFilter.h b/include/nbl/asset/filters/CBlitImageFilter.h
@@ -464,7 +464,7 @@ class CBlitImageFilter :
 
 			auto phaseCount = IBlitUtilities::getPhaseCount(inExtentLayerCount.xyz, outExtentLayerCount.xyz, inImageType);
 			phaseCount = hlsl::max(phaseCount,hlsl::uint32_t3(1,1,1));
-			const auto axisOffsets = blit_utils_t::template getScaledKernelPhasedLUTAxisOffsets(phaseCount,real_window_size);
+			const auto axisOffsets = blit_utils_t::getScaledKernelPhasedLUTAxisOffsets(phaseCount,real_window_size);
 			constexpr auto MaxAxisCount = 3;
 			lut_value_t* scaledKernelPhasedLUTPixel[MaxAxisCount];
 			for (auto i = 0; i < MaxAxisCount; ++i)
diff --git a/include/nbl/asset/filters/kernels/WeightFunctions.h b/include/nbl/asset/filters/kernels/WeightFunctions.h
@@ -337,12 +337,12 @@ class CWeightFunction1D final : public impl::IWeightFunction1D<decltype(std::dec
 		inline void stretchAndScale(const float stretchFactor)
 		{
 			stretch(stretchFactor);
-			this->scale(base_t::value_t(1)/stretchFactor);
+			this->scale(typename base_t::value_t(1)/stretchFactor);
 		}
 
 		inline base_t::value_t weight(const float x) const
 		{
-			return static_cast<double>(this->getTotalScale()*function_t::weight<derivative>(x*this->getInvStretch()));
+			return static_cast<double>(this->getTotalScale()*function_t::template weight<derivative>(x*this->getInvStretch()));
 		}
 
 		// Integral of `weight(x) dx` from -INF to +INF
diff --git a/include/nbl/asset/utils/CSPIRVIntrospector.h b/include/nbl/asset/utils/CSPIRVIntrospector.h
@@ -208,7 +208,13 @@ class NBL_API2 CSPIRVIntrospector : public core::Uncopyable
 						// `memberStrides[i]` only relevant if `memberTypes[i]->isArray()`
 						inline ptr_t<member_stride_t,Mutable> memberStrides() const {return memberOffsets()+memberCount;}
 						using member_matrix_info_t = MatrixInfo;
-						inline ptr_t<member_matrix_info_t,Mutable> memberMatrixInfos() const {return reinterpret_cast<ptr_t<member_matrix_info_t,Mutable>&>(memberStrides()+memberCount); }
+						inline ptr_t<member_matrix_info_t,Mutable> memberMatrixInfos() const 
+						{
+							auto t = memberStrides() + memberCount;
+
+							return reinterpret_cast<ptr_t<member_matrix_info_t,Mutable>&>(t);
+						
+						}
 
 						constexpr static inline size_t StoragePerMember = sizeof(member_type_t)+sizeof(member_name_t)+sizeof(member_size_t)+sizeof(member_offset_t)+sizeof(member_stride_t)+sizeof(member_matrix_info_t);
 
diff --git a/include/nbl/video/ILogicalDevice.h b/include/nbl/video/ILogicalDevice.h
@@ -1502,7 +1502,7 @@ inline bool ILogicalDevice::validateMemoryBarrier(const uint32_t queueFamilyInde
             return false;
         };
         // CANNOT CHECK: https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkImageMemoryBarrier2-oldLayout-01197
-        if (mismatchedLayout.operator()<false>(barrier.oldLayout) || mismatchedLayout.operator()<true>(barrier.newLayout))
+        if (mismatchedLayout.template operator()<false>(barrier.oldLayout) || mismatchedLayout.template operator()<true>(barrier.newLayout))
             return false;
     }
 
diff --git a/include/nbl/video/utilities/CSubpassKiln.h b/include/nbl/video/utilities/CSubpassKiln.h
@@ -198,7 +198,7 @@ class CSubpassKiln
             if (begin==end)
                 return;
 
-            bake_impl(cmdbuf->getOriginDevice()->getPhysicalDevice()->getLimits().indirectDrawCount, drawIndirectBuffer, drawCountBuffer)(cmdbuf, begin, end);
+            bake_impl(cmdbuf->getOriginDevice()->getPhysicalDevice()->getLimits().drawIndirectCount, drawIndirectBuffer, drawCountBuffer)(cmdbuf, begin, end);
         }
 
     protected:
diff --git a/src/nbl/video/CVulkanCommandBuffer.cpp b/src/nbl/video/CVulkanCommandBuffer.cpp
@@ -661,7 +661,7 @@ bool CVulkanCommandBuffer::beginRenderPass_impl(const SRenderpassBeginInfo& info
         .renderArea = info.renderArea,
         // Implicitly but could be optimizedif needed
         // https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkRenderPassBeginInfo.html#VUID-VkRenderPassBeginInfo-clearValueCount-00902
-        .clearValueCount = vk_clearValues.size()/sizeof(VkClearValue),
+        .clearValueCount = static_cast<uint32_t>(vk_clearValues.size()/sizeof(VkClearValue)),
         // Implicit
         // https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkRenderPassBeginInfo.html#VUID-VkRenderPassBeginInfo-clearValueCount-04962
         .pClearValues = vk_clearValues.data()
diff --git a/src/nbl/video/CVulkanDeviceMemoryBacked.cpp b/src/nbl/video/CVulkanDeviceMemoryBacked.cpp
@@ -40,7 +40,7 @@ CVulkanDeviceMemoryBacked<Interface>::CVulkanDeviceMemoryBacked(
     assert(vkHandle!=VK_NULL_HANDLE);
 }
 
-template CVulkanDeviceMemoryBacked<IGPUBuffer>;
-template CVulkanDeviceMemoryBacked<IGPUImage>;
+template class CVulkanDeviceMemoryBacked<IGPUBuffer>;
+template class CVulkanDeviceMemoryBacked<IGPUImage>;
 
 }
diff --git a/src/nbl/video/IGPUAccelerationStructure.cpp b/src/nbl/video/IGPUAccelerationStructure.cpp
@@ -140,11 +140,11 @@ uint32_t IGPUBottomLevelAccelerationStructure::BuildInfo<BufferType>::valid(cons
 	retval += geometryCount*MaxBuffersPerGeometry;
 	return retval;
 }
-template uint32_t IGPUBottomLevelAccelerationStructure::BuildInfo<IGPUBuffer>::template valid<uint32_t>(const uint32_t* const) const;
-template uint32_t IGPUBottomLevelAccelerationStructure::BuildInfo<asset::ICPUBuffer>::template valid<uint32_t>(const uint32_t* const) const;
+template uint32_t IGPUBottomLevelAccelerationStructure::BuildInfo<IGPUBuffer>::valid<uint32_t>(const uint32_t* const) const;
+template uint32_t IGPUBottomLevelAccelerationStructure::BuildInfo<asset::ICPUBuffer>::valid<uint32_t>(const uint32_t* const) const;
 using BuildRangeInfo = hlsl::acceleration_structures::bottom_level::BuildRangeInfo;
-template uint32_t IGPUBottomLevelAccelerationStructure::BuildInfo<IGPUBuffer>::template valid<BuildRangeInfo>(const BuildRangeInfo* const) const;
-template uint32_t IGPUBottomLevelAccelerationStructure::BuildInfo<asset::ICPUBuffer>::template valid<BuildRangeInfo>(const BuildRangeInfo* const) const;
+template uint32_t IGPUBottomLevelAccelerationStructure::BuildInfo<IGPUBuffer>::valid<BuildRangeInfo>(const BuildRangeInfo* const) const;
+template uint32_t IGPUBottomLevelAccelerationStructure::BuildInfo<asset::ICPUBuffer>::valid<BuildRangeInfo>(const BuildRangeInfo* const) const;
 
 bool IGPUBottomLevelAccelerationStructure::validVertexFormat(const asset::E_FORMAT format) const
 {
diff --git a/src/nbl/video/utilities/CAssetConverter.cpp b/src/nbl/video/utilities/CAssetConverter.cpp
@@ -2142,7 +2142,7 @@ auto CAssetConverter::reserve(const SInputs& inputs) -> SReserveResult
 			{
 				for (auto& entry : conversionRequests)
 				for (auto i=0ull; i<entry.second.copyCount; i++)
-					assign.operator()<true>(entry.first,entry.second.firstCopyIx,i,device->createSampler(entry.second.canonicalAsset->getParams()));
+					assign.template operator()<true>(entry.first,entry.second.firstCopyIx,i,device->createSampler(entry.second.canonicalAsset->getParams()));
 			}
 			if constexpr (std::is_same_v<AssetType,ICPUBuffer>)
 			{
@@ -2461,7 +2461,7 @@ auto CAssetConverter::reserve(const SInputs& inputs) -> SReserveResult
 					{
 						// since we don't have dependants we don't care about our group ID
 						// we create threadsafe pipeline caches, because we have no idea how they may be used
-						assign.operator()<true>(entry.first,entry.second.firstCopyIx,i,device->createPipelineCache(asset,false));
+						assign.template operator()<true>(entry.first,entry.second.firstCopyIx,i,device->createPipelineCache(asset,false));
 					}
 				}
 			}
@@ -2506,7 +2506,7 @@ auto CAssetConverter::reserve(const SInputs& inputs) -> SReserveResult
 					{
 						// since we don't have dependants we don't care about our group ID
 						// we create threadsafe pipeline caches, because we have no idea how they may be used
-						assign.operator()<true>(entry.first,entry.second.firstCopyIx,i,device->createRenderpass(asset->getCreationParameters()));
+						assign.template operator()<true>(entry.first,entry.second.firstCopyIx,i,device->createRenderpass(asset->getCreationParameters()));
 					}
 				}
 			}
@@ -2653,7 +2653,7 @@ auto CAssetConverter::reserve(const SInputs& inputs) -> SReserveResult
 						gpuObj.get()->setObjectDebugName(debugName.str().c_str());
 					}
 					// insert into staging cache
-					stagingCache.emplace(gpuObj.get(),CCache<AssetType>::key_t(contentHash,uniqueCopyGroupID));
+					stagingCache.emplace(gpuObj.get(),typename CCache<AssetType>::key_t(contentHash,uniqueCopyGroupID));
 					// propagate back to dfsCache
 					created.gpuObj = std::move(gpuObj);
 					// record if a device memory allocation will be needed
@@ -2668,11 +2668,11 @@ auto CAssetConverter::reserve(const SInputs& inputs) -> SReserveResult
 					// this is super annoying, was hoping metaprogramming with `has_type` would actually work
 					auto getConversionRequests = [&]<typename AssetU>()->auto&{return std::get<SReserveResult::conversion_requests_t<AssetU>>(retval.m_conversionRequests);};
 					if constexpr (std::is_same_v<AssetType,ICPUBuffer>)
-						getConversionRequests.operator()<ICPUBuffer>().emplace_back(core::smart_refctd_ptr<const AssetType>(instance.asset),created.gpuObj.get());;
+						getConversionRequests.template operator()<ICPUBuffer>().emplace_back(core::smart_refctd_ptr<const AssetType>(instance.asset),created.gpuObj.get());;
 					if constexpr (std::is_same_v<AssetType,ICPUImage>)
 					{
 						const uint16_t recomputeMips = created.patch.recomputeMips;
-						getConversionRequests.operator()<ICPUImage>().emplace_back(core::smart_refctd_ptr<const AssetType>(instance.asset),created.gpuObj.get(),recomputeMips);
+						getConversionRequests.template operator()<ICPUImage>().emplace_back(core::smart_refctd_ptr<const AssetType>(instance.asset),created.gpuObj.get(),recomputeMips);
 					}
 					// TODO: BLAS and TLAS requests
 				}
@@ -2939,7 +2939,7 @@ auto CAssetConverter::reserve(const SInputs& inputs) -> SReserveResult
 				// if something with this content hash is in the stagingCache, then it must match the `found->gpuObj`
 				if (auto finalCacheIt=stagingCache.find(gpuObj.get()); finalCacheIt!=stagingCache.end())
 				{
-					const bool matches = finalCacheIt->second==CCache<AssetType>::key_t(found.contentHash,uniqueCopyGroupID);
+					const bool matches = finalCacheIt->second==typename CCache<AssetType>::key_t(found.contentHash,uniqueCopyGroupID);
 					assert(matches);
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -337,12 +337,12 @@ class CWeightFunction1D final : public impl::IWeightFunction1D<decltype(std::dec`
`337`	`337`	`inline void stretchAndScale(const float stretchFactor)`
`338`	`338`	`{`
`339`	`339`	`stretch(stretchFactor);`
`340`		`- this->scale(base_t::value_t(1)/stretchFactor);`
	`340`	`+ this->scale(typename base_t::value_t(1)/stretchFactor);`
`341`	`341`	`}`
`342`	`342`
`343`	`343`	`inline base_t::value_t weight(const float x) const`
`344`	`344`	`{`
`345`		`- return static_cast<double>(this->getTotalScale()function_t::weight<derivative>(xthis->getInvStretch()));`
	`345`	`+ return static_cast<double>(this->getTotalScale()function_t::template weight<derivative>(xthis->getInvStretch()));`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	// Integral of `weight(x) dx` from -INF to +INF
Original file line number	Diff line number	Diff line change
`@@ -1502,7 +1502,7 @@ inline bool ILogicalDevice::validateMemoryBarrier(const uint32_t queueFamilyInde`
`1502`	`1502`	`return false;`
`1503`	`1503`	`};`
`1504`	`1504`	`// CANNOT CHECK: https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkImageMemoryBarrier2-oldLayout-01197`
`1505`		`- if (mismatchedLayout.operator()<false>(barrier.oldLayout) \|\| mismatchedLayout.operator()<true>(barrier.newLayout))`
	`1505`	`+ if (mismatchedLayout.template operator()<false>(barrier.oldLayout) \|\| mismatchedLayout.template operator()<true>(barrier.newLayout))`
`1506`	`1506`	`return false;`
`1507`	`1507`	`}`
`1508`	`1508`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ class CSubpassKiln`
`198`	`198`	`if (begin==end)`
`199`	`199`	`return;`
`200`	`200`
`201`		`- bake_impl(cmdbuf->getOriginDevice()->getPhysicalDevice()->getLimits().indirectDrawCount, drawIndirectBuffer, drawCountBuffer)(cmdbuf, begin, end);`
	`201`	`+ bake_impl(cmdbuf->getOriginDevice()->getPhysicalDevice()->getLimits().drawIndirectCount, drawIndirectBuffer, drawCountBuffer)(cmdbuf, begin, end);`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`protected:`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ CVulkanDeviceMemoryBacked<Interface>::CVulkanDeviceMemoryBacked(`
`40`	`40`	`assert(vkHandle!=VK_NULL_HANDLE);`
`41`	`41`	`}`
`42`	`42`
`43`		`-template CVulkanDeviceMemoryBacked<IGPUBuffer>;`
`44`		`-template CVulkanDeviceMemoryBacked<IGPUImage>;`
	`43`	`+template class CVulkanDeviceMemoryBacked<IGPUBuffer>;`
	`44`	`+template class CVulkanDeviceMemoryBacked<IGPUImage>;`
`45`	`45`
`46`	`46`	`}`