Mac support progress

This commit is contained in:
Wojtek Figat
2021-12-28 17:07:18 +01:00
parent 2d0633c05a
commit a1ef7ddcf7
9 changed files with 428 additions and 57 deletions

View File

@@ -29,6 +29,9 @@
#include "Engine/Input/Input.h"
#include "Engine/Input/Mouse.h"
#include "Engine/Input/Keyboard.h"
#include <unistd.h>
#include <cstdint>
#include <stdlib.h>
CPUInfo MacCpu;
Guid DeviceId;
@@ -70,6 +73,53 @@ public:
}
};
typedef uint16_t offset_t;
#define align_mem_up(num, align) (((num) + ((align) - 1)) & ~((align) - 1))
void* MacPlatform::Allocate(uint64 size, uint64 alignment)
{
void* ptr = nullptr;
// Alignment always has to be power of two
ASSERT_LOW_LAYER((alignment & (alignment - 1)) == 0);
if (alignment && size)
{
uint32_t pad = sizeof(offset_t) + (alignment - 1);
void* p = malloc(size + pad);
if (p)
{
// Add the offset size to malloc's pointer
ptr = (void*)align_mem_up(((uintptr_t)p + sizeof(offset_t)), alignment);
// Calculate the offset and store it behind aligned pointer
*((offset_t*)ptr - 1) = (offset_t)((uintptr_t)ptr - (uintptr_t)p);
}
#if COMPILE_WITH_PROFILER
OnMemoryAlloc(ptr, size);
#endif
}
return ptr;
}
void MacPlatform::Free(void* ptr)
{
if (ptr)
{
#if COMPILE_WITH_PROFILER
OnMemoryFree(ptr);
#endif
// Walk backwards from the passed-in pointer to get the pointer offset
offset_t offset = *((offset_t*)ptr - 1);
// Get original pointer
void* p = (void*)((uint8_t*)ptr - offset);
// Free memory
free(p);
}
}
bool MacPlatform::Is64BitPlatform()
{
return PLATFORM_64BITS;
@@ -97,6 +147,11 @@ ProcessMemoryStats MacPlatform::GetProcessMemoryStats()
return ProcessMemoryStats(); // TODO: platform stats on Mac
}
uint64 UnixPlatform::GetCurrentProcessId()
{
return getpid();
}
uint64 MacPlatform::GetCurrentThreadID()
{
MISSING_CODE("MacPlatform::GetCurrentThreadID");

View File

@@ -9,11 +9,11 @@
/// <summary>
/// The Mac platform implementation and application management utilities.
/// </summary>
class FLAXENGINE_API MacPlatform : public UnixPlatform
class FLAXENGINE_API MacPlatform : public PlatformBase
{
public:
// [UnixPlatform]
// [PlatformBase]
FORCE_INLINE static void MemoryBarrier()
{
__sync_synchronize();
@@ -66,11 +66,14 @@ public:
{
__builtin_prefetch(static_cast<char const*>(ptr));
}
static void* Allocate(uint64 size, uint64 alignment);
static void Free(void* ptr);
static bool Is64BitPlatform();
static CPUInfo GetCPUInfo();
static int32 GetCacheLineSize();
static MemoryStats GetMemoryStats();
static ProcessMemoryStats GetProcessMemoryStats();
static uint64 GetCurrentProcessId();
static uint64 GetCurrentThreadID();
static void SetThreadPriority(ThreadPriority priority);
static void SetThreadAffinityMask(uint64 affinityMask);