[modelimporter] texture loading now happens via the material (so it c…

…an be offloaded to other threads later)
PanosK92 · Nov 25, 2024 · 18a3ab5 · 18a3ab5
1 parent 9be4a3e
commit 18a3ab5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/runtime/Rendering/Material.cpp b/runtime/Rendering/Material.cpp
@@ -325,7 +325,7 @@ namespace Spartan
     void Material::Optimize()
     {
         SP_ASSERT_MSG(m_resource_state != ResourceState::Processing, "The material is already being processed");
-        SP_ASSERT_MSG(m_resource_state != ResourceState::Ready, "The material is already optimized");
+        SP_ASSERT_MSG(m_resource_state != ResourceState::Ready,      "The material is already optimized");
 
         m_resource_state = ResourceState::Processing;
 
@@ -369,9 +369,9 @@ namespace Spartan
 
                 if (!texture_packed)
                 {
-                    bool textures_are_compressed = (texture_occlusion  && texture_occlusion->IsCompressedFormat())  ||
-                                                   (texture_roughness  && texture_roughness->IsCompressedFormat())  ||
-                                                   (texture_metalness  && texture_metalness->IsCompressedFormat())  ||
+                    bool textures_are_compressed = (texture_occlusion  && texture_occlusion->IsCompressedFormat()) ||
+                                                   (texture_roughness  && texture_roughness->IsCompressedFormat()) ||
+                                                   (texture_metalness  && texture_metalness->IsCompressedFormat()) ||
                                                    (texture_height     && texture_height->IsCompressedFormat());
 
                     RHI_Texture* texture_reference = texture_color      ? texture_color      :
@@ -434,9 +434,10 @@ namespace Spartan
             }
         }
 
-        // prepare all textures
-        future<void> texture_preparation_task = ThreadPool::AddTask([this]()
+        // PrepareForGpu() generates mips, compresses and uploads to GPU, so we offload it to a thread
+        ThreadPool::AddTask([this]()
         {
+            // prepare all textures
             for (RHI_Texture* texture : m_textures)
             {
                 if (texture && texture->GetResourceState() == ResourceState::Max)

diff --git a/runtime/Resource/Import/ModelImporter.cpp b/runtime/Resource/Import/ModelImporter.cpp
@@ -250,15 +250,13 @@ namespace Spartan
 
                 if (texture)
                 {
+                    // set cached texture
                     material->SetTexture(texture_type, texture);
                 }
-                else // if we didn't get a texture, it's not cached, hence we have to load it and cache it now
+                else
                 {
-                    // load texture
-                    texture = ResourceCache::Load<RHI_Texture>(deduced_path, RHI_Texture_Srv | RHI_Texture_Compress | RHI_Texture_DontOptimize);
-
-                    // set the texture to the provided material
-                    material->SetTexture(texture_type, texture);
+                    // load new texture
+                    material->SetTexture(texture_type, deduced_path, 0, RHI_Texture_DontOptimize);
                 }
             }