make populateExecutableInfo virtual, move validation to ILogicalDevice

Author: karimsayedre

include/nbl/video/CVulkanRayTracingPipeline.h

@@ -25,7 +25,7 @@ class CVulkanRayTracingPipeline final : public IGPURayTracingPipeline
 
     inline VkPipeline getInternalObject() const { return m_vkPipeline; }
 
-    void populateExecutableInfo(bool includeInternalRepresentations);
+    void populateExecutableInfo(bool includeInternalRepresentations) override;
 
     virtual const SShaderGroupHandle& getRaygen() const override;
     virtual std::span<const SShaderGroupHandle> getMissHandles() const override;

include/nbl/video/IGPUPipeline.h

@@ -158,6 +158,8 @@ class IGPUPipeline : public IBackendObject, public PipelineNonBackendObjectBase,
         {}
         virtual ~IGPUPipeline() = default;
 
+        virtual void populateExecutableInfo(bool includeInternalRepresentations) = 0;
+
 };
 
 }

src/nbl/video/CVulkanComputePipeline.h

@@ -17,13 +17,17 @@ class CVulkanComputePipeline final : public IGPUComputePipeline
         CVulkanComputePipeline(
             const SCreationParams& params,
             const VkPipeline pipeline
-        ) : IGPUComputePipeline(params), m_pipeline(pipeline) {}
+        ) : IGPUComputePipeline(params), m_pipeline(pipeline)
+        {
+            if (params.flags.hasFlags(SCreationParams::FLAGS::CAPTURE_STATISTICS))
+                populateExecutableInfo(params.flags.hasFlags(SCreationParams::FLAGS::CAPTURE_INTERNAL_REPRESENTATIONS));
+        }
 
         inline const void* getNativeHandle() const override { return &m_pipeline; }
 
         inline VkPipeline getInternalObject() const { return m_pipeline; }
 
-        void populateExecutableInfo(bool includeInternalRepresentations);
+        void populateExecutableInfo(bool includeInternalRepresentations) override;
 
         void setObjectDebugName(const char* label) const override;
 

src/nbl/video/CVulkanGraphicsPipeline.h

@@ -12,13 +12,17 @@ class CVulkanGraphicsPipeline final : public IGPUGraphicsPipeline
 {
     public:
         CVulkanGraphicsPipeline(const SCreationParams& params, const VkPipeline vk_pipeline) :
-            IGPUGraphicsPipeline(params), m_vkPipeline(vk_pipeline) {}
+            IGPUGraphicsPipeline(params), m_vkPipeline(vk_pipeline)
+        {
+            if (params.flags.hasFlags(SCreationParams::FLAGS::CAPTURE_STATISTICS))
+                populateExecutableInfo(params.flags.hasFlags(SCreationParams::FLAGS::CAPTURE_INTERNAL_REPRESENTATIONS));
+        }
 
         inline const void* getNativeHandle() const override {return &m_vkPipeline;}
 
         inline VkPipeline getInternalObject() const {return m_vkPipeline;}
 
-        void populateExecutableInfo(bool includeInternalRepresentations);
+        void populateExecutableInfo(bool includeInternalRepresentations) override;
 
     private:
         ~CVulkanGraphicsPipeline();

src/nbl/video/CVulkanLogicalDevice.cpp

@@ -1193,12 +1193,6 @@ void CVulkanLogicalDevice::createComputePipelines_impl(
             auto pipeline = core::make_smart_refctd_ptr<CVulkanComputePipeline>(
                 info,vk_pipeline
             );
-            if (info.flags.hasFlags(IGPUComputePipeline::SCreationParams::FLAGS::CAPTURE_STATISTICS))
-            {
-                pipeline->populateExecutableInfo(info.flags.hasFlags(IGPUComputePipeline::SCreationParams::FLAGS::CAPTURE_INTERNAL_REPRESENTATIONS));
-                if (pipeline->getExecutableInfo().empty())
-                    m_logger.log("Driver returned 0 executables for pipeline created with CAPTURE_STATISTICS flag. This pipeline type may not be supported by the driver's VK_KHR_pipeline_executable_properties implementation.", system::ILogger::ELL_WARNING);
-            }
             output[i] = std::move(pipeline);
             debugNameBuilder.str("");
             const auto& specInfo = createInfos[i].shader;
@@ -1454,12 +1448,6 @@ void CVulkanLogicalDevice::createGraphicsPipelines_impl(
             // break the lifetime cause of the aliasing
             std::uninitialized_default_construct_n(output+i,1);
             auto pipeline = core::make_smart_refctd_ptr<CVulkanGraphicsPipeline>(createInfos[i],vk_pipeline);
-            if (createInfo.flags.hasFlags(IGPUGraphicsPipeline::SCreationParams::FLAGS::CAPTURE_STATISTICS))
-            {
-                pipeline->populateExecutableInfo(createInfo.flags.hasFlags(IGPUGraphicsPipeline::SCreationParams::FLAGS::CAPTURE_INTERNAL_REPRESENTATIONS));
-                if (pipeline->getExecutableInfo().empty())
-					m_logger.log("Driver returned 0 executables for pipeline created with CAPTURE_STATISTICS flag. This pipeline type may not be supported by the driver's VK_KHR_pipeline_executable_properties implementation.", system::ILogger::ELL_WARNING);
-            }
             output[i] = std::move(pipeline);
             debugNameBuilder.str("");
             auto buildDebugName = [&](const IGPUPipelineBase::SShaderSpecInfo& spec, hlsl::ShaderStage stage)
@@ -1671,12 +1659,6 @@ void CVulkanLogicalDevice::createRayTracingPipelines_impl(
               std::move(shaderGroupHandles)
             );
 
-            if (info.cached.flags.hasFlags(IGPURayTracingPipeline::SCreationParams::FLAGS::CAPTURE_STATISTICS))
-            {
-                pipeline->populateExecutableInfo(info.cached.flags.hasFlags(IGPURayTracingPipeline::SCreationParams::FLAGS::CAPTURE_INTERNAL_REPRESENTATIONS));
-                if (pipeline->getExecutableInfo().empty())
-					m_logger.log("Driver returned 0 executables for pipeline created with CAPTURE_STATISTICS flag. This pipeline type may not be supported by the driver's VK_KHR_pipeline_executable_properties implementation.", system::ILogger::ELL_WARNING);
-            }
             output[i] = std::move(pipeline);
         }
     }

src/nbl/video/CVulkanRayTracingPipeline.cpp

@@ -65,11 +65,14 @@ namespace nbl::video
     for (size_t shaderGroupIx = 0; shaderGroupIx < params.shaderGroups.callables.size(); shaderGroupIx++)
     {
       m_callableStackSizes->operator[](shaderGroupIx) = getVkShaderGroupStackSize(
-        getCallableBaseIndex(), 
-        shaderGroupIx, 
+        getCallableBaseIndex(),
+        shaderGroupIx,
         params.shaderGroups.callables[shaderGroupIx].shader,
         VK_SHADER_GROUP_SHADER_GENERAL_KHR);
     }
+
+    if (params.cached.flags.hasFlags(SCreationParams::FLAGS::CAPTURE_STATISTICS))
+      populateExecutableInfo(params.cached.flags.hasFlags(SCreationParams::FLAGS::CAPTURE_INTERNAL_REPRESENTATIONS));
   }
 
   CVulkanRayTracingPipeline::~CVulkanRayTracingPipeline()

