Fixed issue with in rendering reload of scene

tippesi · Jul 13, 2023 · b0c23d7 · b0c23d7
1 parent d38f53a
commit b0c23d7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/demo/App.cpp b/src/demo/App.cpp
@@ -90,6 +90,12 @@ void App::UnloadContent() {
 
 void App::Update(float deltaTime) {
 
+    if (sceneReload) {
+        UnloadScene();
+        LoadScene();
+        sceneReload = false;
+    }
+
     const ImGuiIO& io = ImGui::GetIO();
 
     imguiWrapper.Update(&window, deltaTime);
@@ -238,8 +244,7 @@ void App::Render(float deltaTime) {
                     auto newSceneSelection = static_cast<SceneSelection>(currentItem);
                     if (IsSceneAvailable(newSceneSelection)) {
                         sceneSelection = newSceneSelection;
-                        UnloadScene();
-                        LoadScene();
+                        sceneReload = true;
                     }
                     else {
                         openSceneNotFoundPopup = true;

diff --git a/src/demo/App.h b/src/demo/App.h
@@ -88,6 +88,7 @@ class App : public Atlas::EngineInstance {
     float cameraSpeed = 7.0f;
 
     bool loadingComplete = false;
+    bool sceneReload = false;
 
     ImguiWrapper imguiWrapper;
 

diff --git a/src/engine/graphics/GraphicsDevice.cpp b/src/engine/graphics/GraphicsDevice.cpp
@@ -506,18 +506,12 @@ namespace Atlas {
                 if (!queue) {
                     queue = FindAndLockQueue(queueType);
                 }
-
-                if (!queue->IsTypeSupported(queueType)) {
-                    queue = FindAndLockQueue(queueType);
-                }
-
                 if (nextSubmission != nullptr && !queue->IsTypeSupported(nextSubmission->cmd->queueType)) {
                     nextQueue = FindAndLockQueue(nextSubmission->cmd->queueType);
                 }
                 else {
                     nextQueue = queue;
                 }
-
                 if (nextSubmission == nullptr) {
                     nextQueue = FindAndLockQueue(QueueType::PresentationQueue);
                 }