Fix Apple build and logger crash

MethanePowered · Aug 6, 2023 · a8fe4ae · a8fe4ae · github-actions · Aug 6, 2023
1 parent 8b8e380
commit a8fe4ae
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Modules/Graphics/RHI/Base/Sources/Methane/Graphics/Base/RenderCommandList.cpp b/Modules/Graphics/RHI/Base/Sources/Methane/Graphics/Base/RenderCommandList.cpp
@@ -138,7 +138,9 @@ void RenderCommandList::SetViewState(Rhi::IViewState& view_state)
         return;
     }
 
-    META_LOG("{} Command list '{}' SET VIEW STATE:\n{}", magic_enum::enum_name(GetType()), GetName(), static_cast<std::string>(drawing_state.view_state_ptr->GetSettings()));
+    META_LOG("{} Command list '{}' SET VIEW STATE:\n{}",
+             magic_enum::enum_name(GetType()), GetName(),
+             drawing_state.view_state_ptr ? static_cast<std::string>(drawing_state.view_state_ptr->GetSettings()) : std::string());
     drawing_state.view_state_ptr = static_cast<ViewState*>(&view_state);
     drawing_state.view_state_ptr->Apply(*this);
     drawing_state.changes |= DrawingState::Change::ViewState;

diff --git a/Modules/Graphics/RHI/Metal/Include/Methane/Graphics/Metal/CommandQueue.hh b/Modules/Graphics/RHI/Metal/Include/Methane/Graphics/Metal/CommandQueue.hh
@@ -62,7 +62,7 @@ private:
     void Reset();
 
     id<MTLCommandQueue> m_mtl_command_queue = nil;
-    Ptr<TimestampQueryPool> m_timestamp_query_pool_ptr = std::make_shared<TimestampQueryPool>(*this, 1000U);
+    Ptr<Rhi::ITimestampQueryPool> m_timestamp_query_pool_ptr = std::make_shared<TimestampQueryPool>(*this, 1000U);
 };
 
 } // namespace Methane::Graphics::Metal
diff --git a/Modules/Graphics/RHI/Null/Include/Methane/Graphics/Null/CommandQueue.h b/Modules/Graphics/RHI/Null/Include/Methane/Graphics/Null/CommandQueue.h
@@ -49,7 +49,7 @@ class CommandQueue final
     const Ptr<Rhi::ITimestampQueryPool>&               GetTimestampQueryPoolPtr() override      { return m_timestamp_query_pool_ptr; }
 
 private:
-    Ptr<TimestampQueryPool> m_timestamp_query_pool_ptr = std::make_shared<TimestampQueryPool>(*this, 1000U);
+    const Ptr<Rhi::ITimestampQueryPool> m_timestamp_query_pool_ptr = std::make_shared<TimestampQueryPool>(*this, 1000U);
 };
 
 } // namespace Methane::Graphics::Null
Package	Line Rate	Branch Rate	Health
Default	38%	100%	➖
Summary	38% (7685 / 20302)	100% (0 / 0)	➖
Package	Line Rate	Branch Rate	Health
Default	49%	22%	➖
Summary	49% (12089 / 24799)	22% (3384 / 15604)	➖
Package	Line Rate	Branch Rate	Health
D:\a\MethaneKit\MethaneKit\Build\Output\Ninja-Win-DX-Scan\Install\Tests\MethaneDataEventsTest.exe	95%	100%	✔
D:\a\MethaneKit\MethaneKit\Build\Output\Ninja-Win-DX-Scan\Install\Tests\MethaneDataRangeSetTest.exe	91%	100%	✔
D:\a\MethaneKit\MethaneKit\Build\Output\Ninja-Win-DX-Scan\Install\Tests\MethaneDataTypesTest.exe	98%	100%	✔
D:\a\MethaneKit\MethaneKit\Build\Output\Ninja-Win-DX-Scan\Install\Tests\MethaneGraphicsCameraTest.exe	61%	100%	➖
D:\a\MethaneKit\MethaneKit\Build\Output\Ninja-Win-DX-Scan\Install\Tests\MethaneGraphicsRhiTest.exe	42%	100%	➖
D:\a\MethaneKit\MethaneKit\Build\Output\Ninja-Win-DX-Scan\Install\Tests\MethaneGraphicsTypesTest.exe	98%	100%	✔
D:\a\MethaneKit\MethaneKit\Build\Output\Ninja-Win-DX-Scan\Install\Tests\MethanePlatformInputTest.exe	43%	100%	➖
D:\a\MethaneKit\MethaneKit\Build\Output\Ninja-Win-DX-Scan\Install\Tests\MethaneUserInterfaceTypesTest.exe	9%	100%	❌
Summary	34% (4496 / 13379)	100% (0 / 0)	➖