Removed SPIRV ref holding in CVulkanShader

Author: Erfan-Ahmadi

src/nbl/video/CVulkanLogicalDevice.h

@@ -550,9 +550,7 @@ class CVulkanLogicalDevice final : public ILogicalDevice
 
         const asset::ICPUBuffer* source = cpushader->getSPVorGLSL();
 
-        core::smart_refctd_ptr<asset::ICPUBuffer> spirv =
-            core::smart_refctd_ptr_static_cast<asset::ICPUBuffer>(source->clone(1u));
-
+        core::smart_refctd_ptr<asset::ICPUBuffer> spirv;
         if (cpushader->containsGLSL())
         {
             const char* begin = static_cast<const char*>(source->getPointer());
@@ -577,6 +575,10 @@ class CVulkanLogicalDevice final : public ILogicalDevice
                 logger,
                 m_physicalDevice->getLimits().spirvVersion);
         }
+        else
+        {
+            spirv = core::smart_refctd_ptr_static_cast<asset::ICPUBuffer>(source->clone(1u));
+        }
 
         if (!spirv)
             return nullptr;
@@ -591,7 +593,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), std::move(spirv), cpushader->getStage(), std::string(cpushader->getFilepathHint()), vk_shaderModule);
+                core::smart_refctd_ptr<CVulkanLogicalDevice>(this), cpushader->getStage(), std::string(cpushader->getFilepathHint()), vk_shaderModule);
         }
         else
         {
@@ -1132,14 +1134,6 @@ class CVulkanLogicalDevice final : public ILogicalDevice
 
         const CVulkanShader* vulkanShader = static_cast<const CVulkanShader*>(_unspecialized);
 
-        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,22 +12,19 @@ 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_spirv(std::move(spirv)), m_vkShaderModule(vk_shaderModule)
-    {}
+        : IGPUShader(std::move(dev), stage, std::move(filepathHint))
+        , m_vkShaderModule(vk_shaderModule)
+    {
+    }
 
     ~CVulkanShader();
 
-    const asset::ICPUBuffer* getSPV() const { return m_spirv.get(); };
-
     inline VkShaderModule getInternalObject() const { return m_vkShaderModule; }
 
 private:
-    core::smart_refctd_ptr<asset::ICPUBuffer> m_spirv;
     VkShaderModule m_vkShaderModule = VK_NULL_HANDLE;
 
 };