File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11#pragma once
22
33
4- #include < functional>
54#include " job.h"
65#include " manager.h"
76
@@ -26,7 +25,7 @@ template <class T> class GenericJob : public MTJD::Job
2625 void execute () override { m_function (); }
2726
2827private:
29- std::function< void ()> m_function;
28+ T m_function;
3029};
3130
3231
Original file line number Diff line number Diff line change 3333#include " renderer/texture.h"
3434
3535#include " universe/universe.h"
36+ #include < cmath>
3637
3738
3839namespace Lumix
Original file line number Diff line number Diff line change @@ -84,11 +84,6 @@ struct BGFXAllocator : public bx::AllocatorI
8484 }
8585
8686
87- ~BGFXAllocator ()
88- {
89- }
90-
91-
9287 static const size_t NATURAL_ALIGNEMENT = 8 ;
9388
9489
@@ -111,25 +106,18 @@ struct BGFXAllocator : public bx::AllocatorI
111106 }
112107 else if (!_ptr)
113108 {
114- if (NATURAL_ALIGNEMENT >= _alignment)
115- {
116- return m_source.allocate (_size);
117- }
109+ if (NATURAL_ALIGNEMENT >= _alignment) return m_source.allocate (_size);
118110
119111 return m_source.allocate_aligned (_size, _alignment);
120112 }
121113
122- if (NATURAL_ALIGNEMENT >= _alignment)
123- {
124- return m_source.reallocate (_ptr, _size);
125- }
114+ if (NATURAL_ALIGNEMENT >= _alignment) return m_source.reallocate (_ptr, _size);
126115
127116 return m_source.reallocate_aligned (_ptr, _size, _alignment);
128117 }
129118
130119
131120 Lumix::IAllocator& m_source;
132-
133121};
134122
135123
You can’t perform that action at this time.
0 commit comments