Skip to content

Commit e0f15d7

Browse files
committed
Fix MacOS Profile build
1 parent 5fc8aa1 commit e0f15d7

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

Modules/Common/Instrumentation/Include/Methane/Instrumentation.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ ITT_DOMAIN_EXTERN();
6767

6868
#ifdef TRACY_ENABLE
6969

70+
#define TRACY_MUTEX(mutex_type) tracy::Lockable<mutex_type>
7071
#define TRACY_SET_THREAD_NAME(name) tracy::SetThreadName(name)
7172

7273
#if defined(TRACY_ZONE_CALL_STACK_DEPTH) && TRACY_ZONE_CALL_STACK_DEPTH > 0
@@ -83,6 +84,7 @@ ITT_DOMAIN_EXTERN();
8384

8485
#else // ifdef TRACY_ENABLE
8586

87+
#define TRACY_MUTEX(mutex_type) mutex_type
8688
#define TRACY_SET_THREAD_NAME(name)
8789
#define TRACY_ZONE_SCOPED()
8890
#define TRACY_ZONE_SCOPED_NAME(name)

Modules/Graphics/RHI/Metal/Include/Methane/Graphics/Metal/DescriptorManager.hh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public:
5757
class DataLock
5858
{
5959
public:
60-
DataLock(ArgumentsBuffer& arg_buffer);
60+
explicit DataLock(ArgumentsBuffer& arg_buffer);
6161

6262
DataLock(const DataLock& other) = delete;
6363
DataLock& operator=(const DataLock& other) = delete;
@@ -66,8 +66,8 @@ public:
6666
Data::Byte* GetDataPtr() const noexcept { return m_data_ptr; }
6767

6868
private:
69-
std::lock_guard<std::mutex> m_lock;
70-
Data::Byte* m_data_ptr;
69+
std::lock_guard<TRACY_MUTEX(std::mutex)> m_lock;
70+
Data::Byte* m_data_ptr;
7171
};
7272

7373
ArgumentsBuffer(const Base::Context& context, Rhi::ProgramArgumentAccessType access_type);

Modules/Graphics/RHI/Metal/Include/Methane/Graphics/Metal/ProgramBindings.hh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Metal implementation of the program bindings interface.
2828
#include <Methane/Graphics/RHI/ICommandList.h>
2929
#include <Methane/Graphics/Base/ProgramBindings.h>
3030
#include <Methane/Data/Range.hpp>
31+
#include <Methane/Instrumentation.h>
3132

3233
#import <Metal/Metal.h>
3334

@@ -130,10 +131,10 @@ private:
130131

131132
using AccessTypeMask = Data::EnumMask<Rhi::ProgramArgumentAccessType>;
132133

133-
AccessTypeMask m_argument_buffer_initialized_access_types;
134-
ArgumentsRange m_mutable_argument_buffer_range;
135-
NativeResourceSet m_mtl_used_resources;
136-
std::mutex m_used_resources_mutex;
134+
AccessTypeMask m_argument_buffer_initialized_access_types;
135+
ArgumentsRange m_mutable_argument_buffer_range;
136+
NativeResourceSet m_mtl_used_resources;
137+
TracyLockable(std::mutex, m_used_resources_mutex);
137138
};
138139

139140
} // namespace Methane::Graphics::Metal

0 commit comments

Comments
 (0)