mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-08 22:38:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Moving over more allocations to the memory pool

Browse Source
This commit is contained in:
Alexander Bock
2020-08-05 11:19:09 +02:00
parent 25247c7a37
commit 696bc31861
20 changed files with 51 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/openspace/rendering/renderable.h
View File

@@ -30,6 +30,7 @@
#include <openspace/properties/scalar/boolproperty.h>
#include <openspace/properties/scalar/floatproperty.h>
#include <openspace/properties/stringproperty.h>
#include <ghoul/misc/managedmemoryuniqueptr.h>
namespace ghoul { class Dictionary; }
namespace ghoul::opengl {
@@ -58,7 +59,7 @@ public:
Overlay = 16
};
static std::unique_ptr<Renderable> createFromDictionary(
static ghoul::mm_unique_ptr<Renderable> createFromDictionary(
const ghoul::Dictionary& dictionary);
Renderable(const ghoul::Dictionary& dictionary);