Merge branch 'master' into ali_lib_shader

Author: alichraghi

3rdparty/Vulkan-Headers

@@ -200,6 +200,6 @@ function(nbl_adjust_flags)
 			list(APPEND _D_NBL_COMPILE_OPTIONS_ $<$<CONFIG:${NBL_MAP_CONFIGURATION_FROM}>:${NBL_TO_CONFIG_COMPILE_OPTIONS}>)
 		endforeach()
 
-		set_directory_properties(PROPERTIES COMPILE_OPTIONS ${_D_NBL_COMPILE_OPTIONS_})
+		set_directory_properties(PROPERTIES COMPILE_OPTIONS "${_D_NBL_COMPILE_OPTIONS_}")
 	endif()
 endfunction()

cmake/adjust/flags.cmake

@@ -516,13 +516,13 @@ struct static_cast_helper<To,emulated_float64_t<FastMath,FlushDenormToZero>,void
             if (exponent < 0)
                 return 0;
 
-            uint64_t unsignedOutput = ieee754::extractMantissa(v.data) & 1ull << ieee754::traits<float64_t>::mantissaBitCnt;
+            uint64_t unsignedOutput = ieee754::extractMantissa(v.data) | 1ull << ieee754::traits<float64_t>::mantissaBitCnt;
             const int shiftAmount = exponent - int(ieee754::traits<float64_t>::mantissaBitCnt);
 
             if (shiftAmount < 0)
-                unsignedOutput <<= -shiftAmount;
+                unsignedOutput >>= -shiftAmount;
             else
-                unsignedOutput >>= shiftAmount;
+                unsignedOutput <<= shiftAmount;
 
             if (is_signed<To>::value)
             {

examples_tests

@@ -1334,7 +1334,7 @@ inline bool ILogicalDevice::validateMemoryBarrier(const uint32_t queueFamilyInde
             NBL_LOG_ERROR("Invalid aspect mask");
             return false;
         }
-        if (bool(aspectMask.value & DepthStencilAspects))
+        if (!bool(aspectMask.value & DepthStencilAspects))
         {
             NBL_LOG_ERROR("Invalid aspect mask");
             return false;

include/nbl/builtin/hlsl/emulated/float64_t.hlsl

@@ -9,6 +9,18 @@ using namespace nbl;
 using namespace nbl::video;
 
 
+nbl::video::CVulkanCommandBuffer::~CVulkanCommandBuffer()
+{
+    const auto* vulkanDevice = static_cast<const CVulkanLogicalDevice*>(getOriginDevice());
+	auto* vk = vulkanDevice->getFunctionTable();
+
+    const auto* vulkanCmdPool = IBackendObject::device_compatibility_cast<const CVulkanCommandPool*>(getPool(), getOriginDevice());
+	assert(vulkanCmdPool);
+
+    vk->vk.vkFreeCommandBuffers(vulkanDevice->getInternalObject(), vulkanCmdPool->getInternalObject(), 1, &m_cmdbuf);
+    out_of_order_dtor();
+}
+
 const VolkDeviceTable& CVulkanCommandBuffer::getFunctionTable() const
 {
     return static_cast<const CVulkanLogicalDevice*>(getOriginDevice())->getFunctionTable()->vk;

include/nbl/video/ILogicalDevice.h

@@ -270,10 +270,7 @@ class CVulkanCommandBuffer final : public IGPUCommandBuffer
         }
 
     private:
-        virtual ~CVulkanCommandBuffer() final
-        {
-            out_of_order_dtor();
-        }
+        ~CVulkanCommandBuffer();
 
         const VolkDeviceTable& getFunctionTable() const;