Merge branch 'master' into mac

# Conflicts:
#	GpApp/Main.cpp
This commit is contained in:
Madthijs
2021-05-11 14:28:46 +02:00
76 changed files with 3895 additions and 1365 deletions

View File

@@ -3,8 +3,8 @@
#include "IGpAllocator.h"
class GpAllocator_C final : public IGpAllocator
{
public:
{
public:
void *Realloc(void *buf, size_t newSize) override;
static GpAllocator_C *GetInstance();