making sure our headers don't mess up external projects (core::min and core::max always need template parameters)

Author: devshgraphicsprogramming

include/IDriver.h

@@ -337,7 +337,7 @@ class IDriver : public virtual core::IReferenceCounted, public IVideoCapabilityR
                 const void* dataPtr = reinterpret_cast<const uint8_t*>(data)+uploadedSize;
                 uint32_t localOffset = video::StreamingTransientDataBufferMT<>::invalid_address;
                 uint32_t alignment = 64u; // smallest mapping alignment capability
-                uint32_t subSize = static_cast<uint32_t>(core::min(core::alignDown(defaultUploadBuffer.get()->max_size(),alignment),size-uploadedSize));
+                uint32_t subSize = static_cast<uint32_t>(core::min<uint32_t>(core::alignDown(defaultUploadBuffer.get()->max_size(),alignment),size-uploadedSize));
 
                 defaultUploadBuffer.get()->multi_place(std::chrono::microseconds(500u),1u,(const void* const*)&dataPtr,&localOffset,&subSize,&alignment);
                 // keep trying again

include/IDriverMemoryBacked.h

@@ -70,8 +70,8 @@ class IDriverMemoryBacked : public virtual core::IReferenceCounted
             if (!isPowerOfTwo(a.vulkanReqs.alignment) || !isPowerOfTwo(b.vulkanReqs.alignment))
                 return false;
 
-            out.vulkanReqs.size = std::max(a.vulkanReqs.size,b.vulkanReqs.size);
-            out.vulkanReqs.alignment = std::max(a.vulkanReqs.alignment,b.vulkanReqs.alignment);
+            out.vulkanReqs.size = std::max<uint32_t>(a.vulkanReqs.size,b.vulkanReqs.size);
+            out.vulkanReqs.alignment = std::max<uint32_t>(a.vulkanReqs.alignment,b.vulkanReqs.alignment);
             out.vulkanReqs.memoryTypeBits = a.vulkanReqs.memoryTypeBits&b.vulkanReqs.memoryTypeBits;
             if (out.vulkanReqs.memoryTypeBits!=0u)
                 return false;

include/IFileSystem.h

@@ -241,9 +241,9 @@ class IFileSystem : public virtual core::IReferenceCounted
 		//! Determines if a file exists and could be opened.
 		/** \param filename is the string identifying the file which should be tested for existence.
 		\return True if file exists, and false if it does not exist or an error occured. */
-		virtual bool existFile(const path& filename) const =0;
-
-
+		virtual bool existFile(const path& filename) const =0;
+
+
 		//! Run-time resource ID, `builtinPath` includes the "irr/builtin" prefix
 		inline core::smart_refctd_ptr<asset::ICPUBuffer> loadBuiltinData(const std::string& builtinPath)
 		{
@@ -275,7 +275,7 @@ class IFileSystem : public virtual core::IReferenceCounted
 				}
 				return nullptr;
 			#endif
-		}
+		}
 		//! Compile time resource ID
 		template<typename StringUniqueType>
 		inline core::smart_refctd_ptr<asset::ICPUBuffer> loadBuiltinData()
@@ -292,8 +292,8 @@ class IFileSystem : public virtual core::IReferenceCounted
 			#else
 				return loadBuiltinData(StringUniqueType::value);
 			#endif
-		}
-
+		}
+
 
 		//! Get the directory a file is located in.
 		/** \param filename: The file to get the directory from.
@@ -303,18 +303,18 @@ class IFileSystem : public virtual core::IReferenceCounted
 			// find last forward or backslash
 			int32_t lastSlash = filename.findLast('/');
 			const int32_t lastBackSlash = filename.findLast('\\'); //! Just remove those '\' on Linux
-			lastSlash = core::max(lastSlash, lastBackSlash);
+			lastSlash = core::max<int32_t>(lastSlash, lastBackSlash);
 
 			if ((uint32_t)lastSlash < filename.size())
 				return filename.subString(0, lastSlash);
 			else
 				return path(".");
-		}
+		}
 
 		//! flatten a path and file name for example: "/you/me/../." becomes "/you"
 		static inline path flattenFilename(const path& _directory, const path& root="/")
-		{
-			auto directory(_directory);
+		{
+			auto directory(_directory);
 			handleBackslashes(&directory);
 
 			io::path dir;
@@ -363,19 +363,19 @@ class IFileSystem : public virtual core::IReferenceCounted
 				process();
 			}
 			return dir;
-		}
+		}
 
 		//! Get the base part of a filename, i.e. the name without the directory part.
 		/** If no directory is prefixed, the full name is returned.
 		\param filename: The file to get the basename from
 		\param keepExtension True if filename with extension is returned otherwise everything
 		after the final '.' is removed as well. */
