Change get shader group handle api to return span

Author: kevyuu

include/nbl/asset/IRayTracingPipeline.h

@@ -178,9 +178,6 @@ class IRayTracingPipeline : public IPipeline<PipelineLayoutType>, public IRayTra
     };
 
     inline const SCachedCreationParams& getCachedCreationParams() const { return m_params; }
-    inline uint32_t getHitGroupCount() const { return m_hitShaderGroups->size(); }
-    inline uint32_t getMissGroupCount() const { return m_missShaderGroups->size(); }
-    inline uint32_t getCallableGroupCount() const { return m_callableShaderGroups->size(); }
 
   protected:
     explicit IRayTracingPipeline(const SCreationParams& _params) :

include/nbl/video/CVulkanRayTracingPipeline.h

@@ -31,9 +31,9 @@ class CVulkanRayTracingPipeline final : public IGPURayTracingPipeline
     inline VkPipeline getInternalObject() const { return m_vkPipeline; }
 
     virtual const SShaderGroupHandle& getRaygen() const override;
-    virtual const SShaderGroupHandle& getMiss(uint32_t index) const override;
-    virtual const SShaderGroupHandle& getHit(uint32_t index) const override;
-    virtual const SShaderGroupHandle& getCallable(uint32_t index) const override;
+    virtual std::span<const SShaderGroupHandle> getMissHandles() const override;
+    virtual std::span<const SShaderGroupHandle> getHitHandles() const override;
+    virtual std::span<const SShaderGroupHandle> getCallableHandles() const override;
 
     virtual uint16_t getRaygenStackSize() const override;
     virtual std::span<const uint16_t> getMissStackSizes() const override;

include/nbl/video/IGPURayTracingPipeline.h

@@ -71,9 +71,9 @@ class IGPURayTracingPipeline : public IBackendObject, public asset::IRayTracingP
         virtual const void* getNativeHandle() const = 0;
 
         virtual const SShaderGroupHandle& getRaygen() const = 0;
-        virtual const SShaderGroupHandle& getMiss(uint32_t index) const = 0;
-        virtual const SShaderGroupHandle& getHit(uint32_t index) const = 0;
-        virtual const SShaderGroupHandle& getCallable(uint32_t index) const = 0;
+        virtual std::span<const SShaderGroupHandle> getMissHandles() const = 0;
+        virtual std::span<const SShaderGroupHandle> getHitHandles() const = 0;
+        virtual std::span<const SShaderGroupHandle> getCallableHandles() const = 0;
 
         virtual uint16_t getRaygenStackSize() const = 0;
         virtual std::span<const uint16_t> getMissStackSizes() const = 0;

src/nbl/video/CVulkanRayTracingPipeline.cpp

@@ -5,6 +5,7 @@
 #include "nbl/video/IGPURayTracingPipeline.h"
 
 #include <algorithm>
+#include <span>
 
 namespace nbl::video
 {
@@ -84,22 +85,22 @@ namespace nbl::video
   return m_shaderGroupHandles->operator[](getRaygenIndex());
   }
 
-  const IGPURayTracingPipeline::SShaderGroupHandle& CVulkanRayTracingPipeline::getMiss(uint32_t index) const
+  std::span<const IGPURayTracingPipeline::SShaderGroupHandle> CVulkanRayTracingPipeline::getMissHandles() const
   {
     const auto baseIndex = getMissBaseIndex();
-    return m_shaderGroupHandles->operator[](baseIndex + index);
+    return std::span(m_shaderGroupHandles->begin() + baseIndex, m_missShaderGroups->size());
   }
 
-  const IGPURayTracingPipeline::SShaderGroupHandle& CVulkanRayTracingPipeline::getHit(uint32_t index) const
+  std::span<const IGPURayTracingPipeline::SShaderGroupHandle> CVulkanRayTracingPipeline::getHitHandles() const
   {
     const auto baseIndex = getHitBaseIndex();
-    return m_shaderGroupHandles->operator[](baseIndex + index);
+    return std::span(m_shaderGroupHandles->begin() + baseIndex, m_hitShaderGroups->size());
   }
 
-  const IGPURayTracingPipeline::SShaderGroupHandle& CVulkanRayTracingPipeline::getCallable(uint32_t index) const
+  std::span<const IGPURayTracingPipeline::SShaderGroupHandle> CVulkanRayTracingPipeline::getCallableHandles() const
   {
     const auto baseIndex = getCallableBaseIndex();
-    return m_shaderGroupHandles->operator[](baseIndex + index);
+    return std::span(m_shaderGroupHandles->begin() + baseIndex, m_callableShaderGroups->size());
   }
 
   uint16_t CVulkanRayTracingPipeline::getRaygenStackSize() const
@@ -152,13 +153,13 @@ namespace nbl::video
   uint32_t CVulkanRayTracingPipeline::getHitBaseIndex() const
   {
     // one raygen group + miss groups before this groups
-    return 1 + getMissGroupCount();
+    return 1 + m_missShaderGroups->size();
   }
 
   uint32_t CVulkanRayTracingPipeline::getCallableBaseIndex() const
   {
     // one raygen group + miss groups + hit groups before this groups
-    return 1 + getMissGroupCount() + getHitGroupCount(); 
+    return 1 + m_missShaderGroups->size() + m_hitShaderGroups->size();
   }
 
 }