src/nbl/video/ILogicalDevice.cpp

@@ -826,7 +826,11 @@ bool ILogicalDevice::createComputePipelines(IGPUPipelineCache* const pipelineCac
             retval = false;
         }
         else
+        {
             output[i]->setObjectDebugName(params[i].shader.shader->getFilepathHint().c_str());
+            if (params[i].flags.hasFlags(IGPUComputePipeline::SCreationParams::FLAGS::CAPTURE_STATISTICS) && output[i]->getExecutableInfo().empty())
+                NBL_LOG(system::ILogger::ELL_WARNING, "Driver returned 0 executables for pipeline created with CAPTURE_STATISTICS flag. This pipeline type may not be supported by the driver's VK_KHR_pipeline_executable_properties implementation. (params[%u])", i);
+        }
     }
     return retval;
 }
@@ -994,7 +998,9 @@ bool ILogicalDevice::createGraphicsPipelines(
         }
         else
         {
-// TODO: set pipeline debug name thats a concatenation of all active stages' shader file path hints
+            // TODO: set pipeline debug name thats a concatenation of all active stages' shader file path hints
+            if (params[i].flags.hasFlags(IGPUGraphicsPipeline::SCreationParams::FLAGS::CAPTURE_STATISTICS) && output[i]->getExecutableInfo().empty())
+                NBL_LOG(system::ILogger::ELL_WARNING, "Driver returned 0 executables for pipeline created with CAPTURE_STATISTICS flag. This pipeline type may not be supported by the driver's VK_KHR_pipeline_executable_properties implementation. (params[%u])", i);
         }
     }
     return true;
@@ -1144,6 +1150,8 @@ bool ILogicalDevice::createRayTracingPipelines(IGPUPipelineCache* const pipeline
             NBL_LOG_ERROR("RayTracingPipeline was not created (params[%u])", i);
             return false;
         }
+        else if (params[i].getFlags().hasFlags(IGPURayTracingPipeline::SCreationParams::FLAGS::CAPTURE_STATISTICS) && output[i]->getExecutableInfo().empty())
+            NBL_LOG(system::ILogger::ELL_WARNING, "Driver returned 0 executables for pipeline created with CAPTURE_STATISTICS flag. This pipeline type may not be supported by the driver's VK_KHR_pipeline_executable_properties implementation. (params[%u])", i);
     }
     return retval;
 }