diff --git a/WickedEngine/wiGraphicsDevice_DX12.cpp b/WickedEngine/wiGraphicsDevice_DX12.cpp index c9318d547..e9c85e7ea 100644 --- a/WickedEngine/wiGraphicsDevice_DX12.cpp +++ b/WickedEngine/wiGraphicsDevice_DX12.cpp @@ -5617,14 +5617,6 @@ using namespace dx12_internal; { allocationhandler->destroylocker.lock(); - rootsignature_cache_mutex.lock(); - for (auto& x : rootsignature_cache) - { - if (x.second) allocationhandler->destroyer_rootSignatures.push_back(std::make_pair(x.second, FRAMECOUNT)); - } - rootsignature_cache.clear(); - rootsignature_cache_mutex.unlock(); - for (auto& x : pipelines_global) { allocationhandler->destroyer_pipelines.push_back(std::make_pair(x.second, FRAMECOUNT)); diff --git a/WickedEngine/wiGraphicsDevice_DX12.h b/WickedEngine/wiGraphicsDevice_DX12.h index 29e7d7ee0..12d7802ef 100644 --- a/WickedEngine/wiGraphicsDevice_DX12.h +++ b/WickedEngine/wiGraphicsDevice_DX12.h @@ -39,7 +39,7 @@ namespace wi::graphics #ifndef PLATFORM_UWP Microsoft::WRL::ComPtr deviceRemovedFence; - HANDLE deviceRemovedWaitHandle; + HANDLE deviceRemovedWaitHandle = {}; #endif std::mutex onDeviceRemovedMutex; bool deviceRemoved = false; @@ -212,10 +212,6 @@ namespace wi::graphics return *(CommandList_DX12*)cmd.internal_state; } - - mutable wi::unordered_map> rootsignature_cache; - mutable std::mutex rootsignature_cache_mutex; - wi::unordered_map> pipelines_global; void pso_validate(CommandList cmd); diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index 9690126fb..e7283b0d4 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 = 258; + const int revision = 259; const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);