Merge branch 'vulkan_1_3' of github.com:Devsh-Graphics-Programming/Nabla into blit

Author: theoreticalphysicsftw

3rdparty/dxc/dxc

@@ -45,7 +45,7 @@ std::function<void(SAssetBundle&)> makeAssetDisposeFunc(const IAssetManager* con
 	@see IAsset
 
 */
-class NBL_API2 IAssetManager : public core::IReferenceCounted, public core::QuitSignalling
+class NBL_API2 IAssetManager : public core::IReferenceCounted
 {
         // the point of those functions is that lambdas returned by them "inherits" friendship
         friend std::function<void(SAssetBundle&)> makeAssetGreetFunc(const IAssetManager* const _mgr);
@@ -150,8 +150,6 @@ class NBL_API2 IAssetManager : public core::IReferenceCounted, public core::Quit
     protected:
 		virtual ~IAssetManager()
 		{
-            quitEventHandler.execute();
-
 			for (size_t i = 0u; i < m_assetCache.size(); ++i)
 				if (m_assetCache[i])
 					delete m_assetCache[i];

examples_tests

@@ -96,7 +96,7 @@ class IFramebuffer
                     if (!attachments[i])
                         return true;
                     // https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkFramebufferCreateInfo.html#VUID-VkFramebufferCreateInfo-commonparent
-                    if (rp->isCompatibleDevicewise(attachments[i].get()))
+                    if (!rp->isCompatibleDevicewise(attachments[i].get()))
                         return true;
 
                     const auto& viewParams = attachments[i]->getCreationParameters();

include/IVideoCapabilityReporter.h

@@ -102,20 +102,14 @@ class IImageView : public IDescriptor
 				return false;
 
 			const auto& imgParams = _params.image->getCreationParameters();
-			/* TODO: LAter
-			image must have been created with a usage value containing at least one of VK_IMAGE_USAGE_SAMPLED_BIT,
-			VK_IMAGE_USAGE_STORAGE_BIT, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT,
-			VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT, VK_IMAGE_USAGE_SHADING_RATE_IMAGE_BIT_NV, or VK_IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT
-			if (imgParams.)
-				return false;
-			*/
-
+			#if 0 // extremely annoying
 			const auto kValidUsages = IImage::EUF_SAMPLED_BIT|IImage::EUF_STORAGE_BIT|
 				IImage::EUF_RENDER_ATTACHMENT_BIT|IImage::EUF_TRANSIENT_ATTACHMENT_BIT|IImage::EUF_INPUT_ATTACHMENT_BIT|
 				IImage::EUF_SHADING_RATE_ATTACHMENT_BIT|IImage::EUF_FRAGMENT_DENSITY_MAP_BIT;
 			// https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkImageViewCreateInfo.html#VUID-VkImageViewCreateInfo-image-04441
 			if ((imgParams.usage.value&kValidUsages)==0u)
 				return false;
+			#endif
 
 			const auto& subresourceRange = _params.subresourceRange;
 			// declared some usages but they are not a subset

include/IVideoDriver.h

@@ -1762,18 +1762,28 @@ inline value_type getFormatMaxValue(E_FORMAT format, uint32_t channel)
     {
         switch (format)
         {
-        case EF_BC6H_SFLOAT_BLOCK: return 32767;
-        case EF_BC6H_UFLOAT_BLOCK: return 65504;
-        default: break;
+            case EF_B10G11R11_UFLOAT_PACK32:
+                if (channel<=1)
+                    return 65520;
+                else if (channel==2)
+                    return 65504;
+                break;
+            case EF_E5B9G9R9_UFLOAT_PACK32:
+                if (channel<3)
+                    return 32704;
+                break;
+            case EF_BC6H_SFLOAT_BLOCK: return 32767;
+            case EF_BC6H_UFLOAT_BLOCK: return 65504;
+            default: break;
         }
 
         auto bytesPerChannel = (getBytesPerPixel(format)*core::rational(1,getFormatChannelCount(format))).getIntegerApprox();
         switch (bytesPerChannel)
         {
-        case 2u: return 65504;
-        case 4u: return FLT_MAX;
-        case 8u: return DBL_MAX;
-        default: break;
+            case 2u: return 65504;
+            case 4u: return FLT_MAX;
+            case 8u: return DBL_MAX;
+            default: break;
         }
     }
     return 0;
@@ -1882,44 +1892,47 @@ inline value_type getFormatPrecision(E_FORMAT format, uint32_t channel, value_ty
     else if (isFloatingPointFormat(format))
     {
         switch (format)
-        {
-        case EF_B10G11R11_UFLOAT_PACK32:
         {
             // unsigned values are always ordered as + 1
-            float f = std::abs(static_cast<float>(value));
-            int bitshft = channel == 2u ? 6 : 5;
-
-            uint16_t f16 = core::Float16Compressor::compress(f);
-            uint16_t enc = f16 >> bitshft;
-            uint16_t next_f16 = (enc + 1) << bitshft;
-
-            return core::Float16Compressor::decompress(next_f16) - f;
-        }
-        case EF_E5B9G9R9_UFLOAT_PACK32:
-            return 0; //TODO
-        default: break;
+            case EF_B10G11R11_UFLOAT_PACK32: [[fallthrough]];
+            case EF_E5B9G9R9_UFLOAT_PACK32: // TODO: probably need to change signature and take all values?
+            {
+                float f = std::abs(static_cast<float>(value));
+                int bitshift;
+                if (format==EF_B10G11R11_UFLOAT_PACK32)
+                    bitshift = channel==2u ? 6:5;
+                else
+                    bitshift = 4;
+
+                uint16_t f16 = core::Float16Compressor::compress(f);
+                uint16_t enc = f16 >> bitshift;
+                uint16_t next_f16 = (enc + 1) << bitshift;
+
+                return core::Float16Compressor::decompress(next_f16) - f;
+            }
+            default: break;
         }
         auto bytesPerChannel = (getBytesPerPixel(format)*core::rational(1,getFormatChannelCount(format))).getIntegerApprox();
         switch (bytesPerChannel)
         {
-        case 2u:
-        {
-            float f = std::abs(static_cast<float>(value));
-            uint16_t f16 = core::Float16Compressor::compress(f);
-            uint16_t dir = core::Float16Compressor::compress(2.f*(f+1.f));
-            return core::Float16Compressor::decompress( core::nextafter16(f16, dir) ) - f;
-        }
-        case 4u:
-        {
-            float f32 = std::abs(static_cast<float>(value));
-            return core::nextafter32(f32,2.f*(f32+1.f))-f32;
-        }
-        case 8u:
-        {
-            double f64 = std::abs(static_cast<double>(value));
-            return core::nextafter64(f64,2.0*(f64+1.0))-f64;
-        }
-        default: break;
+            case 2u:
+            {
+                float f = std::abs(static_cast<float>(value));
+                uint16_t f16 = core::Float16Compressor::compress(f);
+                uint16_t dir = core::Float16Compressor::compress(2.f*(f+1.f));
+                return core::Float16Compressor::decompress( core::nextafter16(f16, dir) ) - f;
+            }
+            case 4u:
+            {
+                float f32 = std::abs(static_cast<float>(value));
+                return core::nextafter32(f32,2.f*(f32+1.f))-f32;
+            }
+            case 8u:
+            {
+                double f64 = std::abs(static_cast<double>(value));
+                return core::nextafter64(f64,2.0*(f64+1.0))-f64;
+            }
+            default: break;
         }
     }
 

include/nbl/asset/IAssetManager.h

@@ -2488,6 +2488,7 @@ namespace asset
             inp >>= 52;
             inp &= 0x7ffull;
             inp -= (1023ull - 15ull);
+            // TODO: this is wrong, need to get maximum exponent across all 3 input values
             exp = (static_cast<uint32_t>(inp) << 27);
         }
         for (uint32_t i = 0u; i < 3u; ++i)

include/nbl/asset/IFramebuffer.h

@@ -53,7 +53,7 @@ inline T determinant(const matrix<T,N,M>& m)
 
 NBL_BIT_OP_GLM_PASSTHROUGH(findLSB,findLSB)
 
-NBL_BIT_OP_GLM_PASSTHROUGH(findMSB,findLSB)
+NBL_BIT_OP_GLM_PASSTHROUGH(findMSB,findMSB)
 
 // inverse not defined cause its implemented via hidden friend
 template<typename T, uint16_t N, uint16_t M>