Skip to content

Commit 74aaabc

Browse files
Fix Shader Location Path for working in Panzerfaust
1 parent 676217f commit 74aaabc

4 files changed

Lines changed: 20 additions & 22 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ jobs:
3535
path: |
3636
Result.Windows.x64.MultiConfig/bin/
3737
Result.Windows.x64.MultiConfig/lib/*vulkan*
38-
Result.Windows.x64.MultiConfig/tests
38+
Result.Windows.x64.MultiConfig/tests/ZEngineTests.exe

Scripts/RunTests.ps1

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -62,23 +62,22 @@ function RunTests {
6262
param (
6363
[string]$Configuration
6464
)
65-
66-
[string]$testExecutablePath = Join-Path $OutputBuildDirectory -ChildPath "/tests/ZEngineTests"
67-
68-
# switch ($SystemName) {
69-
# "Windows" {
70-
# $testExecutablePath = [IO.Path]::Combine($OutputBuildDirectory, "ZEngine", "tests", $Configuration, "ZEngineTests.exe")
71-
# }
72-
# "Darwin" {
73-
# $testExecutablePath = Join-Path $OutputBuildDirectory -ChildPath "ZEngine/tests/$Configuration/ZEngineTests"
74-
# }
75-
# "Linux" {
76-
# $testExecutablePath = Join-Path $OutputBuildDirectory -ChildPath "ZEngine/tests/ZEngineTests"
77-
# }
78-
# Default {
79-
# throw 'This system is not supported'
80-
# }
81-
# }
65+
66+
[string]$testExecutablePath = ""
67+
switch ($SystemName) {
68+
"Windows" {
69+
$testExecutablePath = "tests", "ZEngineTests.exe")
70+
}
71+
"Darwin" {
72+
$testExecutablePath = "tests/ZEngineTests"
73+
}
74+
"Linux" {
75+
$testExecutablePath = "tests/ZEngineTests"
76+
}
77+
Default {
78+
throw 'This system is not supported'
79+
}
80+
}
8281

8382
# Check if the executable exists
8483
if (Test-Path $testExecutablePath) {
@@ -89,8 +88,7 @@ function RunTests {
8988
Write-Error "Test executable does not exist: $testExecutablePath"
9089
}
9190
}
92-
9391
# Run tests for each configuration
9492
foreach ($config in $Configurations) {
95-
RunTests -Configuration $config
93+
RunTests -Configuration $config
9694
}

ZEngine/ZEngine/Hardwares/VulkanDevice.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1478,7 +1478,7 @@ namespace ZEngine::Hardwares
14781478

14791479
Helpers::Handle<Rendering::Shaders::Shader> VulkanDevice::CompileShader(Rendering::Specifications::ShaderSpecification& spec)
14801480
{
1481-
const char* base_dir = "Shaders/Cache/";
1481+
const char* base_dir = "Editor/Shaders/Cache/";
14821482
const char* vertex_name_part = "_vertex.spv";
14831483
const char* fragment_name_part = "_fragment.spv";
14841484

ZEngine/ZEngine/Rendering/Shaders/Shader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ namespace ZEngine::Rendering::Shaders
271271
void Shader::CreateDescriptorSetLayouts()
272272
{
273273
Array<VkDescriptorPoolSize> pool_size_collection = {};
274-
pool_size_collection.init(&LocalArena, 10, 10);
274+
pool_size_collection.init(&LocalArena, 10);
275275

276276
for (const auto& layout_binding_set : LayoutBindingSpecificationMap)
277277
{

0 commit comments

Comments
 (0)