apply fixes to uint8_t clamping of swapchain values

Author: Erfan-Ahmadi

examples_tests

@@ -24,7 +24,7 @@ class CVulkanSwapchain final : public ISwapchain
         inline VkSwapchainKHR getInternalObject() const {return m_vkSwapchainKHR;}
 
         // returns the maximum number of time acquire can be called without releasing the image index through present.
-        inline uint8_t getMaxBlockingAcquiresBeforePresent() const override { return static_cast<uint8_t>(m_maxBlockingAcquiresBeforePresent); }
+        inline uint8_t getMaxBlockingAcquiresBeforePresent() const override { return m_maxBlockingAcquiresBeforePresent; }
 
         // returns the maximum number of acquires you can request without waiting for previous acquire semaphores to signal.
         uint8_t getMaxAcquiresInFlight() const override { return getImageCount(); }
@@ -39,7 +39,7 @@ class CVulkanSwapchain final : public ISwapchain
             const VkSemaphore* const _acquireAdaptorSemaphores,
             const VkSemaphore* const _prePresentSemaphores,
             const VkSemaphore* const _presentAdaptorSemaphores,
-            const uint32_t maxAcquiresBeforePresent
+            const uint8_t maxAcquiresBeforePresent
         );
         ~CVulkanSwapchain();
 
@@ -58,7 +58,7 @@ class CVulkanSwapchain final : public ISwapchain
         uint64_t m_perImageAcquireCount[ISwapchain::MaxImages] = { 0 };
         // nasty way to fight UB of the Vulkan spec
         bool m_needToWaitIdle = true;
-        uint32_t m_maxBlockingAcquiresBeforePresent = 0u;
+        uint8_t m_maxBlockingAcquiresBeforePresent = 0u;
 };
 
 }

include/nbl/video/CVulkanSwapchain.h

@@ -151,7 +151,7 @@ core::smart_refctd_ptr<CVulkanSwapchain> CVulkanSwapchain::create(core::smart_re
     ISurface::SCapabilities caps = {};
     params.surface->getSurfaceCapabilitiesForPhysicalDevice(physDev, caps);
     // read https://registry.khronos.org/vulkan/specs/1.3-extensions/html/chap34.html#swapchain-acquire-forward-progress
-    const uint32_t maxAcquiresWithoutPresent = imageCount - caps.minImageCount + 1u;
+    const uint8_t maxAcquiresWithoutPresent = core::min(imageCount,ISwapchain::MaxImages) - caps.minImageCount + 1u;
 
     return core::smart_refctd_ptr<CVulkanSwapchain>(new CVulkanSwapchain(std::move(device),std::move(params),imageCount,std::move(oldSwapchain),vk_swapchain,semaphores+imageCount,semaphores,semaphores+2*imageCount, maxAcquiresWithoutPresent),core::dont_grab);
 }
@@ -165,7 +165,7 @@ CVulkanSwapchain::CVulkanSwapchain(
     const VkSemaphore* const _acquireAdaptorSemaphores,
     const VkSemaphore* const _prePresentSemaphores,
     const VkSemaphore* const _presentAdaptorSemaphores,
-    const uint32_t maxAcquiresBeforePresent) 
+    const uint8_t maxAcquiresBeforePresent) 
     : ISwapchain(std::move(logicalDevice),std::move(params),imageCount,std::move(oldSwapchain)),
     m_imgMemRequirements{.size=0,.memoryTypeBits=0x0u,.alignmentLog2=63,.prefersDedicatedAllocation=true,.requiresDedicatedAllocation=true}, m_vkSwapchainKHR(swapchain), m_maxBlockingAcquiresBeforePresent(maxAcquiresBeforePresent)
 {