brought back spirv ref for spirv optimizer

Author: Erfan-Ahmadi

src/nbl/video/CVulkanLogicalDevice.h

@@ -596,7 +596,7 @@ class CVulkanLogicalDevice final : public ILogicalDevice
         if (m_devf.vk.vkCreateShaderModule(m_vkdev, &vk_createInfo, nullptr, &vk_shaderModule) == VK_SUCCESS)
         {
             return core::make_smart_refctd_ptr<video::CVulkanShader>(
-                core::smart_refctd_ptr<CVulkanLogicalDevice>(this), cpushader->getStage(), std::string(cpushader->getFilepathHint()), vk_shaderModule);
+                core::smart_refctd_ptr<CVulkanLogicalDevice>(this), std::move(spirv), cpushader->getStage(), std::string(cpushader->getFilepathHint()), vk_shaderModule);
         }
         else
         {
@@ -1138,6 +1138,14 @@ class CVulkanLogicalDevice final : public ILogicalDevice
 
         const CVulkanShader* vulkanShader = IBackendObject::device_compatibility_cast<const CVulkanShader*>(_unspecialized, this);
 
+        auto spirv = core::smart_refctd_ptr<const asset::ICPUBuffer>(static_cast<const CVulkanShader*>(_unspecialized)->getSPV());
+
+        if (spvopt)
+            spirv = spvopt->optimize(spirv.get(), m_physicalDevice->getDebugCallback()->getLogger());
+
+        if (!spirv)
+            return nullptr;
+
         return core::make_smart_refctd_ptr<CVulkanSpecializedShader>(
             core::smart_refctd_ptr<CVulkanLogicalDevice>(this),
             core::smart_refctd_ptr<const CVulkanShader>(vulkanShader), specInfo);

src/nbl/video/CVulkanShader.h

@@ -12,19 +12,23 @@ class CVulkanShader : public IGPUShader
 public:
     CVulkanShader(
         core::smart_refctd_ptr<ILogicalDevice>&& dev,
+        core::smart_refctd_ptr<asset::ICPUBuffer>&& spirv,
         const E_SHADER_STAGE stage,
         std::string&& filepathHint,
         VkShaderModule vk_shaderModule)
-        : IGPUShader(std::move(dev), stage, std::move(filepathHint))
-        , m_vkShaderModule(vk_shaderModule)
-    {
-    }
+        : IGPUShader(std::move(dev), stage, std::move(filepathHint)),
+        m_spirv(std::move(spirv)), m_vkShaderModule(vk_shaderModule)
+    {}
 
     ~CVulkanShader();
+    
+    const asset::ICPUBuffer* getSPV() const { return m_spirv.get(); };
 
     inline VkShaderModule getInternalObject() const { return m_vkShaderModule; }
 
 private:
+    // We want to use the SPIR-V optimizer later.
+    core::smart_refctd_ptr<asset::ICPUBuffer> m_spirv;
     VkShaderModule m_vkShaderModule = VK_NULL_HANDLE;
 
 };