diff --git a/application/editormode.h b/application/editormode.h index 68746cdf4..81347c950 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -748,9 +748,11 @@ class editor_mode : public application_mode, private editor_track::observer, pri struct thumbnail { int texture{0}; // 0: none + int material{0}; // the material the texture is the first of, 0: a texture alone double shown{0.0}; // when it was last asked for, ImGui time }; std::map thumbnails; // texture shown for the item of the name + bool refresh{false}; // all the images to be let go of and read again int loads{0}; // textures read in the frame, a few at most so the browser doesn't stall the editor int loadsframe{-1}; } m_textures; diff --git a/application/editormodetextures.cpp b/application/editormodetextures.cpp index 8d5fcd3be..ecf846431 100644 --- a/application/editormodetextures.cpp +++ b/application/editormodetextures.cpp @@ -93,16 +93,17 @@ std::uint64_t editor_mode::texture_thumbnail(texture_browser::item const &Item) if (browser.loads >= 2) return 0; ++browser.loads; - texture_handle texture{null_handle}; + texture_browser::thumbnail thumbnail; if (Item.material) { - auto const material{GfxRenderer->Fetch_Material(Item.name)}; - if (auto const *data{GfxRenderer->Material(material)}; material != null_handle && data != nullptr) - texture = data->GetTexture(0); + // a material reads all its textures, the normal maps and the rest with the one shown + thumbnail.material = GfxRenderer->Fetch_Material(Item.name); + if (auto const *data{GfxRenderer->Material(thumbnail.material)}; thumbnail.material != null_handle && data != nullptr) + thumbnail.texture = data->GetTexture(0); } else - texture = GfxRenderer->Fetch_Texture(Item.name, true); - lookup = browser.thumbnails.emplace(Item.name, texture_browser::thumbnail{texture}).first; + thumbnail.texture = GfxRenderer->Fetch_Texture(Item.name, true); + lookup = browser.thumbnails.emplace(Item.name, thumbnail).first; } lookup->second.shown = ImGui::GetTime(); if (lookup->second.texture == null_handle) @@ -116,20 +117,27 @@ std::uint64_t editor_mode::texture_thumbnail(texture_browser::item const &Item) void editor_mode::thumbnails_trim() { // a few seconds out of sight, so scrolling back and forth doesn't read them over and over + // all of them after the browser's Refresh, here before any image is drawn: not while the panels drawn earlier in the + // frame still refer to them auto constexpr kept{3.0}; auto const now{ImGui::GetTime()}; - auto &thumbnails{m_textures.thumbnails}; - for (auto entry{thumbnails.begin()}; entry != thumbnails.end();) + auto &browser{m_textures}; + for (auto entry{browser.thumbnails.begin()}; entry != browser.thumbnails.end();) { - if (entry->second.texture == null_handle || now - entry->second.shown < kept) + auto const &thumbnail{entry->second}; + if (false == browser.refresh && (thumbnail.texture == null_handle || now - thumbnail.shown < kept)) { ++entry; continue; } // the scene's own textures stay; shown again, the image is read anew within the few a frame - GfxRenderer->Unload_Texture(entry->second.texture); - entry = thumbnails.erase(entry); + if (thumbnail.material != null_handle) + GfxRenderer->Unload_Material(thumbnail.material); + else + GfxRenderer->Unload_Texture(thumbnail.texture); + entry = browser.thumbnails.erase(entry); } + browser.refresh = false; } void editor_mode::render_texture_browser() @@ -193,9 +201,8 @@ void editor_mode::render_texture_browser() if (ImGui::Button(STR_C("Refresh"))) { browser.listed = false; - for (auto const &[name, thumbnail] : browser.thumbnails) - GfxRenderer->Unload_Texture(thumbnail.texture); - browser.thumbnails.clear(); + // the images let go of at the start of the next frame, see thumbnails_trim() + browser.refresh = true; } ImGui::SameLine(); ImGui::TextUnformatted((std::string{paths::textures} + browser.folder).c_str()); diff --git a/model/Texture.cpp b/model/Texture.cpp index 36757bd08..eb24a0de6 100644 --- a/model/Texture.cpp +++ b/model/Texture.cpp @@ -1896,22 +1896,40 @@ texture_manager::unload( texture_handle const Texture ) { auto const &record { m_textures[ Texture ] }; auto &texture { *record.first }; if( ( record.second != resource_timestamp() ) - || ( texture.id == opengl_texture::invalid_id ) - || ( texture.id == 0 ) + || ( texture.id == 0 ) // failed to load || ( true == texture.is_static ) || ( true == texture.is_rendertarget ) || ( texture.type == "make:" ) || ( texture.type == "internalsrc:" ) ) { return; } - texture.release(); + if( ( texture.data_state == resource_state::loading ) + && ( texture.request != nullptr ) ) { + // read by a worker thread: taken over first, to be dropped with the rest + texture.complete_data(); + if( texture.data_state == resource_state::failed ) { + return; + } + } + auto const created { texture.id != opengl_texture::invalid_id }; + if( ( false == created ) + && ( texture.data_state != resource_state::good ) ) { + // nothing read nor made, e.g. the textures of a material asked for without loading + return; + } + if( true == created ) { + // deleted outright: release() would read the texture back from the card with gfx.resource.move, only for it to be dropped + ::glDeleteTextures( 1, &texture.id ); + texture.id = opengl_texture::invalid_id; + texture.is_ready = false; + // the released gl name can be given to a new texture, the unit cache can't trust it + for( auto &unit : opengl_texture::units ) { + unit = -1; + } + } texture.data = std::vector(); texture.data_state = resource_state::none; texture.reload_on_use = true; - // the released gl name can be given to a new texture, the unit cache can't trust it - for( auto &unit : opengl_texture::units ) { - unit = -1; - } } // releases gl textures of vehicles not needed nor drawn for a while diff --git a/model/Texture.h b/model/Texture.h index d177592cc..20221fcea 100644 --- a/model/Texture.h +++ b/model/Texture.h @@ -182,7 +182,7 @@ public: void release_unneeded(); // takes a texture the scene has never drawn out of both the gfx card and the memory, e.g. the image of a picker scrolled - // past; it's read again when it's used. textures the scene draws are left to the resource sweep + // past, or one read and not made yet; it's read again when it's used. textures the scene draws are left to the resource sweep void unload( texture_handle const Texture ); // debug performance string diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 800f33dcf..d3dfef6e9 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -2575,6 +2575,18 @@ void opengl33_renderer::Unload_Texture(texture_handle const Texture) m_textures.unload(Texture); } +void opengl33_renderer::Unload_Material(material_handle const Material) +{ + if (Material == null_handle) + return; + auto const &material{m_materials.material(Material)}; + for (auto const texture : material.textures) + m_textures.unload(texture); + for (auto const &variant : material.texture_variants) + for (auto const texture : variant) + m_textures.unload(texture); +} + void opengl33_renderer::Update_AnimModel(TAnimModel *model) { model->RaAnimate(m_framestamp); diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index 4322cc2db..c4af00c4f 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -112,6 +112,8 @@ class opengl33_renderer : public gfx_renderer { Texture( texture_handle const Texture ) const override; void Unload_Texture( texture_handle const Texture ) override; + void + Unload_Material( material_handle const Material ) override; // utility methods void Pick_Control_Callback( std::function Callback ) override; diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp index 737c4b379..9f48c40b5 100644 --- a/rendering/openglrenderer.cpp +++ b/rendering/openglrenderer.cpp @@ -1928,6 +1928,21 @@ opengl_renderer::Unload_Texture( texture_handle const Texture ) { m_textures.unload( Texture ); } +void +opengl_renderer::Unload_Material( material_handle const Material ) { + + if( Material == null_handle ) { return; } + auto const &material { m_materials.material( Material ) }; + for( auto const texture : material.textures ) { + m_textures.unload( texture ); + } + for( auto const &variant : material.texture_variants ) { + for( auto const texture : variant ) { + m_textures.unload( texture ); + } + } +} + void opengl_renderer::Pick_Control_Callback( std::function Callback ) { diff --git a/rendering/openglrenderer.h b/rendering/openglrenderer.h index ef3a9f0f3..768acc19a 100644 --- a/rendering/openglrenderer.h +++ b/rendering/openglrenderer.h @@ -97,6 +97,8 @@ public: Texture( texture_handle const Texture ) const override; void Unload_Texture( texture_handle const Texture ) override; + void + Unload_Material( material_handle const Material ) override; // utility methods void Pick_Control_Callback( std::function Callback ) override; diff --git a/rendering/renderer.h b/rendering/renderer.h index 337d63925..7e3ef2eb2 100644 --- a/rendering/renderer.h +++ b/rendering/renderer.h @@ -105,6 +105,8 @@ public: // a texture the scene has never drawn taken out of the gfx card and the memory, read again when it's used: the image of a // texture picker scrolled past. backends which keep their textures otherwise leave it virtual void Unload_Texture( texture_handle const Texture ) {} + // the same for all the textures of a material, those of its variants with them + virtual void Unload_Material( material_handle const Material ) {} // utility methods virtual void Pick_Control_Callback( std::function Callback ) = 0; virtual void Pick_Node_Callback( std::function Callback ) = 0;