Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
#include "Headers/PlatformDefines.h"

#include "GUI/Headers/GUI.h"
#include "GUI/Headers/GUIMessageBox.h"

#include "Core/Headers/Console.h"
#include "Utility/Headers/MemoryTracker.h"

namespace Divide {
    namespace MemoryManager {
        void log_new( void* p, size_t size, const char* zFile, I32 nLine ) {
#       if defined(_DEBUG)
            if ( MemoryTracker::Ready ) {
                //AllocTracer.Add( p, size, zFile, nLine );
            }
#       endif
        }

        void log_delete( void* p ) {
#       if defined(_DEBUG)
            if ( MemoryTracker::Ready ) {
                //AllocTracer.Remove( p );
            }
#       endif
        }
    }; //namespace MemoryManager

    bool preAssert( const bool expression, const char* failMessage ) {
        if ( expression ) {
            return false;
        }
        if ( Config::Assert::LOG_ASSERTS ) {
            ERROR_FN( "Assert: %s", failMessage );
        }
        if ( Config::Assert::SHOW_MESSAGE_BOX ) {
            if ( GUI::hasInstance() ) {
                GUIMessageBox* const msgBox = GUI::getInstance().getDefaultMessageBox();
                if ( msgBox ) {
                    msgBox->setTitle( "Assertion Failed!" );
                    msgBox->setMessage( stringImpl( "Assert: " ) + failMessage );
                    msgBox->setMessageType( GUIMessageBox::MESSAGE_ERROR );
                    msgBox->show();
                }
            }
        }

        return !Config::Assert::CONTINUE_ON_ASSERT;
    }
}; //namespace Divide

#if defined(_DEBUG)
void* operator new( size_t size ) {
	void* ptr = malloc( size );
	Divide::MemoryManager::log_new( ptr, size, " allocation outside of macro ", 0 );
	return ptr;
}

void  operator delete( void *ptr ) {
    Divide::MemoryManager::log_delete( ptr );
	free( ptr );
}

void* operator new[]( size_t size ) {
	void* ptr = malloc( size );
    Divide::MemoryManager::log_new( ptr, size, " array allocation outside of macro ", 0 );
	return ptr;
}

void operator delete[]( void *ptr ) {
    Divide::MemoryManager::log_delete( ptr );
	free( ptr );
}

void* operator new( size_t size, 
                    char* zFile, 
                    Divide::I32 nLine ) {
	void* ptr = malloc( size );
    Divide::MemoryManager::log_new( ptr, size, zFile, nLine );
	return ptr;
}

void operator delete( void* ptr, 
                      char* zFile, 
                      Divide::I32 nLine ) {
    Divide::MemoryManager::log_delete( ptr );
	free( ptr );
}

void* operator new[]( size_t size, 
                      char* zFile, 
                      Divide::I32 nLine ) {
	void* ptr = malloc( size );
    Divide::MemoryManager::log_new( ptr, size, zFile, nLine );
	return ptr;
}

void operator delete[]( void* ptr, 
                        char* zFile, 
                        Divide::I32 nLine ) {
    Divide::MemoryManager::log_delete( ptr );
	free( ptr );
}
#endif

void* operator new[]( size_t size, 
                      const char* pName, 
                      Divide::I32 flags, 
                      Divide::U32 debugFlags, 
                      const char* file, 
                      Divide::I32 line ) {
	void* ptr = malloc( size );
    Divide::MemoryManager::log_new( ptr, size, file, line );
	return ptr;
}

void operator delete[]( void* ptr, 
                        const char* pName, 
                        Divide::I32 flags, 
                        Divide::U32 debugFlags, 
                        const char* file, 
                        Divide::I32 line ) {
    Divide::MemoryManager::log_delete( ptr );
	free( ptr );
}

void* operator new[]( size_t size, 
                      size_t alignment, 
                      size_t alignmentOffset, 
                      const char* pName, 
                      Divide::I32 flags, 
                      Divide::U32 debugFlags, 
                      const char* file, 
                      Divide::I32 line ) {
	// this allocator doesn't support alignment
	assert( alignment <= 8 );
	void* ptr = malloc( size );
    Divide::MemoryManager::log_new( ptr, size, file, line );
	return ptr;
}

void operator delete[]( void* ptr, 
                        size_t alignment, 
                        size_t alignmentOffset, 
                        const char* pName, 
                        Divide::I32 flags, 
                        Divide::U32 debugFlags, 
                        const char* file, 
                        Divide::I32 line ) {
    Divide::MemoryManager::log_delete( ptr );
	free( ptr );
}

// E
Divide::I32 Vsnprintf8( char* pDestination, 
                        size_t n, 
                        const char* pFormat, 
                        va_list arguments ) {
#ifdef _MSC_VER
	return _vsnprintf( pDestination, n, pFormat, arguments );
#else
	return vsnprintf( pDestination, n, pFormat, arguments );
#endif
}

Commits for Divide-Framework/trunk/Source Code/Hardware/Platform/PlatformDefines.cpp

Diff revisions: vs.
Revision Author Commited Message
331 Diff Diff IonutCava picture IonutCava Sat 06 Dec, 2014 20:53:45 +0000

[Ionut]
- Limited line length to 132 characters to improve readability and diff-comparisons
- Refactored memory allocation/deallocation functions
- Fixed a few compatibility issues with HashMap.h
- Fixed a bug in GPU Skinning shaders (cast a float to int)

326 Diff Diff IonutCava picture IonutCava Tue 30 Sep, 2014 21:11:32 +0000

[Ionut]
- Fixed more memory leaks
- Simplified Task interface and timing System
- Improved compatibility between Boost, STL and EASTL with random combinations of vectors, strings and maps
- Simplified Light class by removing the “slot” member
- Random optimizations

325 Diff Diff IonutCava picture IonutCava Wed 17 Sep, 2014 20:06:13 +0000

[Ionut]
- Reworked transform system:
— Parent transform chain system moved from Transform class to the PhysicsComponent
— PhysicsComponent now returns all transform values needed both global and local (still needs heavy optimization and caching)

- Reworked SceneGraph node management:
— Proper ref counting of SceneNodes and proper removing of resource (ResourceCache is now empty on destruction, as it should be)
— Removed parent transform tracking as that’s the PhysicsComponent’s responsibility
— Only nodes loaded via the ResourceCache are allowed to be added to the SceneGraph (added proper loaders for Impostors, Sky, etc)

- Optimized some of the math classes (mat4, mat3)

324 IonutCava picture IonutCava Sun 14 Sep, 2014 14:01:39 +0000

[Ionut]
- New memory management system (no custom allocators in this commit)
— Memory tracer to detect memory leaks on shutdown (from: https://www.relisoft.com/book/tech/9new.html)
— SAFE_DELETE_XYZ are now inline template functions not macros
— ASSERTION system now supports logging and message boxes and continue on error configurable for each build type
— Fixed a lot of memory leaks detected by the new system (some still remain)

- Added SRGB support (part 1)
— Albedo textures are loaded as SRGB (make sure resources are SRGB)
— Shaders output gamma corrected colors
— Moved terrain textures back to 2 array system (albedo and normal maps, albedo maps using a SRGB sampler)

- Sky is now loaded via the ResourceCache system
- Added include safeguards in shader atoms