From c2aa067cc4403fc9d5ddb16a11b85dc39835c65f Mon Sep 17 00:00:00 2001
From: Kah Wei <msntkw@msn.com>
Date: Mon, 30 Jan 2023 16:55:15 +0800
Subject: [PATCH] Fixed crash caused by loading incorrect renderpass for
 subpass replacement

---
 .../MaterialInspector/SHMaterialInspector.cpp    | 16 +++++++++++-----
 .../src/Graphics/RenderGraph/SHSubpass.cpp       |  2 +-
 .../src/Graphics/RenderGraph/SHSubpass.h         |  2 +-
 SHADE_Engine/src/Resource/SHResourceManager.hpp  | 10 ++--------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/SHADE_Engine/src/Editor/EditorWindow/MaterialInspector/SHMaterialInspector.cpp b/SHADE_Engine/src/Editor/EditorWindow/MaterialInspector/SHMaterialInspector.cpp
index d382451d..adb1fe51 100644
--- a/SHADE_Engine/src/Editor/EditorWindow/MaterialInspector/SHMaterialInspector.cpp
+++ b/SHADE_Engine/src/Editor/EditorWindow/MaterialInspector/SHMaterialInspector.cpp
@@ -92,11 +92,17 @@ namespace SHADE
           if (vertShader && fragShader && gfxSystem)
           {
             // - Retrieve pipeline from pipeline library
-            auto renderPass = gfxSystem->GetPrimaryRenderpass();
-            auto subPass = renderPass->GetSubpass(currentMatSpec->subpassName);
-            auto pipeline = renderPass->GetOrCreatePipeline({ vertShader, fragShader }, subPass);
-            // - Set Pipeline
-            matHandle->SetPipeline(pipeline);
+            auto subPass = gfxSystem->GetUsableSubpass(currentMatSpec->subpassName);
+            if (subPass)
+            {
+              // Set Pipeline if valid
+              auto pipeline = subPass->GetParentNode()->GetOrCreatePipeline({vertShader, fragShader}, subPass);
+              matHandle->SetPipeline(pipeline);
+            }
+            else
+            {
+              SHLOG_ERROR("[SHMaterialInspector] Failed to find material subpass of type \"{}\"", currentMatSpec->subpassName);
+            }
           }
         }
 
diff --git a/SHADE_Engine/src/Graphics/RenderGraph/SHSubpass.cpp b/SHADE_Engine/src/Graphics/RenderGraph/SHSubpass.cpp
index 5205b44d..96207d7a 100644
--- a/SHADE_Engine/src/Graphics/RenderGraph/SHSubpass.cpp
+++ b/SHADE_Engine/src/Graphics/RenderGraph/SHSubpass.cpp
@@ -474,7 +474,7 @@ namespace SHADE
 
   */
   /***************************************************************************/
-  Handle<SHRenderGraphNode> const& SHSubpass::GetParentNode(void) const noexcept
+  Handle<SHRenderGraphNode> SHSubpass::GetParentNode(void) const noexcept
   {
     return parentNode;
   }
diff --git a/SHADE_Engine/src/Graphics/RenderGraph/SHSubpass.h b/SHADE_Engine/src/Graphics/RenderGraph/SHSubpass.h
index f84d4dee..811cc70c 100644
--- a/SHADE_Engine/src/Graphics/RenderGraph/SHSubpass.h
+++ b/SHADE_Engine/src/Graphics/RenderGraph/SHSubpass.h
@@ -159,7 +159,7 @@ namespace SHADE
     /*-----------------------------------------------------------------------*/
     void SetCompanionSubpass (Handle<SHSubpass> companion, Handle<SHVkPipeline> pipeline) noexcept;
 
-    Handle<SHRenderGraphNode> const&            GetParentNode(void) const noexcept;
+    Handle<SHRenderGraphNode>                   GetParentNode(void) const noexcept;
     SHSubPassIndex                              GetIndex() const noexcept;
     Handle<SHSuperBatch>                        GetSuperBatch(void) const noexcept;
     std::vector<vk::AttachmentReference> const& GetColorAttachmentReferences (void) const noexcept;
diff --git a/SHADE_Engine/src/Resource/SHResourceManager.hpp b/SHADE_Engine/src/Resource/SHResourceManager.hpp
index 51ee356a..8e2b3309 100644
--- a/SHADE_Engine/src/Resource/SHResourceManager.hpp
+++ b/SHADE_Engine/src/Resource/SHResourceManager.hpp
@@ -270,14 +270,8 @@ namespace SHADE
         return {};
       }
 
-      // Grab subpass from worldRenderer
-      auto renderPass = gfxSystem->GetPrimaryRenderpass();
-      if (!renderPass)
-      {
-        SHLOG_ERROR("[SHResourceManager] Failed to load material as RenderPass could not be found.");
-        return {};
-      }
-      auto subPass = renderPass->GetSubpass(assetData.subpassName);
+      // Grab subpass
+      auto subPass = gfxSystem->GetUsableSubpass(assetData.subpassName);
       if (!subPass)
       {
         SHLOG_ERROR("[SHResourceManager] Failed to load material as SubPass could not be found.");