-		static inline path getFileBasename(const path& filename, bool keepExtension=true)
+		static inline path getFileBasename(const path& filename, bool keepExtension=true)
 		{
 			// find last forward or backslash
 			int32_t lastSlash = filename.findLast('/');
 			const int32_t lastBackSlash = filename.findLast('\\'); //! Just remove those '\' on Linux
-			lastSlash = core::max(lastSlash, lastBackSlash);
+			lastSlash = core::max<int32_t>(lastSlash, lastBackSlash);
 
 			// get number of chars after last dot
 			int32_t end = 0;
@@ -395,7 +395,7 @@ class IFileSystem : public virtual core::IReferenceCounted
 			else if (end != 0)
 				return filename.subString(0, filename.size()-end);
 			else
-				return filename;
+				return filename;
 		}
 
 	protected:

include/irr/asset/ICPUVirtualTexture.h

@@ -61,7 +61,7 @@ class ICPUVirtualTexture final : public IVirtualTexture<ICPUImageView, ICPUSampl
     {
         const auto& params = _img->getCreationParameters();
         const auto originalExtent = params.extent;
-        const uint32_t paddedExtent = core::roundUpToPoT(std::max(params.extent.width,params.extent.height));
+        const uint32_t paddedExtent = core::roundUpToPoT(std::max<uint32_t>(params.extent.width,params.extent.height));
 
         //create PoT and square image with regions for all mips
         ICPUImage::SCreationParams paddedParams = params;
@@ -167,7 +167,7 @@ class ICPUVirtualTexture final : public IVirtualTexture<ICPUImageView, ICPUSampl
         const VkExtent3D extent = {_addr.origsize_x, _addr.origsize_y, 1u};
 
         const uint32_t levelsTakingAtLeastOnePageCount = countLevelsTakingAtLeastOnePage(extent);
-        const uint32_t levelsToPack = std::min(_subres.levelCount, m_pageTable->getCreationParameters().mipLevels+m_pgSzxy_log2);
+        const uint32_t levelsToPack = std::min<uint32_t>(_subres.levelCount, m_pageTable->getCreationParameters().mipLevels+m_pgSzxy_log2);
 
         uint32_t miptailPgAddr = SPhysPgOffset::invalid_addr;
 
@@ -233,9 +233,9 @@ class ICPUVirtualTexture final : public IVirtualTexture<ICPUImageView, ICPUSampl
                     copy.extentLayerCount = core::vectorSIMDu32(m_pgSzxy, m_pgSzxy, 1u, 1u);
                     copy.relativeOffset = {0u,0u,0u};
                     if (x == w-1u)
-                        copy.extentLayerCount.x = std::max(extent.width>>i,1u)-copy.inOffsetBaseLayer.x;
+                        copy.extentLayerCount.x = std::max<uint32_t>(extent.width>>i,1u)-copy.inOffsetBaseLayer.x;
                     if (y == h-1u)
-                        copy.extentLayerCount.y = std::max(extent.height>>i,1u)-copy.inOffsetBaseLayer.y;
+                        copy.extentLayerCount.y = std::max<uint32_t>(extent.height>>i,1u)-copy.inOffsetBaseLayer.y;
                     memcpy(&copy.paddedExtent.width,(copy.extentLayerCount+core::vectorSIMDu32(2u*m_tilePadding)).pointer, 2u*sizeof(uint32_t));
                     copy.paddedExtent.depth = 1u;
                     if (w>1u)
@@ -293,7 +293,7 @@ class ICPUVirtualTexture final : public IVirtualTexture<ICPUImageView, ICPUSampl
         {
             copy.inMipLevel = _subresRelativeToMaster.baseMipLevel+i;
             copy.outMipLevel = i;
-            copy.extent = {std::max(extent.width>>i,1u), std::max(extent.height>>i,1u), 1u};
+            copy.extent = {std::max<uint32_t>(extent.width>>i,1u), std::max<uint32_t>(extent.height>>i,1u), 1u};
             copy.inOffset = {static_cast<uint32_t>(_addr.pgTab_x>>(copy.inMipLevel)),static_cast<uint32_t>(_addr.pgTab_y>>(copy.inMipLevel)),0u};
             copy.outOffset = {static_cast<uint32_t>(aliasAddr.pgTab_x>>i), static_cast<uint32_t>(aliasAddr.pgTab_y>>i), 0u};
 
@@ -401,4 +401,4 @@ class ICPUVirtualTexture final : public IVirtualTexture<ICPUImageView, ICPUSampl
 
 }}
 
