correct bad validations, KHR instead of coe func usage etc.

Author: devshgraphicsprogramming

src/nbl/video/CVulkanCommandBuffer.cpp

@@ -431,7 +431,7 @@ bool CVulkanCommandBuffer::bindDescriptorSets_impl(const asset::E_PIPELINE_BIND_
         }
     }
     // with K slots you need at most (K+1)/2 calls
-    assert(bindCallsCount < (IGPUPipelineLayout::DESCRIPTOR_SET_COUNT-1)/2);
+    assert(bindCallsCount <= (IGPUPipelineLayout::DESCRIPTOR_SET_COUNT+1)/2);
     return true;
 }
 

src/nbl/video/CVulkanLogicalDevice.cpp

@@ -81,7 +81,7 @@ auto CVulkanLogicalDevice::waitForSemaphores(const std::span<const SSemaphoreWai
     waitInfo.semaphoreCount = semaphores.size();
     waitInfo.pSemaphores = semaphores.data();
     waitInfo.pValues = values.data();
-    switch (m_devf.vk.vkWaitSemaphoresKHR(m_vkdev,&waitInfo,timeout))
+    switch (m_devf.vk.vkWaitSemaphores(m_vkdev,&waitInfo,timeout))
     {
         case VK_SUCCESS:
             return WAIT_RESULT::SUCCESS;

src/nbl/video/CVulkanQueue.cpp

@@ -60,7 +60,7 @@ auto CVulkanQueue::submit_impl(const std::span<const IQueue::SSubmitInfo> _submi
     core::vector<VkSubmitInfo2> submits(_submits.size(),{VK_STRUCTURE_TYPE_SUBMIT_INFO_2_KHR,/*No interesting extensions*/nullptr,/*No protected stuff yet*/0});
     core::vector<VkSemaphoreSubmitInfoKHR> waitSemaphores(waitSemCnt);
     core::vector<VkCommandBufferSubmitInfoKHR> commandBuffers(cmdBufCnt,{VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO_KHR,nullptr});
-    core::vector<VkSemaphoreSubmitInfoKHR> signalSemaphores(waitSemCnt);
+    core::vector<VkSemaphoreSubmitInfoKHR> signalSemaphores(signalSemCnt);
 
     auto outSubmitInfo = submits.data();
     auto outWaitSemaphoreInfo = waitSemaphores.data();
@@ -84,7 +84,7 @@ auto CVulkanQueue::submit_impl(const std::span<const IQueue::SSubmitInfo> _submi
         outSubmitInfo->signalSemaphoreInfoCount = fillSemaphoreInfo(submit.signalSemaphores,outSignalSemaphoreInfo);
         outSubmitInfo++;
     }
-    const auto vk_result = static_cast<const CVulkanLogicalDevice*>(m_originDevice)->getFunctionTable()->vk.vkQueueSubmit2KHR(m_vkQueue,submits.size(),submits.data(),VK_NULL_HANDLE);
+    const auto vk_result = static_cast<const CVulkanLogicalDevice*>(m_originDevice)->getFunctionTable()->vk.vkQueueSubmit2(m_vkQueue,submits.size(),submits.data(),VK_NULL_HANDLE);
     return getResultFrom(vk_result);
 }
 

src/nbl/video/IGPUCommandBuffer.cpp

@@ -164,7 +164,10 @@ bool IGPUCommandBuffer::reset(const core::bitflag<RESET_FLAGS> flags)
 bool IGPUCommandBuffer::end()
 {
     const bool whollyInsideRenderpass = m_recordingFlags.hasFlags(USAGE::RENDER_PASS_CONTINUE_BIT);
-    if (!checkStateBeforeRecording(whollyInsideRenderpass ? queue_flags_t::GRAPHICS_BIT:queue_flags_t::NONE,whollyInsideRenderpass ? RENDERPASS_SCOPE::INSIDE:RENDERPASS_SCOPE::OUTSIDE))
+    auto allowedQueueCaps = queue_flags_t::GRAPHICS_BIT;
+    if (!whollyInsideRenderpass)
+        allowedQueueCaps |= queue_flags_t::COMPUTE_BIT|queue_flags_t::TRANSFER_BIT;
+    if (!checkStateBeforeRecording(allowedQueueCaps,whollyInsideRenderpass ? RENDERPASS_SCOPE::INSIDE:RENDERPASS_SCOPE::OUTSIDE))
         return false;
 
     m_state = STATE::EXECUTABLE;