Fix Shader Location Path for working in Panzerfaust

Author: MathewBensonCode

.github/workflows/job-cmakebuild-windows.yml

@@ -35,4 +35,4 @@ jobs:
           path: |
             Result.Windows.x64.MultiConfig/bin/
             Result.Windows.x64.MultiConfig/lib/*vulkan*
-            Result.Windows.x64.MultiConfig/tests
+            Result.Windows.x64.MultiConfig/tests/ZEngineTests.exe

Scripts/RunTests.ps1

@@ -63,22 +63,18 @@ function RunTests {
         [string]$Configuration
     )
 
-    [string]$testExecutablePath = Join-Path $OutputBuildDirectory -ChildPath "/tests/ZEngineTests"
-
-#    switch ($SystemName) {
-#        "Windows" {
-#            $testExecutablePath = [IO.Path]::Combine($OutputBuildDirectory, "ZEngine", "tests", $Configuration, "ZEngineTests.exe")
-#        }
-#        "Darwin" {
-#            $testExecutablePath = Join-Path $OutputBuildDirectory -ChildPath "ZEngine/tests/$Configuration/ZEngineTests"
-#        }
-#        "Linux" {
-#            $testExecutablePath = Join-Path $OutputBuildDirectory -ChildPath "ZEngine/tests/ZEngineTests"
-#            }
-#        Default {
-#            throw 'This system is not supported'
-#        }
-#    }
+        "Windows" {
+            $testExecutablePath = [IO.Path]::Combine($OutputBuildDirectory,  "tests", "ZEngineTests.exe")
+        }
+        "Darwin" {
+            $testExecutablePath = Join-Path $OutputBuildDirectory -ChildPath "tests/ZEngineTests"
+        }
+        "Linux" {
+            $testExecutablePath = Join-Path $OutputBuildDirectory -ChildPath "tests/ZEngineTests"
+            }
+        Default {
+            throw 'This system is not supported'
+        }
 
     # Check if the executable exists
     if (Test-Path $testExecutablePath) {

ZEngine/ZEngine/Hardwares/VulkanDevice.cpp

@@ -1478,7 +1478,7 @@ namespace ZEngine::Hardwares
 
     Helpers::Handle<Rendering::Shaders::Shader> VulkanDevice::CompileShader(Rendering::Specifications::ShaderSpecification& spec)
     {
-        const char* base_dir           = "Shaders/Cache/";
+        const char* base_dir           = "Editor/Shaders/Cache/";
         const char* vertex_name_part   = "_vertex.spv";
         const char* fragment_name_part = "_fragment.spv";
 

ZEngine/ZEngine/Rendering/Shaders/Shader.cpp

@@ -271,7 +271,7 @@ namespace ZEngine::Rendering::Shaders
     void Shader::CreateDescriptorSetLayouts()
     {
         Array<VkDescriptorPoolSize> pool_size_collection = {};
-        pool_size_collection.init(&LocalArena, 10, 10);
+        pool_size_collection.init(&LocalArena, 10);
 
         for (const auto& layout_binding_set : LayoutBindingSpecificationMap)
         {