-#endif
+#endif

include/irr/asset/IDescriptorSet.h

@@ -74,7 +74,7 @@ class IDescriptorSet : public virtual core::IReferenceCounted
 
 				SDescriptorInfo()
 				{
-					memset(&buffer, 0, std::max(sizeof(buffer), sizeof(image)));
+					memset(&buffer, 0, core::max<size_t>(sizeof(buffer), sizeof(image)));
 				}
 				~SDescriptorInfo()
 				{
@@ -195,4 +195,4 @@ class IEmulatedDescriptorSet
 }
 }
 
-#endif
+#endif

include/irr/asset/IImage.h

@@ -219,10 +219,10 @@ class IImage : public IDescriptor
 			switch (type)
 			{
 				case ET_3D:
-					maxSideLen = core::max(extent.depth,maxSideLen);
+					maxSideLen = core::max<uint32_t>(extent.depth,maxSideLen);
 					_IRR_FALLTHROUGH;
 				case ET_2D:
-					maxSideLen = core::max(extent.height,maxSideLen);
+					maxSideLen = core::max<uint32_t>(extent.height,maxSideLen);
 					break;
 				default:
 					break;
@@ -446,11 +446,14 @@ class IImage : public IDescriptor
 		//!
 		inline core::vector3du32_SIMD getMipSize(uint32_t level=0u) const
 		{
-			return core::max(	core::vector3du32_SIMD(	params.extent.width,
-														params.extent.height,
-														params.extent.depth)
-										/ (0x1u<<level),
-								core::vector3du32_SIMD(1u,1u,1u));      
+			return	core::max<core::vector3du32_SIMD>(
+						core::vector3du32_SIMD(
+							params.extent.width,
+							params.extent.height,
+							params.extent.depth
+						)/(0x1u<<level),
+						core::vector3du32_SIMD(1u,1u,1u)
+					);      
 		}
 
 		//! Returns image data size in bytes

include/irr/asset/IPipelineLayout.h

@@ -39,7 +39,7 @@ struct SPushConstantRange
         const int32_t end1 = offset + size;
         const int32_t end2 = _other.offset + _other.size;
 
-        return (std::min(end1, end2) - std::max<int32_t>(offset, _other.offset)) > 0;
+        return (std::min<int32_t>(end1, end2) - std::max<int32_t>(offset, _other.offset)) > 0;
     }
 };
 
@@ -118,4 +118,4 @@ class IPipelineLayout
 }
 }
 
-#endif
+#endif

include/irr/asset/IVirtualTexture.h

@@ -202,7 +202,7 @@ class IVirtualTexture : public core::IReferenceCounted, public IVirtualTextureBa
         const uint32_t w = neededPageCountForSide(_w, _baseLevel);
         const uint32_t h = neededPageCountForSide(_h, _baseLevel);
 
-        return core::roundUpToPoT(std::max(w, h));
+        return core::roundUpToPoT(std::max<uint32_t>(w, h));
     }
 
     ISampler::SParams getPageTableSamplerParams() const
