Commita8fe4ae

committed

Fix Apple build and logger crash

1 parent8b8e380 commita8fe4aeCopy full SHA for a8fe4ae

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,9 @@ void RenderCommandList::SetViewState(Rhi::IViewState& view_state)`
`138`	`138`	`return;`
`139`	`139`	`}`
`140`	`140`
`141`		`-META_LOG("{} Command list '{}' SET VIEW STATE:\n{}",magic_enum::enum_name(GetType()),GetName(),static_cast<std::string>(drawing_state.view_state_ptr->GetSettings()));`
	`141`	`+META_LOG("{} Command list '{}' SET VIEW STATE:\n{}",`
	`142`	`+magic_enum::enum_name(GetType()),GetName(),`
	`143`	`+ drawing_state.view_state_ptr ?static_cast<std::string>(drawing_state.view_state_ptr->GetSettings()) :std::string());`
`142`	`144`	`drawing_state.view_state_ptr =static_cast<ViewState*>(&view_state);`
`143`	`145`	`drawing_state.view_state_ptr->Apply(*this);`
`144`	`146`	`drawing_state.changes \|= DrawingState::Change::ViewState;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ private:`
`62`	`62`	`voidReset();`
`63`	`63`
`64`	`64`	`id<MTLCommandQueue> m_mtl_command_queue = nil;`
`65`		`- Ptr<TimestampQueryPool> m_timestamp_query_pool_ptr = std::make_shared<TimestampQueryPool>(*this,1000U);`
	`65`	`+ Ptr<Rhi::ITimestampQueryPool> m_timestamp_query_pool_ptr = std::make_shared<TimestampQueryPool>(*this,1000U);`
`66`	`66`	`};`
`67`	`67`
`68`	`68`	`}// namespace Methane::Graphics::Metal`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class CommandQueue final`
`49`	`49`	`const Ptr<Rhi::ITimestampQueryPool>&GetTimestampQueryPoolPtr()override {return m_timestamp_query_pool_ptr; }`
`50`	`50`
`51`	`51`	`private:`
`52`		`- Ptr<TimestampQueryPool> m_timestamp_query_pool_ptr = std::make_shared<TimestampQueryPool>(*this,1000U);`
	`52`	`+constPtr<Rhi::ITimestampQueryPool> m_timestamp_query_pool_ptr = std::make_shared<TimestampQueryPool>(*this,1000U);`
`53`	`53`	`};`
`54`	`54`
`55`	`55`	`}// namespace Methane::Graphics::Null`

Comments

(0)