From 9ca4c912f3880b80a3354055fabb8c232b6e2136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tur=C3=A1nszki=20J=C3=A1nos?= Date: Thu, 29 Aug 2024 15:33:14 +0200 Subject: [PATCH] pipeline creation threading crash fix --- WickedEngine/wiRenderer.cpp | 4 ++-- WickedEngine/wiVersion.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WickedEngine/wiRenderer.cpp b/WickedEngine/wiRenderer.cpp index 9b900f15c..e5dd2a416 100644 --- a/WickedEngine/wiRenderer.cpp +++ b/WickedEngine/wiRenderer.cpp @@ -373,10 +373,10 @@ union ObjectRenderingVariant uint32_t value; }; static_assert(sizeof(ObjectRenderingVariant) == sizeof(uint32_t)); -wi::unordered_map PSO_object[RENDERPASS_COUNT][MaterialComponent::SHADERTYPE_COUNT]; inline PipelineState* GetObjectPSO(ObjectRenderingVariant variant) { - return &PSO_object[variant.bits.renderpass][variant.bits.shadertype][variant.value]; + static wi::unordered_map PSO_object[RENDERPASS_COUNT][MaterialComponent::SHADERTYPE_COUNT][OBJECT_MESH_SHADER_PSO_COUNT]; + return &PSO_object[variant.bits.renderpass][variant.bits.shadertype][variant.bits.mesh_shader][variant.value]; } wi::jobsystem::context mesh_shader_ctx; wi::jobsystem::context object_pso_job_ctx[RENDERPASS_COUNT][OBJECT_MESH_SHADER_PSO_COUNT]; diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index 0c13a4b2a..8363a0099 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wi::version // minor features, major updates, breaking compatibility changes const int minor = 71; // minor bug fixes, alterations, refactors, updates - const int revision = 560; + const int revision = 561; const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);