@@ -285,12 +285,12 @@ class IVirtualTexture : public core::IReferenceCounted, public IVirtualTextureBa
 
     uint32_t countLevelsTakingAtLeastOnePage(const VkExtent3D& _extent, uint32_t _baseLevel = 0u)
     {
-        const uint32_t baseMaxDim = core::roundUpToPoT(core::max(_extent.width, _extent.height))>>_baseLevel;
+        const uint32_t baseMaxDim = core::roundUpToPoT(core::max<uint32_t>(_extent.width, _extent.height))>>_baseLevel;
         const int32_t lastFullMip = core::findMSB(baseMaxDim-1u)+1 - static_cast<int32_t>(m_pgSzxy_log2);
 
         assert(lastFullMip<static_cast<int32_t>(m_pageTable->getCreationParameters().mipLevels));
 
-        return std::max(lastFullMip+1, 0);
+        return core::max<int32_t>(lastFullMip+1, 0);
     }
 
     //this is not static only because it has to call virtual member function
@@ -304,7 +304,7 @@ class IVirtualTexture : public core::IReferenceCounted, public IVirtualTextureBa
         params.arrayLayers = _pgTabLayers;
         params.extent = {pgTabSzxy,pgTabSzxy,1u};
         params.format = EF_R16G16_UINT;
-        params.mipLevels = std::max(static_cast<int32_t>(_maxAllocatableTexSz_log2-_pgSzxy_log2+1u), 1);
+        params.mipLevels = std::max<int32_t>(static_cast<int32_t>(_maxAllocatableTexSz_log2-_pgSzxy_log2+1u), 1);
         params.samples = IImage::ESCF_1_BIT;
         params.type = IImage::ET_2D;
         params.flags = static_cast<IImage::E_CREATE_FLAGS>(0);
@@ -393,7 +393,7 @@ class IVirtualTexture : public core::IReferenceCounted, public IVirtualTextureBa
     class IVTResidentStorage : public core::IReferenceCounted
     {
     protected:
-        _IRR_STATIC_INLINE_CONSTEXPR uint32_t MAX_TILES_PER_DIM = std::min(SPhysPgOffset::PAGE_ADDR_X_MASK,SPhysPgOffset::PAGE_ADDR_Y_MASK) + 1u;
+        _IRR_STATIC_INLINE_CONSTEXPR uint32_t MAX_TILES_PER_DIM = std::min<uint32_t>(SPhysPgOffset::PAGE_ADDR_X_MASK,SPhysPgOffset::PAGE_ADDR_Y_MASK) + 1u;
         _IRR_STATIC_INLINE_CONSTEXPR uint32_t MAX_LAYERS = (1u<<(SPhysPgOffset::PAGE_ADDR_BITLENGTH-SPhysPgOffset::PAGE_ADDR_LAYER_SHIFT));
 
         virtual ~IVTResidentStorage()
@@ -772,7 +772,7 @@ class IVirtualTexture : public core::IReferenceCounted, public IVirtualTextureBa
     //! @returns pointer to reserved space for allocators
     uint8_t* copyVirtualSpaceAllocatorsState(uint32_t _count, pg_tab_addr_alctr_t* _dstArray)
     {
-        _count = std::min(_count, m_pageTable->getCreationParameters().arrayLayers);
+        _count = std::min<uint32_t>(_count, m_pageTable->getCreationParameters().arrayLayers);
         const uint32_t bufSz = m_pageTableLayerAllocators[0].get_total_size();
         const uint32_t resSpcPerAlctr = pg_tab_addr_alctr_t::reserved_size(m_pageTableLayerAllocators[0].get_total_size(), m_pageTableLayerAllocators[0]);
         uint8_t* reservedSpc = reinterpret_cast<uint8_t*>( _IRR_ALIGNED_MALLOC(resSpcPerAlctr*_count, _IRR_SIMD_ALIGNMENT) );
@@ -830,7 +830,7 @@ class IVirtualTexture : public core::IReferenceCounted, public IVirtualTextureBa
     std::pair<uint32_t,uint32_t> getDSlayoutBindings_internal(typename DSlayout_t::SBinding* _outBindings, core::smart_refctd_ptr<sampler_t>* _outSamplers, uint32_t _pgtBinding = 0u, uint32_t _fsamplersBinding = 1u, uint32_t _isamplersBinding = 2u, uint32_t _usamplersBinding = 3u) const
     {
         const uint32_t bindingCount = 1u+(getFloatViews().size()?1u:0u)+(getIntViews().size()?1u:0u)+(getUintViews().size()?1u:0u);
-        const uint32_t samplerCount = 1u+std::max(getFloatViews().size(), std::max(getIntViews().size(), getUintViews().size()));
+        const uint32_t samplerCount = 1u+std::max<uint32_t>(getFloatViews().size(), std::max<uint32_t>(getIntViews().size(), getUintViews().size()));
         if (!_outBindings || !_outSamplers)
             return std::make_pair(bindingCount, samplerCount);
 
@@ -1040,4 +1040,4 @@ bool IVirtualTexture<image_view_t, sampler_t>::SMiptailPacker::computeMiptailOff
 
 }}
 
-#endif
+#endif

include/irr/asset/filters/CBasicImageFilterCommon.h

@@ -79,8 +79,8 @@ class CBasicImageFilterCommon
 				const core::vector3du32_SIMD resultExtent(referenceRegion->imageExtent.width,referenceRegion->imageExtent.height,referenceRegion->imageExtent.depth,referenceRegion->imageSubresource.layerCount);
 				const auto resultLimit = resultOffset+resultExtent;
 
-				auto offset = core::max(targetOffset,resultOffset);
-				auto limit = core::min(targetLimit,resultLimit);
+				auto offset = core::max<core::vector3du32_SIMD>(targetOffset,resultOffset);
+				auto limit = core::min<core::vector3du32_SIMD>(targetLimit,resultLimit);
 				if ((offset>=limit).any())
 					return false;
 
@@ -257,4 +257,4 @@ class CBasicInOutImageFilterCommon : public CBasicImageFilterCommon
 } // end namespace asset
 } // end namespace irr
 
