Merge pull request #286 from paroj/memory

Memory
OGRECave · Jan 3, 2017 · fd2ced1 · fd2ced1
2 parents 7d5279b + 05e1724
commit fd2ced1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/Components/Bites/include/OgreAdvancedRenderControls.h b/Components/Bites/include/OgreAdvancedRenderControls.h
@@ -41,14 +41,20 @@ class TrayManager;
 class ParamsPanel;
 
 /**
-     F:        Toggle frame rate stats on/off
-     G:        Toggle advanced frame stats on/off
-     R:        Render mode
-     T:        Cycle texture filtering
-               Bilinear, Trilinear, Anisotropic(8)
-     F2:       Set the main viewport material scheme to default material manager scheme.
-     F3:       Toggle default shader generator lighting model from per vertex to per pixel.
-     F4:       Switch vertex shader outputs compaction policy.
+   - F:        Toggle frame rate stats on/off
+   - G:        Toggle advanced frame stats on/off
+   - R:        Render mode
+               - Wireframe
+               - Points
+               - Solid
+   - T:        Cycle texture filtering
+               - Bilinear
+               - Trilinear
+               - Anisotropic(8)
+               - None
+   - F2:       Set the main viewport material scheme to default material manager scheme.
+   - F3:       Toggle default shader generator lighting model from per vertex to per pixel.
+   - F4:       Switch vertex shader outputs compaction policy.
  */
 class _OgreBitesExport AdvancedRenderControls : public InputListener {
 public:

diff --git a/OgreMain/include/OgreAlignedAllocator.h b/OgreMain/include/OgreAlignedAllocator.h
@@ -70,7 +70,7 @@ namespace Ogre {
             @par
                 On failure, exception will be throw.
         */
-        static void* allocate(size_t size, size_t alignment);
+        static DECL_MALLOC void* allocate(size_t size, size_t alignment);
 
         /** Allocate memory with default platform dependent alignment.
             @remarks
@@ -84,7 +84,7 @@ namespace Ogre {
             @par
                 On failure, exception will be throw.
         */
-        static void* allocate(size_t size);
+        static DECL_MALLOC void* allocate(size_t size);
 
         /** Deallocate memory that allocated by this class.
             @param

diff --git a/OgreMain/include/OgreMemoryStdAlloc.h b/OgreMain/include/OgreMemoryStdAlloc.h
@@ -56,7 +56,7 @@ namespace Ogre
 	class _OgreExport StdAllocPolicy
 	{
 	public:
-		static inline void* allocateBytes(size_t count, 
+		static inline DECL_MALLOC void* allocateBytes(size_t count, 
 #if OGRE_MEMORY_TRACKER
 			const char* file = 0, int line = 0, const char* func = 0
 #else
@@ -111,7 +111,7 @@ namespace Ogre
 		typedef int IsValidAlignment
 			[Alignment <= 128 && ((Alignment & (Alignment-1)) == 0) ? +1 : -1];
 
-		static inline void* allocateBytes(size_t count, 
+		static inline DECL_MALLOC void* allocateBytes(size_t count, 
 #if OGRE_MEMORY_TRACKER
 			const char* file = 0, int line = 0, const char* func = 0
 #else

diff --git a/OgreMain/include/OgreNode.h b/OgreMain/include/OgreNode.h
@@ -124,15 +124,15 @@ namespace Ogre {
 
         typedef set<Node*>::type ChildUpdateSet;
         /// List of children which need updating, used if self is not out of date but children are
-        mutable ChildUpdateSet mChildrenToUpdate;
+        ChildUpdateSet mChildrenToUpdate;
         /// Flag to indicate own transform from parent is out of date
         mutable bool mNeedParentUpdate;
         /// Flag indicating that all children need to be updated
-        mutable bool mNeedChildUpdate;
+        bool mNeedChildUpdate;
         /// Flag indicating that parent has been notified about update request
-        mutable bool mParentNotified ;
+        bool mParentNotified ;
         /// Flag indicating that the node has been queued for update
-        mutable bool mQueuedForUpdate;
+        bool mQueuedForUpdate;
 
         /// Friendly name of this node, can be automatically generated if you don't care
         String mName;