[vulkan] fixed all the remaining validation errors related to multi-t…

…hreaded access of the same gpu queue

editor/EditorWindow.cpp

@@ -442,7 +442,7 @@ namespace
 
         void world_on_download_finished()
         {
-            Spartan::ProgressTracker::SetLoadingStateGlobal(false);
+            Spartan::ProgressTracker::SetGlobalLoadingState(false);
             visible = true;
         }
 
@@ -468,7 +468,7 @@ namespace
                         if (ImGui::Button("Yes"))
                         {
                             Spartan::FileSystem::Command("python download_assets.py", world_on_download_finished, false);
-                            Spartan::ProgressTracker::SetLoadingStateGlobal(true);
+                            Spartan::ProgressTracker::SetGlobalLoadingState(true);
                             visible_download = false;
                         }
 

runtime/Core/ProgressTracker.cpp

@@ -105,7 +105,7 @@ namespace Spartan
         return false;
     }
 
-    void ProgressTracker::SetLoadingStateGlobal(const bool is_loading)
+    void ProgressTracker::SetGlobalLoadingState(const bool is_loading)
     {
         anonymous_jobs = is_loading ? (anonymous_jobs + 1) : (anonymous_jobs - 1);
     }

runtime/Core/ProgressTracker.h

@@ -59,6 +59,6 @@ namespace Spartan
     public:
         static Progress& GetProgress(const ProgressType progress_type);
         static bool IsLoading();
-        static void SetLoadingStateGlobal(const bool is_loading);
+        static void SetGlobalLoadingState(const bool is_loading);
     };
 }

runtime/Game/Game.cpp

@@ -1214,7 +1214,7 @@ namespace Spartan
     {
         ThreadPool::AddTask([default_world]()
         {
-            ProgressTracker::SetLoadingStateGlobal(true);
+            ProgressTracker::SetGlobalLoadingState(true);
 
             switch (default_world)
             {
@@ -1229,7 +1229,7 @@ namespace Spartan
                 default: SP_ASSERT_MSG(false, "Unhandled default world"); break;
             }
 
-            ProgressTracker::SetLoadingStateGlobal(false);
+            ProgressTracker::SetGlobalLoadingState(false);
         });
     }
 }

runtime/RHI/RHI_Texture.cpp

@@ -26,6 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "RHI_CommandList.h"
 #include "../IO/FileStream.h"
 #include "../Resource/Import/ImageImporter.h"
+#include "../Core/ProgressTracker.h"
 SP_WARNINGS_OFF
 #include "compressonator.h"
 SP_WARNINGS_ON
@@ -230,7 +231,7 @@ namespace Spartan
 
     RHI_Texture::RHI_Texture(const string& file_path) : IResource(ResourceType::Texture)
     {
-         LoadFromFile(file_path);
+        LoadFromFile(file_path);
     }
 
     RHI_Texture::~RHI_Texture()
@@ -311,6 +312,8 @@ namespace Spartan
             return;
         }
 
+        ProgressTracker::SetGlobalLoadingState(true);
+
         m_type            = RHI_Texture_Type::Type2D;
         m_depth           = 1;
         m_flags          |= RHI_Texture_Srv;
@@ -390,6 +393,8 @@ namespace Spartan
         { 
             PrepareForGpu();
         }
+
+        ProgressTracker::SetGlobalLoadingState(false);
     }
 
     RHI_Texture_Mip& RHI_Texture::GetMip(const uint32_t array_index, const uint32_t mip_index)

runtime/RHI/Vulkan/Vulkan_Device.cpp

@@ -23,7 +23,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "pch.h"
 #include "../../Profiling/Profiler.h"
 #include "../Core/Debugging.h"
-#include "../Core/ProgressTracker.h"
 #include "../Rendering/Renderer.h"
 #include "../RHI_Device.h"
 #include "../RHI_Implementation.h"
@@ -2139,9 +2138,6 @@ namespace Spartan
         queues::condition_variable_immediate_execution.wait(lock, [] { return !queues::is_immediate_executing; });
         queues::is_immediate_executing = true;
 
-        // immediate command lists are used to stage data when loading textures
-        ProgressTracker::SetLoadingStateGlobal(true);
-
         // get command pool
         queues::queue = queues::immediate[static_cast<uint32_t>(queue_type)].get();
         queues::queue->NextCommandList();
@@ -2155,8 +2151,6 @@ namespace Spartan
         cmd_list->Submit(queues::queue, 0);
         cmd_list->WaitForExecution();
 
-        ProgressTracker::SetLoadingStateGlobal(false);
-
         // signal that it's safe to proceed with the next ImmediateBegin()
         queues::is_immediate_executing = false;
         queues::condition_variable_immediate_execution.notify_one();

runtime/RHI/Vulkan/Vulkan_Queue.cpp

@@ -144,12 +144,19 @@ namespace Spartan
 
     void RHI_Queue::Wait()
     {
+        // when loading textures (other threads) the queue will be used to submit data for staging
+        unique_lock<mutex> lock;
+        if (ProgressTracker::IsLoading())
+        {
+            lock = unique_lock<mutex>(get_mutex(this));
+        }
+
         SP_ASSERT_VK(vkQueueWaitIdle(static_cast<VkQueue>(RHI_Device::GetQueueRhiResource(m_type))));
     }
 
     void RHI_Queue::Submit(void* cmd_buffer, const uint32_t wait_flags, RHI_SyncPrimitive* semaphore, RHI_SyncPrimitive* semaphore_timeline)
     {
-        // locking only during texture loading to stage data without race conditions
+        // when loading textures (other threads) the queue will be used to submit data for staging
         unique_lock<mutex> lock;
         if (ProgressTracker::IsLoading())
         {
@@ -211,6 +218,13 @@ namespace Spartan
 
     void RHI_Queue::Present(void* swapchain, const uint32_t image_index, vector<RHI_SyncPrimitive*>& wait_semaphores)
     {
+        // when loading textures (other threads) the queue will be used to submit data for staging
+        unique_lock<mutex> lock;
+        if (ProgressTracker::IsLoading())
+        {
+            lock = unique_lock<mutex>(get_mutex(this));
+        }
+
         // get semaphore vulkan resources
         array<VkSemaphore, 3> vk_wait_semaphores = { nullptr };
         uint32_t semaphore_count = static_cast<uint32_t>(wait_semaphores.size());