From 797f4bfd75cdfbe1e126dad1a1a595df9322cfa2 Mon Sep 17 00:00:00 2001
From: Kah Wei <msntkw@msn.com>
Date: Mon, 31 Oct 2022 17:35:52 +0800
Subject: [PATCH] Fixed shader changes

---
 Assets/Shaders/DeferredComposite_CS.shshaderb | Bin 4665 -> 4665 bytes
 .../DeferredComposite_CS.shshaderb.shmeta     |   2 +-
 Assets/Shaders/TestCube_FS.shshaderb          | Bin 2545 -> 2545 bytes
 Assets/Shaders/TestCube_FS.shshaderb.shmeta   |   2 +-
 Assets/Shaders/TestCube_VS.shshaderb          | Bin 3305 -> 3305 bytes
 Assets/Shaders/TestCube_VS.shshaderb.shmeta   |   2 +-
 .../MiddleEnd/Interface/SHGraphicsSystem.cpp  |  15 +++------------
 .../MiddleEnd/Interface/SHGraphicsSystem.h    |   2 +-
 8 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/Assets/Shaders/DeferredComposite_CS.shshaderb b/Assets/Shaders/DeferredComposite_CS.shshaderb
index 889de5fb344289c281264b054407d97c317a7fff..4326daf10db596d391072bcf50ec14f892c4b0e6 100644
GIT binary patch
delta 10
Rcmdm~vQvdoVI!l35C9W90@wfm

delta 10
Rcmdm~vQveTX(OYB5C9UT0=fVI

diff --git a/Assets/Shaders/DeferredComposite_CS.shshaderb.shmeta b/Assets/Shaders/DeferredComposite_CS.shshaderb.shmeta
index 8f18b04a..62c2a3fe 100644
--- a/Assets/Shaders/DeferredComposite_CS.shshaderb.shmeta
+++ b/Assets/Shaders/DeferredComposite_CS.shshaderb.shmeta
@@ -1,3 +1,3 @@
 Name: DeferredComposite_CS
-ID: 42814284
+ID: 45072428
 Type: 2
diff --git a/Assets/Shaders/TestCube_FS.shshaderb b/Assets/Shaders/TestCube_FS.shshaderb
index b0113dc7799a94fb1c40720187c05a9b26a2617c..95b4f62ae89c1bd3dc23f684757a7298c60833a3 100644
GIT binary patch
delta 10
Rcmew;{85-uU?bxPP5>7&1H}LU

delta 10
Rcmew;{85;ZaU<ggP5>6?1GWGF

diff --git a/Assets/Shaders/TestCube_FS.shshaderb.shmeta b/Assets/Shaders/TestCube_FS.shshaderb.shmeta
index 42f270af..fbe098b1 100644
--- a/Assets/Shaders/TestCube_FS.shshaderb.shmeta
+++ b/Assets/Shaders/TestCube_FS.shshaderb.shmeta
@@ -1,3 +1,3 @@
 Name: TestCube_FS
-ID: 37450402
+ID: 46377769
 Type: 2
diff --git a/Assets/Shaders/TestCube_VS.shshaderb b/Assets/Shaders/TestCube_VS.shshaderb
index 03e23af37451b6c4c0791110541c7b6e31d07bbe..7a7b047a30087431f6c695dd50c78ecca6b992ca 100644
GIT binary patch
delta 10
RcmaDU`BIXRaU<gk9sm}q1FZl6

delta 10
RcmaDU`BIXRVI$)U9sm}l1FQf5

diff --git a/Assets/Shaders/TestCube_VS.shshaderb.shmeta b/Assets/Shaders/TestCube_VS.shshaderb.shmeta
index b133437b..5c9f895f 100644
--- a/Assets/Shaders/TestCube_VS.shshaderb.shmeta
+++ b/Assets/Shaders/TestCube_VS.shshaderb.shmeta
@@ -1,3 +1,3 @@
 Name: TestCube_VS
-ID: 41688429
+ID: 39210065
 Type: 2
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
index b599c222..97380fa3 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
@@ -112,9 +112,9 @@ namespace SHADE
     graphicsTexCmdBuffer = graphicsCmdPool->RequestCommandBuffer(SH_CMD_BUFFER_TYPE::PRIMARY);
 
     // Load Built In Shaders
-    static constexpr AssetID VS_DEFAULT   = 41688429; defaultVertShader = SHResourceManager::LoadOrGet<SHVkShaderModule>(VS_DEFAULT);
-    static constexpr AssetID FS_DEFAULT   = 37450402; defaultFragShader = SHResourceManager::LoadOrGet<SHVkShaderModule>(FS_DEFAULT);
-    static constexpr AssetID CS_PURE_COPY = 34987209; copyComputeShader = SHResourceManager::LoadOrGet<SHVkShaderModule>(CS_PURE_COPY);
+    static constexpr AssetID VS_DEFAULT   = 39210065; defaultVertShader       = SHResourceManager::LoadOrGet<SHVkShaderModule>(VS_DEFAULT);
+    static constexpr AssetID FS_DEFAULT   = 46377769; defaultFragShader       = SHResourceManager::LoadOrGet<SHVkShaderModule>(FS_DEFAULT);
+    static constexpr AssetID CS_COMPOSITE = 45072428; deferredCompositeShader = SHResourceManager::LoadOrGet<SHVkShaderModule>(CS_COMPOSITE);
   }
 
   void SHGraphicsSystem::InitSceneRenderGraph(void) noexcept
@@ -183,16 +183,7 @@ namespace SHADE
     gBufferSubpass->AddColorOutput("Albedo");
     gBufferSubpass->AddDepthOutput("Depth Buffer", SH_ATT_DESC_TYPE_FLAGS::DEPTH_STENCIL);
 
-    //// kirsch
-    //auto kirschShader = shaderModuleLibrary.GetShaderModule("KirschCs.glsl");
-    //gBufferNode->AddNodeCompute(kirschShader, { "Position", "Scene" });
-
-    //// copy
-    //auto pureCopyShader = shaderModuleLibrary.GetShaderModule("PureCopyCs.glsl");
-    //gBufferNode->AddNodeCompute(pureCopyShader, { "Position", "Scene" });
-
     // deferred composite
-    auto deferredCompositeShader = shaderModuleLibrary.GetBuiltInShaderModule("DeferredComposite_CS");
     gBufferNode->AddNodeCompute(deferredCompositeShader, { "Position", "Normals", "Albedo", "Light Layer Indices", "Scene" });
 
 
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h
index 27c51dbe..3f899446 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h
@@ -353,7 +353,7 @@ namespace SHADE
     // Built-In Shaders
     Handle<SHVkShaderModule>                                  defaultVertShader;
     Handle<SHVkShaderModule>                                  defaultFragShader;
-    Handle<SHVkShaderModule>                                  copyComputeShader;
+    Handle<SHVkShaderModule>                                  deferredCompositeShader;
 
     // Built-In Materials
     Handle<SHMaterial>                                        defaultMaterial;