[iceshard] Minor improvements after collections refactor.

* More temporary fixes for GfxRunner.

Author: Dandielo

source/code/framework/framework_base/private/framework_main.cxx

@@ -542,7 +542,7 @@ auto ice_resume(
         runtime.input_tracker->register_device_type(ice::input::DeviceType::Keyboard, ice::input::get_default_device_factory());
 
         //runtime.gfx_rendergraph_runtime = state.game->rendergraph(runtime.gfx_runner->device());
-        ice::wait_for(runtime.gfx_runner->update_rendergraph(state.game->rendergraph(runtime.gfx_runner->context())));
+        runtime.gfx_runner->update_rendergraph(state.game->rendergraph(runtime.gfx_runner->context()));
         runtime.gfx_wait.set();
     }
 
@@ -660,7 +660,7 @@ auto ice_update(
 
         //runtime.gfx_wait.wait();
         runtime.gfx_runner->context().recreate_swapchain();
-        ice::wait_for(runtime.gfx_runner->update_rendergraph(state.game->rendergraph(runtime.gfx_runner->context())));
+        runtime.gfx_runner->update_rendergraph(state.game->rendergraph(runtime.gfx_runner->context()));
     }
 
     // Since the frame updates the values we are safe to access them any time. They won't change until a new frame is awaited, and awaitng frames is happening on the same thread.

source/code/iceshard/engine/public/ice/ecs/ecs_query_operations.hxx

@@ -329,7 +329,7 @@ namespace ice::ecs
             ice::ecs::detail::ArchetypeInstanceInfo const* arch = nullptr;
             ice::ecs::detail::DataBlock const* block = nullptr;
 
-            ice::u32 const arch_count = ice::count(query.archetype_instances);
+            ice::u32 const arch_count = query.archetype_instances.size().u32();
             for (; arch_idx < arch_count; ++arch_idx)
             {
                 arch = query.archetype_instances[arch_idx];
@@ -552,7 +552,7 @@ namespace ice::ecs
 
             void* helper_pointer_array[component_count]{ nullptr };
 
-            ice::u32 const arch_count = ice::count(query.archetype_instances);
+            ice::u32 const arch_count = query.archetype_instances.size().u32();
             for (ice::u32 arch_idx = 0; arch_idx < arch_count; ++arch_idx)
             {
                 ice::ecs::detail::ArchetypeInstanceInfo const* arch = query.archetype_instances[arch_idx];

source/code/iceshard/engine/public/ice/gfx/gfx_runner.hxx

@@ -23,10 +23,12 @@ namespace ice::gfx
     {
         virtual ~GfxRunner() noexcept = default;
 
+        virtual bool has_rendergraph() const noexcept = 0;
+
         //! \brief Sets a rendergraph to used for execution each frame.
-        virtual auto update_rendergraph(
+        virtual void update_rendergraph(
             ice::UniquePtr<ice::gfx::GfxGraphRuntime> rendergraph
-        ) noexcept -> ice::Task<> = 0;
+        ) noexcept = 0;
 
         virtual auto update_data(
             ice::EngineFrame& frame,

source/code/iceshard/iceshard/private/iceshard_gfx_runner.cxx

@@ -113,12 +113,10 @@ namespace ice::gfx
         _context->device().destroy_fence(_present_fence);
     }
 
-    auto IceshardGfxRunner::update_rendergraph(
+    void IceshardGfxRunner::update_rendergraph(
         ice::UniquePtr<ice::gfx::GfxGraphRuntime> rendergraph
-    ) noexcept -> ice::Task<>
+    ) noexcept
     {
-        co_await _scheduler;
-
         if (_rendergraph != nullptr)
         {
             ice::gfx::GfxFrameStages gpu_stages{
@@ -135,8 +133,8 @@ namespace ice::gfx
                 }
             }
         }
-        
-        _rendergraph = ice::move(rendergraph);
+
+        _scheduled_rendergraph = ice::move(rendergraph);
     }
 
     auto IceshardGfxRunner::update_data(
@@ -214,7 +212,7 @@ namespace ice::gfx
         }
 
         // Check if we have a scheduled render graph and if we can replace
-        if (_scheduled_rendergraph != nullptr && _rendergraph->ready())
+        if (_scheduled_rendergraph != nullptr && (_rendergraph == nullptr || _rendergraph->ready()))
         {
             _rendergraph = ice::move(_scheduled_rendergraph);
         }
@@ -227,6 +225,11 @@ namespace ice::gfx
             ice::execute_tasks(tasks);
         }
 
+        if (_rendergraph->ready() == false)
+        {
+            co_return;
+        }
+
         if (_queue_transfer.not_empty() || _gfx_tasks.running_tasks() > 0)
         {
             IPT_ZONE_SCOPED_NAMED("gfx_await_tasks");

source/code/iceshard/iceshard/private/iceshard_gfx_runner.hxx

@@ -46,9 +46,11 @@ namespace ice::gfx
         ) noexcept;
         ~IceshardGfxRunner() noexcept override;
 
-        auto update_rendergraph(
+        bool has_rendergraph() const noexcept override { return _rendergraph != nullptr; }
+
+        void update_rendergraph(
             ice::UniquePtr<ice::gfx::GfxGraphRuntime> rendergraph
-        ) noexcept -> ice::Task<> override;
+        ) noexcept;
 
         auto update_data(
             ice::EngineFrame& frame,