-#endif
+#endif

include/irr/asset/filters/CBlitImageFilter.h

@@ -299,7 +299,7 @@ class CBlitImageFilter : public CImageFilter<CBlitImageFilter<Kernel> >, public
 				const int32_t rankIndex = (inverseCoverage*core::rational<int32_t>(outputTexelCount)).getIntegerApprox()-1;
 				auto* const begin = intermediateStorage[(axis+1)%3];
 				// this is our new reference value
-				auto* const nth = begin+core::max(rankIndex,0);
+				auto* const nth = begin+core::max<int32_t>(rankIndex,0);
 				auto* const end = begin+outputTexelCount;
 				for (auto i=0; i<outputTexelCount; i++)
 				{
@@ -464,9 +464,9 @@ class CBlitImageFilter : public CImageFilter<CBlitImageFilter<Kernel> >, public
 			const auto inType = state->inImage->getCreationParameters().type;
 			const auto window_last = getKernelWindowLastCoord(state->contructScaledKernel(),inType);
 			// TODO: account for the size needed for coverage adjustment
-			auto texelCount = state->outExtent.width*core::max((state->inExtent.height+window_last[1])*(state->inExtent.depth+window_last[2]),state->outExtent.height*state->outExtent.depth);
+			auto texelCount = state->outExtent.width*core::max<uint32_t>((state->inExtent.height+window_last[1])*(state->inExtent.depth+window_last[2]),state->outExtent.height*state->outExtent.depth);
 			if (secondPong)
-				texelCount += core::max(state->outExtent.width*state->outExtent.height*(state->inExtent.depth+window_last[2]),state->inExtent.width+window_last[0]);
+				texelCount += core::max<uint32_t>(state->outExtent.width*state->outExtent.height*(state->inExtent.depth+window_last[2]),state->inExtent.width+window_last[0]);
 			//
 			return texelCount*Kernel::MaxChannels*sizeof(value_type);
 		}
@@ -475,4 +475,4 @@ class CBlitImageFilter : public CImageFilter<CBlitImageFilter<Kernel> >, public
 } // end namespace asset
 } // end namespace irr
 
-#endif
+#endif