From 4df5059bf1219535e839d834b33082b321e07d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tur=C3=A1nszki=20J=C3=A1nos?= Date: Wed, 9 Oct 2024 16:56:13 +0200 Subject: [PATCH] texture streaming: stream-in can happen on memory shortage --- WickedEngine/wiResourceManager.cpp | 2 +- WickedEngine/wiVersion.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WickedEngine/wiResourceManager.cpp b/WickedEngine/wiResourceManager.cpp index ba0e167c5..d3195671f 100644 --- a/WickedEngine/wiResourceManager.cpp +++ b/WickedEngine/wiResourceManager.cpp @@ -1443,7 +1443,7 @@ namespace wi const GraphicsDevice::MemoryUsage memory_usage = device->GetMemoryUsage(); const float memory_percent = float(double(memory_usage.usage) / double(memory_usage.budget)); const bool memory_shortage = memory_percent > streaming_threshold; - const bool stream_in = memory_shortage ? false : (requested_resolution >= std::min(desc.width, desc.height)); + const bool stream_in = requested_resolution >= std::min(desc.width, desc.height); int mip_offset = int(resource->streaming_texture.mip_count - desc.mip_levels); if (stream_in) diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index 280ee49fc..be8166967 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 = 592; + const int revision = 593; const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);